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

..

animframe_polyfill.js

add requestanimationframe polyfill

2014-03-11 14:48:42 +01:00

application.js

Merge remote-tracking branch 'upstream/master' into best-score

2014-03-11 12:05:42 -04:00

game_manager.js

localStorage fallback

2014-03-11 11:52:02 -04:00

grid.js

add tile merging

2014-03-09 20:03:04 +01:00

hammer.min.js

add swipe gesture support

2014-03-10 18:47:21 +01:00

html_actuator.js

localStorage fallback

2014-03-11 11:52:02 -04:00

keyboard_input_manager.js

add WASD controls (closes #10)

2014-03-11 16:31:39 +01:00

local_score_manager.js

localStorage fallback

2014-03-11 11:52:02 -04:00

tile.js

add tile merging

2014-03-09 20:03:04 +01:00