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

107 Commits

Author SHA1 Message Date
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
Gabriele Cirulli 7f99ed8316 Merge branch 'master' into gh-pages 2014-03-10 19:38:53 +01:00
Gabriele Cirulli 57deb5d998 move event send after type definition 2014-03-10 19:38:46 +01:00
Gabriele Cirulli 8bd4133b74 Merge branch 'master' into gh-pages 2014-03-10 19:01:26 +01:00
Gabriele Cirulli a422799481 Merge pull request #2 from rayhaanj/master 
Add vim keybindings
 2014-03-10 18:58:36 +01:00
Gabriele Cirulli 2125c04a68 Merge branch 'master' into gh-pages 2014-03-10 18:56:17 +01:00
Gabriele Cirulli b3c822c7d5 add swipe gesture support 2014-03-10 18:47:21 +01:00
rayhaanj fb8eabe9b0 Added vim keybindings 2014-03-10 17:33:58 +00:00
Gabriele Cirulli 9d48120a14 Merge branch 'master' into gh-pages 2014-03-10 18:04:14 +01:00
Gabriele Cirulli 433127cd93 remove use of class list in actuator, fix animations for firefox 2014-03-10 18:03:43 +01:00
Gabriele Cirulli aaebb037d2 Merge branch 'master' into gh-pages 2014-03-10 12:33:32 +01:00
Gabriele Cirulli a1e98e0d86 press space to restart 2014-03-10 12:29:35 +01:00
Gabriele Cirulli 06fa37b0ae add twitter sharing to game over screen 2014-03-10 12:09:35 +01:00
Gabriele Cirulli c84ebb04b5 merge master & readd ga 2014-03-10 11:33:06 +01:00
Gabriele Cirulli ce33401d05 remove analytics from master 2014-03-10 11:32:04 +01:00
Gabriele Cirulli 02b66ccb9b add retry button 2014-03-10 11:31:10 +01:00
Gabriele Cirulli 043b1ae08a add analytics 2014-03-09 23:58:41 +01:00
Gabriele Cirulli e65111f13b add win condition 2014-03-09 23:43:56 +01:00
Gabriele Cirulli 4b3055fcd0 add movement check, score addition 2014-03-09 23:24:17 +01:00