Gabriele Cirulli 39ebf51ce2 fix merge conflict

2014-03-12 11:23:22 +01: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

html_actuator.js

fix merge conflict

2014-03-12 11:23:22 +01:00

keyboard_input_manager.js

remove hammer, small js changes

2014-03-11 22:18:56 +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