Skip to content

Commit d510b78

Browse files
committed
Putting everything back together again :)
1 parent fe372af commit d510b78

46 files changed

Lines changed: 33525 additions & 33431 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

Phaser/Collision.ts

Lines changed: 0 additions & 1702 deletions
This file was deleted.

Phaser/Game.ts

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,24 @@
1+
/// <reference path="core/Rectangle.ts" />
2+
/// <reference path="math/LinkedList.ts" />
3+
/// <reference path="math/QuadTree.ts" />
4+
/// <reference path="core/Point.ts" />
5+
/// <reference path="core/Vec2.ts" />
6+
/// <reference path="core/Circle.ts" />
7+
/// <reference path="core/Group.ts" />
8+
/// <reference path="core/Signal.ts" />
9+
/// <reference path="core/SignalBinding.ts" />
110
/// <reference path="loader/Loader.ts" />
211
/// <reference path="loader/Cache.ts" />
312
/// <reference path="math/GameMath.ts" />
413
/// <reference path="math/RandomDataGenerator.ts" />
514
/// <reference path="cameras/CameraManager.ts" />
615
/// <reference path="gameobjects/GameObjectFactory.ts" />
7-
/// <reference path="core/Group.ts" />
8-
/// <reference path="core/Signal.ts" />
9-
/// <reference path="core/SignalBinding.ts" />
1016
/// <reference path="sound/SoundManager.ts" />
1117
/// <reference path="Stage.ts" />
1218
/// <reference path="Time.ts" />
1319
/// <reference path="tweens/TweenManager.ts" />
1420
/// <reference path="World.ts" />
21+
/// <reference path="Motion.ts" />
1522
/// <reference path="system/Device.ts" />
1623
/// <reference path="system/RequestAnimationFrame.ts" />
1724
/// <reference path="input/Input.ts" />
@@ -169,12 +176,6 @@ module Phaser {
169176
*/
170177
public cache: Cache;
171178

172-
/**
173-
* Reference to the collision helper.
174-
* @type {Collision}
175-
*/
176-
//public collision: Collision;
177-
178179
/**
179180
* Reference to the input manager
180181
* @type {Input}
@@ -197,7 +198,7 @@ module Phaser {
197198
* Reference to the motion helper.
198199
* @type {Motion}
199200
*/
200-
//public motion: Motion;
201+
public motion: Motion;
201202

202203
/**
203204
* Reference to the sound manager.
@@ -279,14 +280,13 @@ module Phaser {
279280
else
280281
{
281282
this.device = new Device();
282-
//this.motion = new Motion(this);
283+
this.motion = new Motion(this);
283284
this.math = new GameMath(this);
284285
this.stage = new Stage(this, parent, width, height);
285286
this.world = new World(this, width, height);
286287
this.add = new GameObjectFactory(this);
287288
this.sound = new SoundManager(this);
288289
this.cache = new Cache(this);
289-
//this.collision = new Collision(this);
290290
this.loader = new Loader(this, this.loadComplete);
291291
this.time = new Time(this);
292292
this.tweens = new TweenManager(this);

0 commit comments

Comments
 (0)