Impaczus/2048
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
215 Commits 2 Branches 0 Tags
fa49d3bc5a5b2e6c2ff3fa256de00a377dc32672
Commit Graph

90 Commits

Author SHA1 Message Date
Gabriele Cirulli 5afb368c15 merge new game button 2014-03-22 17:11:51 +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 36222ca5fb Merge branch 'master' into gh-pages 2014-03-19 14:49:03 +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
Cotton Hou f57c8b052b shorten links while tweeting, plus to ensure original counts 2014-03-15 06:39:45 +08:00
Gabriele Cirulli af61d052cb remove twitter uri 2014-03-14 23:09:25 +01:00
Cotton Hou 887c6b4cfe shorten links while tweeting, ref #34 2014-03-15 01:13:21 +08:00
Gabriele Cirulli c6d4e4f29f merge super tiles 2014-03-14 13:59:04 +01: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 702dd1aa39 Merge branch 'master' into gh-pages 2014-03-14 00:05:53 +01: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 91f0d161a0 merge transforms 2014-03-13 23:45:45 +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
Gabriele Cirulli 8b1f3a4f71 Merge branch 'master' into gh-pages 2014-03-12 21:58:27 +01:00
G. Bodenschatz fc6206ab39 [BUGFIX] Add touch event handler for retry button 2014-03-12 18:03:11 +01:00
Gabriele Cirulli 602c1015dd Merge branch 'master' into gh-pages 2014-03-12 13:37:23 +01:00
Gabriele Cirulli 608ca2844b improve code structure in localscoremanager 2014-03-12 13:35:42 +01:00
Gabriele Cirulli 52979f1297 Merge branch 'master' into gh-pages 2014-03-12 13:33:24 +01:00
Gabriele Cirulli 88278792be small change in scoremanager 2014-03-12 13:31:09 +01:00
Gabriele Cirulli 119d8ecdd0 restore ga in gh-pages 2014-03-12 13:05:55 +01:00
Gabriele Cirulli d16f57574f Merge branch 'master' into gh-pages 2014-03-12 13:05:18 +01:00
Gabriele Cirulli d9fef6095f remove analytics from master branch 2014-03-12 13:04:16 +01:00
Gabriele Cirulli 03ec53ea25 fix conflict 2014-03-12 13:03:37 +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 ebf96bfebb Merge branch 'master' into gh-pages 2014-03-11 22:32: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 e1dde5750d Merge branch 'master' into gh-pages 2014-03-11 16:32:35 +01:00