danog/2048
1
0
Fork 0
mirror of https://github.com/danog/2048.git synced 2024-12-03 09:47:49 +01:00
Code Issues Projects Releases Wiki Activity
138 Commits 2 Branches 0 Tags 661 KiB
e729f7457f
Commit Graph

138 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
7c6fd1b2a4 Merge pull request #28 from gabrielecirulli/use-transforms 
Use transforms for tile positions
 2014-03-13 23:14:06 +01:00
Gabriele Cirulli
74494bb5f5 modify the game to allow using transforms 2014-03-13 23:11:02 +01:00
Gabriele Cirulli
92399414eb Merge pull request #48 from iharosi/master 
minimal-ui added to allow fullscreen on iOS 7.1
 2014-03-13 23:04:20 +01:00
Gabriele Cirulli
ca5762310a Merge branch 'master' into use-transforms 2014-03-13 22:53:06 +01:00
Gergely Iharosi
7f1a82e41e minimal-ui added to allow fullscreen on iOS 7.1 
More details on the iOS dev site: http://goo.gl/H6RILo
 2014-03-13 22:52:25 +01:00
Marcin Gajda
7f187251a8 Windows Phone touch events 2014-03-13 20:27:09 +01:00
Gabriele Cirulli
d7ef12e41c change site note 2014-03-13 17:10:14 +01:00
Gabriele Cirulli
425076c759 add official site note 2014-03-13 16:51:55 +01:00
Laurent Margirier
c329f35796 Update refs 2014-03-13 10:40:59 +01:00
Laurent Margirier
bd62716d60 add touchend event (see PR #32) 2014-03-13 10:17:57 +01:00
Laurent Margirier
e7be14d65a compile main.css 2014-03-13 10:16:19 +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
da75b7a44e Merge pull request #32 from coding46/patch-1 
[BUGFIX] Add touch event handler for retry button
 2014-03-12 21:56:13 +01:00
Gabriele Cirulli
bd8516ac7d Merge pull request #29 from TimPetricola/fix-readme 
Fix README
 2014-03-12 18:04:16 +01:00