1
0
mirror of https://github.com/danog/2048.git synced 2024-11-30 04:19:06 +01:00
Commit Graph

23 Commits

Author SHA1 Message Date
Gabriele Cirulli
39ebf51ce2 fix merge conflict 2014-03-12 11:23:22 +01:00
Gabriele Cirulli
f251f5c898 remove hammer, small js changes 2014-03-11 22:18:56 +01: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
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
bc2a710ea9 add threes reference. closes #7 2014-03-11 10:45:15 +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
b3c822c7d5 add swipe gesture support 2014-03-10 18:47:21 +01:00
Gabriele Cirulli
46813070ac add container around sharing functionality 2014-03-10 12:07:11 +01:00
Gabriele Cirulli
02b66ccb9b add retry button 2014-03-10 11:31:10 +01:00
Gabriele Cirulli
f18f7cee22 add score and endgame 2014-03-09 23:03:13 +01:00
Gabriele Cirulli
b20e26e3bd implement tile movement 2014-03-09 14:32:30 +01:00
Gabriele Cirulli
b7476f1f62 make actuator properly create html elements 2014-03-08 13:32:37 +01:00
Gabriele Cirulli
dca5207fa4 extract the grid to its own class 2014-03-08 13:10:54 +01:00
Gabriele Cirulli
cf31e146aa basic grid implementation with initial setup 2014-03-08 12:50:45 +01:00
Gabriele Cirulli
fd2927c37c add game explanation, remove test tiles 2014-03-05 23:15:57 +01:00
Gabriele Cirulli
3f6f06e2df fade tile text to white 2014-03-05 17:34:04 +01:00
Gabriele Cirulli
5e41f41a69 generate tile colors automatically 2014-03-05 16:33:31 +01:00
Gabriele Cirulli
a26e1c6bbd rename style.scss to main.scss 2014-03-05 16:10:54 +01:00
Gabriele Cirulli
c45115f9ae move fonts to style 2014-03-05 16:09:11 +01:00
Gabriele Cirulli
b0bf6c5e20 basic tile styling 2014-03-05 16:07:40 +01:00
Gabriele Cirulli
3403e78c4b basic styling 2014-03-05 15:38:29 +01:00