Merge branch 'dev' into multitexture-gl

Author: bitnenfer

build/config.php

@@ -112,6 +112,7 @@
 
     <script src="$path/src/geom/Circle.js"></script>
     <script src="$path/src/geom/Ellipse.js"></script>
+    <script src="$path/src/geom/Hermite.js"></script>
     <script src="$path/src/geom/Line.js"></script>
     <script src="$path/src/geom/Matrix.js"></script>
     <script src="$path/src/geom/Point.js"></script>
@@ -134,7 +135,6 @@
     <script src="$path/src/core/FlexGrid.js"></script>
     <script src="$path/src/core/FlexLayer.js"></script>
     <script src="$path/src/core/ScaleManager.js"></script>
-    <script src="$path/src/core/MainLoop.js"></script>
     <script src="$path/src/core/Game.js"></script>
 
     <script src="$path/src/input/Input.js"></script>
@@ -204,6 +204,12 @@
     <script src="$path/src/plugins/weapon/WeaponPlugin.js"></script>
     <script src="$path/src/plugins/weapon/Bullet.js"></script>
 
+    <script src="$path/src/plugins/path/PathManagerPlugin.js"></script>
+    <script src="$path/src/plugins/path/Path.js"></script>
+    <script src="$path/src/plugins/path/PathFollower.js"></script>
+    <script src="$path/src/plugins/path/PathPoint.js"></script>
+    <script src="$path/src/plugins/path/EventTarget.js"></script>
+
 EOL;
 
     if ($modules['rope'])

src/core/Game.js

@@ -144,17 +144,11 @@ Phaser.Game = function (width, height, renderer, parent, state, transparent, ant
     */
     this.isRunning = false;
 
-    /**
-    * @property {Phaser.MainLoop} mainloop - Automatically handles the core game loop via requestAnimationFrame or setTimeout.
-    * @protected
-    */
-    this.mainloop = null;
-
     /**
     * @property {Phaser.RequestAnimationFrame} raf - Automatically handles the core game loop via requestAnimationFrame or setTimeout
     * @protected
     */
-    // this.raf = null;
+    this.raf = null;
 
     /**
     * @property {Phaser.GameObjectFactory} add - Reference to the Phaser.GameObjectFactory.
@@ -589,7 +583,6 @@ Phaser.Game.prototype = {
 
         this.isRunning = true;
 
-        /*
         if (this.config && this.config['forceSetTimeOut'])
         {
             this.raf = new Phaser.RequestAnimationFrame(this, this.config['forceSetTimeOut']);
@@ -600,7 +593,6 @@ Phaser.Game.prototype = {
         }
 
         this._kickstart = true;
-        */
 
         if (window['focus'])
         {
@@ -610,11 +602,7 @@ Phaser.Game.prototype = {
             }
         }
 
-        this.mainloop = new Phaser.MainLoop(this);
-
-        this.mainloop.start();
-
-        // this.raf.start();
+        this.raf.start();
 
     },