Commit Graph

155 Commits

Author SHA1 Message Date
Gabriele Cirulli 542208d94a Merge pull request #112 from Josso/startup-image
Add startup-images for the iPhone
2014-04-06 23:05:12 +02:00
Gabriele Cirulli 2798bb0b1e Merge pull request #115 from iirelu/jshint-compliance
Made animframe_polyfill.js JSHint compliant
2014-03-27 19:11:49 +01:00
iirelu 82834dfc5b Made animframe_polyfill.js JSHint compliant
Reformatted a bunch to make JSHint happy.
2014-03-27 17:52:07 +00:00
Johan K. Jensen 1264d9b3f0 Add startup-images for the iPhone. 2014-03-27 14:20:32 +01:00
Gabriele Cirulli 878098f855 apply changes from #43 2014-03-23 20:21:58 +01:00
Gabriele Cirulli b08fa8d6a4 apply css improvements from #68 2014-03-23 20:17:35 +01:00
Gabriele Cirulli 71baa9d3d7 Update CONTRIBUTING.md 2014-03-23 20:12:53 +01:00
Gabriele Cirulli 7dcbe28284 #98 improve contributing guide 2014-03-23 20:09:19 +01:00
Gabriele Cirulli d403f84d7d add https://github.com/mgarciaisaia mention to readme 2014-03-23 19:56:08 +01: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 bf1ba513c1 update css 2014-03-22 17:40:57 +01:00
Gabriele Cirulli 156ef6e50d Merge pull request #96 from jimminning/patch-3
Update main.scss for -ms-user-select (IE)
2014-03-22 17:39:02 +01:00
Gabriele Cirulli 3cfdcca0d2 increase margin above game field 2014-03-22 17:31:55 +01:00
Gabriele Cirulli e729f7457f bring container margin top into variable and reduce it on mobile 2014-03-22 17:28:14 +01:00
Gabriele Cirulli 17fe360df1 Merge branch 'master' of https://github.com/gabrielecirulli/2048 2014-03-22 17:09:08 +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 4fa41a045b reintroduce "to" in intro 2014-03-22 17:01:36 +01:00
Gabriele Cirulli 560859fcd9 restyle new game button to put it on the right side of the introduction 2014-03-22 17:00:50 +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
Jim Minning 17f0f57b98 Update main.scss
Added IE specific user select none, to prevent text selection on IE swiping.
2014-03-22 07:28:51 -04:00
Gabriele Cirulli 6c12037b2a Update README.md 2014-03-21 15:33:51 +01:00
Gabriele Cirulli 03052c9a27 Merge pull request #85 from MaciejCzyzewski/patch-2
Update README.md, centered screenshot!
2014-03-21 15:33:08 +01:00
Gabriele Cirulli a875a3ab96 match and replace the "Updated" comment 2014-03-20 22:59:00 +01:00
Maciej A. Czyzewski 9ca6e3c788 Update README.md, centered screenshot!
I think screenshot is better when it is centered.
2014-03-20 22:01:34 +01:00
Gabriele Cirulli 6a4b3ec322 add basic rake file with appcache:update task 2014-03-20 19:57:48 +01:00
Gabriele Cirulli 95ca668676 Update README.md 2014-03-19 19:17:32 +01:00
Gabriele Cirulli 40fc9014eb credit elektryk 2014-03-19 15:11:20 +01:00
Gabriele Cirulli b6e48e2f24 update scss 2014-03-19 14:45:54 +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 01264c3252 set mobile threshold slightly wider than the board size 2014-03-14 18:31:04 +01:00
Gabriele Cirulli f732d4f547 remove debug logging 2014-03-14 13:56:38 +01:00
Gabriele Cirulli db0dc7eae1 rename keep playing to keep going 2014-03-14 13:50:57 +01:00
Gabriele Cirulli f663e17a4b add styling for super tiles 2014-03-14 13:50:49 +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
Gabriele Cirulli 15057fd625 Merge pull request #50 from codeKonami/master
adding a test to verify the localStorage is supported
2014-03-14 12:29:05 +01:00
Gabriele Cirulli 8772e1aee9 fix fill mode helper 2014-03-14 11:47:54 +01:00