Skip to content

Tammy/Jessica Final Submission#17

Open
noglows wants to merge 65 commits intoAda-C4:jnth/masterfrom
noglows:jnth/master
Open

Tammy/Jessica Final Submission#17
noglows wants to merge 65 commits intoAda-C4:jnth/masterfrom
noglows:jnth/master

Conversation

@noglows
Copy link
Copy Markdown

@noglows noglows commented Feb 5, 2016

Complete game with win/loss logic.

Future Endeavors:

  • There is a weird bug where black tiles show up when you move too fast
  • Keep track of all time high score
  • More animations (tiles get slightly bigger when they merge, score updates like the real game, etc.)

TammyHer and others added 30 commits February 1, 2016 15:05
@TammyHer
we succefuly added a 2 into a random available cell
7824610
@TammyHer
1 out of 10 will be a tile of 4
2d473cd
@noglows
Move tile left behavior partially working
28e98c2
@TammyHer
fix a bug. noe move left works great
22d67f4
@TammyHer
we can move right
39e52c4
@TammyHer
we can move down A tile
563b6e8
@noglows
Added move up functionality
dd7676c
@noglows
Code cleanup
4119247
@noglows
Collide right logic is working
a713af1
@TammyHer
we can collide left
54da423
@TammyHer
we can collide down
be6f8cd
@noglows
Collide Up functionality working
6c22ee6
@TammyHer
Scoring is working
61a10b8
@TammyHer
fixed the scoring
b303aca
@TammyHer
added functiong to check if lost, but havn't tested it yet
8bd0e86
@TammyHer
added lost function- not tested yet
ca62542
@noglows
Added move board right function
8633bb2
@TammyHer
function that move the entire board down
d475fc5
@noglows
Move board up functionality working
f38b2b1
@TammyHer
we have starting point in front end- two random tiles
4dfa951
@noglows
Tiles are moving
09fe288
@TammyHer
added a left collides- currently not working
1506ddd
@noglows
Adding random tile each turn
6690330
@noglows
Merge branch 'jnth/master' of github.com:noglows/2048 into jnth/master
7109b36
@noglows
Collision working better for left
de687bd
@noglows
Working on collide left logic
f15ce42
@noglows
Added backup file to troubleshoot bugs
42a85b6
@noglows
File reorg
ee80126
@noglows
Minor bug fixes
698354a
@noglows
Rewrote move right logic in 2048_2
dce022a
noglows and others added 30 commits February 4, 2016 12:32
@noglows
Bug fixing never ends
5edb8ba
@TammyHer
Merge branch 'up' into jnth/master
5b3c899
@TammyHer
Merge branch 'jnth/master' of github.com:noglows/2048 into jnth/master
95cfaaf
@noglows
Left/Right problems still exist
d41011b
@TammyHer
during up-down moving and collide
4f10cf2
@TammyHer
Merge branch 'jnth/master' of github.com:noglows/2048 into jnth/master
67481cf
@noglows
Up/Down are functional
d7a2737
@noglows
Working on movement timing
2bc6cb0
@noglows
Fixed animation bug
9fdc410
@TammyHer
the game looks working
0ae1692
@noglows
Fixed bugs and changed animation times
172cc03
@noglows
Deleted old files
815c398
@noglows
Reorganized code
e2415be
@noglows
Working score bar
dce088d
@noglows
Added a restart button
00c22ef
@noglows
Small change to scoring
514a7be
@TammyHer
fixed a bug
b8ad93f
@TammyHer
Merge branch 'jnth/master' of github.com:noglows/2048 into jnth/master
437fa48
@noglows
Troubleshooting bugs
077368e
@noglows
Working game over logic
2ce3f33
@noglows
Added winning logic
bb59f8c
@noglows
Added sweetalert
4af66e3
@TammyHer
when you move right and nothing is really moving- a new tile wont sho…
7ae0cae 
…w up
@TammyHer
new random tile wont show up if you cant move
9cef641
@TammyHer
add style
75c4529
@TammyHer
the game looks fine. no serious bugs
df63a90
@noglows
Added sweetalert for win and loss
d74062d
@noglows
Updated the winning score
ae567fa
@noglows
Fixed CSS for the restart button
d923b41
@TammyHer
comment out restart
0f7f2e5
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@noglows @TammyHer