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
parent d6da8d9925 39ba3a986f
commit 77654452a7
9 changed files with 464 additions and 146 deletions
@@ -1,6 +1,4 @@
-document.addEventListener("DOMContentLoaded", function () {
-  // Wait till the browser is ready to render the game (avoids glitches)
-  window.requestAnimationFrame(function () {
-    new GameManager(4, KeyboardInputManager, HTMLActuator, LocalScoreManager);
-  });
+// Wait till the browser is ready to render the game (avoids glitches)
+window.requestAnimationFrame(function () {
+  new GameManager(4, KeyboardInputManager, HTMLActuator, LocalScoreManager);
 });