Merge remote-tracking branch 'photonstorm_phaser/dev' into dev

This commit is contained in:
Louis Tovar committed 2013-11-15 14:21:00 -08:00
commit 4d80d6c9b2
17 files changed
+572 -29

No files matched your search

+1 -1
View File
@@ -59,7 +59,6 @@
<script src="../src/pixi/textures/BaseTexture.js"></script>
<script src="../src/pixi/textures/Texture.js"></script>
<script src="../src/pixi/textures/RenderTexture.js"></script>
<script src="../src/pixi/utils/EventTarget.js"></script>
<script src="../src/pixi/utils/Polyk.js"></script>
@@ -88,6 +87,7 @@
<script src="../src/gameobjects/Events.js"></script>
<script src="../src/gameobjects/GameObjectFactory.js"></script>
<script src="../src/gameobjects/BitmapData.js"></script>
<script src="../src/gameobjects/Sprite.js"></script>
<script src="../src/gameobjects/TileSprite.js"></script>
<script src="../src/gameobjects/Text.js"></script>