Gabriele Cirulli 03ec53ea25 fix conflict

2014-03-12 13:03:37 +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

add small code tweaks

2014-03-12 12:15:57 +01:00

grid.js

add tile merging

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

html_actuator.js

fix conflict

2014-03-12 13:03:37 +01:00

keyboard_input_manager.js

add small code tweaks

2014-03-12 12:15:57 +01:00

local_score_manager.js

add small code tweaks

2014-03-12 12:15:57 +01:00

tile.js

add tile merging

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