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

75 Commits

Author SHA1 Message Date
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
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
Gabriele Cirulli 5c6327f390 add WASD controls (closes #10) 2014-03-11 16:31:39 +01:00
Gabriele Cirulli 347e11f1dc merge conflict 2014-03-11 14:49:07 +01:00
Gabriele Cirulli d2315af2ec add requestanimationframe polyfill 2014-03-11 14:48:42 +01:00
Gabriele Cirulli 1cfb14c467 merge conflict 2014-03-11 14:31:12 +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 557b35f988 Merge branch 'master' into gh-pages 2014-03-10 20:46:50 +01:00
Gabriele Cirulli e4476b44e0 remove debug printing 2014-03-10 20:45:43 +01:00
Gabriele Cirulli 8ac3e1d0c5 Merge branch 'master' into gh-pages 2014-03-10 20:43:41 +01:00
Gabriele Cirulli c0ca375c3a properly ignore meta keys 2014-03-10 20:42:03 +01:00
Gabriele Cirulli 1ddcdae421 fix hashtag 2014-03-10 19:55:24 +01:00
Gabriele Cirulli b71af089c5 add hashtags on 2048 2014-03-10 19:51:38 +01:00
Gabriele Cirulli 62a314ad72 remove repeated ga call 2014-03-10 19:40:44 +01:00