mirror of
https://github.com/logsol/chuck.js.git
synced 2026-05-11 10:37:34 +00:00
Merge 806a9d8194 into e6089687ed
This commit is contained in:
commit
f03926424a
17 changed files with 59 additions and 49 deletions
|
|
@ -1,11 +1,11 @@
|
|||
define([
|
||||
"Game/" + GLOBALS.context + "/Physics/Engine",
|
||||
"Game/" + GLOBALS.context + "/Loader/TiledLevel",
|
||||
"Game/" + GLOBALS.context + "/Player",
|
||||
"Game/" + App.context + "/Physics/Engine",
|
||||
"Game/" + App.context + "/Loader/TiledLevel",
|
||||
"Game/" + App.context + "/Player",
|
||||
"Lib/Utilities/NotificationCenter",
|
||||
"Game/" + GLOBALS.context + "/GameObjects/Doll",
|
||||
"Game/" + GLOBALS.context + "/GameObjects/GameObject",
|
||||
"Game/" + GLOBALS.context + "/GameObjects/Item",
|
||||
"Game/" + App.context + "/GameObjects/Doll",
|
||||
"Game/" + App.context + "/GameObjects/GameObject",
|
||||
"Game/" + App.context + "/GameObjects/Item",
|
||||
"Lib/Utilities/Assert",
|
||||
],
|
||||
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
define([
|
||||
"Game/" + GLOBALS.context + "/GameObjects/GameObject",
|
||||
"Game/" + App.context + "/GameObjects/GameObject",
|
||||
"Lib/Utilities/Exception",
|
||||
"Lib/Vendor/Box2D",
|
||||
"Game/Config/Settings",
|
||||
"Game/" + GLOBALS.context + "/Collision/Detector",
|
||||
"Game/" + GLOBALS.context + "/GameObjects/Item",
|
||||
"Game/" + App.context + "/Collision/Detector",
|
||||
"Game/" + App.context + "/GameObjects/Item",
|
||||
"Lib/Utilities/NotificationCenter",
|
||||
"Lib/Utilities/Assert"
|
||||
],
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
define([
|
||||
"Game/" + GLOBALS.context + "/GameObjects/GameObject",
|
||||
"Game/" + App.context + "/GameObjects/GameObject",
|
||||
"Lib/Vendor/Box2D",
|
||||
"Lib/Utilities/OptionsHelper",
|
||||
"Game/Config/Settings",
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
define([
|
||||
"Game/" + GLOBALS.context + "/GameObjects/Item",
|
||||
"Game/" + App.context + "/GameObjects/Item",
|
||||
"Lib/Vendor/Box2D",
|
||||
"Game/Config/Settings",
|
||||
"Lib/Utilities/NotificationCenter",
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
define([
|
||||
"Game/" + GLOBALS.context + "/GameObjects/Item",
|
||||
"Game/" + App.context + "/GameObjects/Item",
|
||||
"Lib/Vendor/Box2D",
|
||||
"Game/Config/Settings"
|
||||
],
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
define([
|
||||
"Game/" + GLOBALS.context + "/GameObjects/Item",
|
||||
"Game/" + App.context + "/GameObjects/Item",
|
||||
"Lib/Vendor/RubeLoader",
|
||||
"Lib/Vendor/Box2D",
|
||||
"Game/Config/Settings",
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
define([
|
||||
"Game/" + GLOBALS.context + "/GameObjects/Item",
|
||||
"Game/" + App.context + "/GameObjects/Item",
|
||||
"Lib/Vendor/Box2D",
|
||||
"Game/Config/Settings",
|
||||
"Lib/Utilities/Assert"
|
||||
|
|
@ -89,7 +89,7 @@ function (Parent, Box2D, Settings, Assert) {
|
|||
|
||||
/*
|
||||
define([
|
||||
"Game/" + GLOBALS.context + "/GameObjects/Item",
|
||||
"Game/" + App.context + "/GameObjects/Item",
|
||||
"Lib/Vendor/Box2D",
|
||||
"Game/Config/Settings",
|
||||
"Lib/Utilities/Assert"
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
define([
|
||||
"Game/" + GLOBALS.context + "/GameObjects/GameObject",
|
||||
"Game/" + App.context + "/GameObjects/GameObject",
|
||||
"Lib/Vendor/Box2D"
|
||||
],
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
define([
|
||||
"Game/" + GLOBALS.context + "/GameObjects/GameObject",
|
||||
"Game/" + App.context + "/GameObjects/GameObject",
|
||||
"Lib/Vendor/Box2D",
|
||||
"Game/Config/Settings",
|
||||
"Lib/Utilities/Exception",
|
||||
|
|
|
|||
|
|
@ -3,12 +3,12 @@ define([
|
|||
"Lib/Vendor/Box2D",
|
||||
"Lib/Utilities/NotificationCenter",
|
||||
"Lib/Utilities/Abstract",
|
||||
"Game/" + GLOBALS.context + "/Collision/Detector",
|
||||
"Game/" + GLOBALS.context + "/GameObjects/Tile",
|
||||
"Game/" + GLOBALS.context + "/GameObjects/Item",
|
||||
"Game/" + GLOBALS.context + "/GameObjects/Items/Skateboard",
|
||||
"Game/" + GLOBALS.context + "/GameObjects/Items/RagDoll",
|
||||
"Game/" + GLOBALS.context + "/GameObjects/Items/RubeDoll"
|
||||
"Game/" + App.context + "/Collision/Detector",
|
||||
"Game/" + App.context + "/GameObjects/Tile",
|
||||
"Game/" + App.context + "/GameObjects/Item",
|
||||
"Game/" + App.context + "/GameObjects/Items/Skateboard",
|
||||
"Game/" + App.context + "/GameObjects/Items/RagDoll",
|
||||
"Game/" + App.context + "/GameObjects/Items/RubeDoll"
|
||||
|
||||
], function (Settings, Box2D, nc, Abstract, CollisionDetector, Tile, Item, Skateboard, RagDoll, RubeDoll) {
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
define([
|
||||
"Game/" + GLOBALS.context + "/Loader/Level",
|
||||
"Game/" + App.context + "/Loader/Level",
|
||||
"Game/Config/Settings",
|
||||
"Game/Config/ItemSettings",
|
||||
"Lib/Vendor/Box2D",
|
||||
|
|
@ -8,10 +8,10 @@ define([
|
|||
"Lib/Utilities/NotificationCenter",
|
||||
"Lib/Utilities/Assert",
|
||||
"Game/Client/View/Abstract/Layer",
|
||||
"Game/" + GLOBALS.context + "/Collision/Detector",
|
||||
"Game/" + GLOBALS.context + "/GameObjects/Tile",
|
||||
"Game/" + GLOBALS.context + "/GameObjects/Item",
|
||||
"Game/" + GLOBALS.context + "/GameObjects/Items/Skateboard",
|
||||
"Game/" + App.context + "/Collision/Detector",
|
||||
"Game/" + App.context + "/GameObjects/Tile",
|
||||
"Game/" + App.context + "/GameObjects/Item",
|
||||
"Game/" + App.context + "/GameObjects/Items/Skateboard",
|
||||
|
||||
], function (Parent, Settings, ItemSettings, Box2D, optionsHelper, Exception, nc, Assert, AbstractLayer, CollisionDetector, Tile, Item, Skateboard) {
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
define([
|
||||
"Game/Config/Settings",
|
||||
"Lib/Vendor/Box2D",
|
||||
"Game/" + GLOBALS.context + "/Collision/Detector",
|
||||
"Game/" + App.context + "/Collision/Detector",
|
||||
"Lib/Utilities/NotificationCenter"
|
||||
],
|
||||
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
define([
|
||||
"Game/" + GLOBALS.context + "/GameObjects/Doll",
|
||||
"Game/" + GLOBALS.context + "/Control/PlayerController",
|
||||
"Game/" + App.context + "/GameObjects/Doll",
|
||||
"Game/" + App.context + "/Control/PlayerController",
|
||||
"Game/Config/Settings",
|
||||
"Lib/Utilities/NotificationCenter",
|
||||
"Lib/Utilities/Exception",
|
||||
"Lib/Utilities/ColorConverter",
|
||||
"Game/" + GLOBALS.context + "/GameObjects/SpectatorDoll",
|
||||
"Game/" + GLOBALS.context + "/GameObjects/Items/RubeDoll"
|
||||
"Game/" + App.context + "/GameObjects/SpectatorDoll",
|
||||
"Game/" + App.context + "/GameObjects/Items/RubeDoll"
|
||||
],
|
||||
|
||||
function (Doll, PlayerController, Settings, nc, Exception, ColorConverter, SpectatorDoll, RubeDoll) {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue