1
0
mirror of https://github.com/danog/2048.git synced 2025-01-05 20:48:15 +01:00
Commit Graph

6 Commits

Author SHA1 Message Date
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
53b0bd2e17 move scripts to bottom of body 2014-03-11 14:30:09 +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
53e08722e0 add tile merging 2014-03-09 20:03:04 +01:00
Gabriele Cirulli
b20e26e3bd implement tile movement 2014-03-09 14:32:30 +01:00
Gabriele Cirulli
cf31e146aa basic grid implementation with initial setup 2014-03-08 12:50:45 +01:00