1
0
mirror of https://github.com/danog/2048.git synced 2024-11-26 19:34:44 +01:00
Commit Graph

74 Commits

Author SHA1 Message Date
Laurent Margirier
e61ef18824 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-12 13:05:57 +01:00
Gabriele Cirulli
385b65d086 mobile tweaks for best score 2014-03-12 12:55:40 +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
Gabriele Cirulli
3dd8f3e527 Merge pull request #22 from ghoullier/master
Use querySelector instead of getElementsByClassName
2014-03-12 10:48:18 +01:00
Grégory HOULLIER
95a2676b3b Use querySelector instead of getElementsByClassName 2014-03-12 08:59:12 +01:00
Gabriele Cirulli
29e4b85f32 update css 2014-03-11 22:21:34 +01:00
Gabriele Cirulli
f251f5c898 remove hammer, small js changes 2014-03-11 22:18:56 +01:00
Gabriele Cirulli
db82cf4952 Merge pull request #16 from chrisprice/master
Replace hammer with touch event handling
2014-03-11 22:15:19 +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
39ba3a986f Merge pull request #13 from remram44/readme-fixes
Minor fixes to README
2014-03-11 16:41:28 +01:00
Gabriele Cirulli
5c6327f390 add WASD controls (closes #10) 2014-03-11 16:31:39 +01:00
Remi Rampin
988d71f7a0 Minor fixes to README 2014-03-11 11:26:18 -04:00
Gabriele Cirulli
92fda72cf5 move button styles to mixin 2014-03-11 15:18:20 +01:00
Gabriele Cirulli
d2315af2ec add requestanimationframe polyfill 2014-03-11 14:48:42 +01:00
Gabriele Cirulli
5fb74faf5d add favicon meta tag 2014-03-11 14:38:38 +01:00
Gabriele Cirulli
53b0bd2e17 move scripts to bottom of body 2014-03-11 14:30:09 +01:00
Gabriele Cirulli
2e5ab789c1 add favicon 2014-03-11 12:29:25 +01:00
Gabriele Cirulli
84dbf49233 update address 2014-03-11 12:16:43 +01:00
Gabriele Cirulli
c9906c87fc Update README.md 2014-03-11 12:04:55 +01:00
Gabriele Cirulli
bc2a710ea9 add threes reference. closes #7 2014-03-11 10:45:15 +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
e4476b44e0 remove debug printing 2014-03-10 20:45:43 +01:00
Gabriele Cirulli
c0ca375c3a properly ignore meta keys 2014-03-10 20:42:03 +01:00
Gabriele Cirulli
57deb5d998 move event send after type definition 2014-03-10 19:38:46 +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
b3c822c7d5 add swipe gesture support 2014-03-10 18:47:21 +01:00
rayhaanj
96e9290af3 Added vim keybindings 2014-03-10 17:34:43 +00:00
rayhaanj
fb8eabe9b0 Added vim keybindings 2014-03-10 17:33:58 +00:00
rayhaanj
29c4bea172 Added vim keybindings 2014-03-10 17:30:53 +00:00
Gabriele Cirulli
a44433df03 Merge pull request #1 from Mechazawa/patch-1
forgot the http://
2014-03-10 18:23:33 +01:00
Mechazawa
914fdd0eac forgot the http://
Gotta properly link to saming his site bro
2014-03-10 18:21:49 +01:00
Gabriele Cirulli
4ab265f0fb update contributing link 2014-03-10 18:13:08 +01:00
Gabriele Cirulli
40f2df8414 add contributing guide 2014-03-10 18:12:33 +01:00
Gabriele Cirulli
e3554394e5 Update README.md 2014-03-10 18:11:31 +01:00
Gabriele Cirulli
32de41e73c add license 2014-03-10 18:07:22 +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
a1e98e0d86 press space to restart 2014-03-10 12:29:35 +01:00
Gabriele Cirulli
d24c67a458 update rendered stylesheet 2014-03-10 12:08:10 +01:00
Gabriele Cirulli
46813070ac add container around sharing functionality 2014-03-10 12:07:11 +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
2c066a55fc Update README.md 2014-03-10 00:13:50 +01:00
Gabriele Cirulli
378ca283f2 increase padding on score 2014-03-09 23:59:53 +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