1
0
mirror of https://github.com/danog/2048.git synced 2024-12-02 09:17:47 +01:00
Commit Graph

65 Commits

Author SHA1 Message Date
janschoenherr
3b86903e65 code cleanup 2014-04-16 10:54:51 +02:00
iirelu
82834dfc5b Made animframe_polyfill.js JSHint compliant
Reformatted a bunch to make JSHint happy.
2014-03-27 17:52:07 +00:00
Gabriele Cirulli
cf01ca7e8b manually apply #81 2014-03-23 19:51:29 +01:00
Gabriele Cirulli
2f91247132 improve comments in game manager 2014-03-22 18:45:48 +01:00
Gabriele Cirulli
6cb3d71a40 improve comments in game manager 2014-03-22 18:41:47 +01:00
Gabriele Cirulli
af683a7856 clear game state on game over 2014-03-22 18:33:24 +01:00
Gabriele Cirulli
8ad8318c7c align assignments 2014-03-22 17:06:37 +01:00
Gabriele Cirulli
88e084a0d7 remove irrelevant size property on serialized game 2014-03-22 17:06:32 +01:00
Gabriele Cirulli
4ad15d4cbd add R key to restart game 2014-03-22 16:35:47 +01:00
Gabriele Cirulli
a6531b08bd add getter comments 2014-03-22 16:29:23 +01:00
Gabriele Cirulli
c48b92689d refactor grid, gamemanager, tile 2014-03-22 16:24:11 +01:00
Gabriele Cirulli
4d294cf9b9 remove space to restart game, refactor code slightly 2014-03-22 16:11:19 +01:00
Gabriele Cirulli
08c50df938 rename LocalScoreManager to LocalStorageManager 2014-03-22 15:38:52 +01:00
Gabriele Cirulli
bd7f8963d0 Merge branch 'resume-game' of github.com:mfrederiksen/2048 into mfrederiksen-resume-game 2014-03-22 15:35:51 +01:00
Gabriele Cirulli
2056ed480d Merge branch 'WP_touch_events' of github.com:elektryk/2048 into elektryk-WP_touch_events 2014-03-19 14:42:12 +01:00
Mark Frederiksen
02a24c0610 Added persistence of game state to localstorage after each move
Added rebuilding of game state from localstoage on page load
Added New Game button to allow game restarts now that refreshes resume the game
2014-03-18 14:48:55 -04:00
Gabriele Cirulli
f732d4f547 remove debug logging 2014-03-14 13:56:38 +01:00
Gabriele Cirulli
10c72a76b3 rename tile-gold to tile-super 2014-03-14 13:35:42 +01:00
Gabriele Cirulli
5392893cd6 rename GameOver to GameTerminated to avoid ambiguity 2014-03-14 13:34:05 +01:00
Gabriele Cirulli
cfbf74905f refactor code 2014-03-14 13:27:57 +01:00
Gabriele Cirulli
a831baed58 merge infinite game 2014-03-14 13:22:29 +01:00
Gabriele Cirulli
2bf48efe68 change local storage support check 2014-03-14 12:33:32 +01:00
codeKonami
9274840ced adding a test to verify the localStorage is supported fixing a bug on private browsing on safari 2014-03-14 14:25:26 +13:00
Gabriele Cirulli
f943d2a745 Merge pull request #42 from david-risney/fix-try-again-bug
Ensure the Try Again button actually disappears when selected in IE
2014-03-14 00:03:59 +01:00
Gabriele Cirulli
74494bb5f5 modify the game to allow using transforms 2014-03-13 23:11:02 +01:00
Marcin Gajda
7f187251a8 Windows Phone touch events 2014-03-13 20:27:09 +01:00
Laurent Margirier
bd62716d60 add touchend event (see PR #32) 2014-03-13 10:17:57 +01:00
Laurent Margirier
9626e2b060 Endless Game. Allow user to continue the game.
- main.css isn't compiled
- a special class `.tile-gold` is added to tiles above 2048
2014-03-13 10:16:19 +01:00
Dave Risney
472e30cd35 Ensure the Try Again button actually disappears when selected in Internet Explorer 2014-03-12 20:17:03 -07:00
G. Bodenschatz
fc6206ab39 [BUGFIX] Add touch event handler for retry button 2014-03-12 18:03:11 +01:00
Gabriele Cirulli
608ca2844b improve code structure in localscoremanager 2014-03-12 13:35:42 +01:00
Gabriele Cirulli
88278792be small change in scoremanager 2014-03-12 13:31:09 +01:00
Gabriele Cirulli
d9fef6095f remove analytics from master branch 2014-03-12 13:04:16 +01:00
Gabriele Cirulli
b080e5300d add small code tweaks 2014-03-12 12:15:57 +01:00
Gabriele Cirulli
39ebf51ce2 fix merge conflict 2014-03-12 11:23:22 +01:00
Grégory HOULLIER
95a2676b3b Use querySelector instead of getElementsByClassName 2014-03-12 08:59:12 +01:00
Gabriele Cirulli
f251f5c898 remove hammer, small js changes 2014-03-11 22:18:56 +01:00
Chris Price
cf4087e87d Replace hammer with touch event handling 2014-03-11 20:34:47 +00:00
Tim Petricola
77654452a7 Merge remote-tracking branch 'upstream/master' into best-score
Conflicts:
	index.html
	js/application.js
	js/html_actuator.js
2014-03-11 12:05:42 -04:00
Tim Petricola
d6da8d9925 localStorage fallback 2014-03-11 11:52:02 -04:00
Gabriele Cirulli
5c6327f390 add WASD controls (closes #10) 2014-03-11 16:31:39 +01:00
Gabriele Cirulli
d2315af2ec add requestanimationframe polyfill 2014-03-11 14:48:42 +01:00
Gabriele Cirulli
53b0bd2e17 move scripts to bottom of body 2014-03-11 14:30:09 +01:00
Tim Petricola
fda0e8405f Fix win/over in local 2014-03-10 17:18:54 -04:00
Gabriele Cirulli
5a49a0ef91 add basic iphone support 2014-03-10 21:31:41 +01:00
Tim Petricola
664546ef9a Store best score in localStorage
Dependency injection and hide best score for incompatible browsers
2014-03-10 16:21:05 -04:00
Gabriele Cirulli
e4476b44e0 remove debug printing 2014-03-10 20:45:43 +01:00
Gabriele Cirulli
c0ca375c3a properly ignore meta keys 2014-03-10 20:42:03 +01:00
Gabriele Cirulli
57deb5d998 move event send after type definition 2014-03-10 19:38:46 +01:00
Gabriele Cirulli
a422799481 Merge pull request #2 from rayhaanj/master
Add vim keybindings
2014-03-10 18:58:36 +01:00