jeena/chuck.js
1
0
Fork 0
mirror of https://github.com/logsol/chuck.js.git synced 2026-05-11 10:37:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of github.com:logsol/chuck.js

Browse source
This commit is contained in:
logsol 2013-12-11 21:23:52 +01:00
commit 88d70f2549
14 changed files with 50 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

8
app/Game/Client/Collision/Detector.js
View file

@ -1,9 +1,8 @@
define([
"Game/Core/Collision/Detector",
"Lib/Vendor/Box2D"
"Game/Core/Collision/Detector"
],
function (Parent, Box2D) {
function (Parent) {
function Detector (player) {
Parent.call(this, player);
@ -11,5 +10,8 @@ function (Parent, Box2D) {
Detector.prototype = Object.create(Parent.prototype);
Detector.IDENTIFIER = Parent.IDENTIFIER; // Needed because otherwise it will not be
// inherited because it is not in prototype
return Detector;
});

9
app/Game/Client/Loader/Level.js Normal file
View file

@ -0,0 +1,9 @@
define([
"Game/Core/Loader/Level"
],
function(Parent) {
return Parent;
});

9
app/Game/Client/Physics/Doll.js Normal file
View file

@ -0,0 +1,9 @@
define([
"Game/Core/Physics/Doll"
],
function(Parent) {
return Parent;
});

9
app/Game/Client/Player.js Normal file
View file

@ -0,0 +1,9 @@
define([
"Game/Core/Player"
],
function(Parent) {
return Parent;
});

6
app/Game/Core/GameController.js
View file

@ -1,7 +1,7 @@
define([
"Game/Core/Physics/Engine",
"Game/Core/Loader/Level",
"Game/Core/Player"
"Game/" + GLOBALS.context + "/Physics/Engine",
"Game/" + GLOBALS.context + "/Loader/Level",
"Game/" + GLOBALS.context + "/Player"
],
function (Engine, Level, Player) {

3
app/Game/Core/Loader/Level.js
View file

@ -1,7 +1,8 @@
define([
"Game/Config/Settings",
"Lib/Vendor/Box2D",
"Game/Core/Collision/Detector"
"Game/" + GLOBALS.context + "/Collision/Detector"
], function (Settings, Box2D, CollisionDetector) {
// Public

2
app/Game/Core/Physics/Doll.js
View file

@ -1,7 +1,7 @@
define([
"Lib/Vendor/Box2D",
"Game/Config/Settings",
"Game/Core/Collision/Detector"
"Game/" + GLOBALS.context + "/Collision/Detector"
],
function (Box2D, Settings, CollisionDetector) {

2
app/Game/Core/Physics/Engine.js
View file

@ -1,7 +1,7 @@
define([
"Game/Config/Settings",
"Lib/Vendor/Box2D",
"Game/Core/Collision/Detector"
"Game/" + GLOBALS.context + "/Collision/Detector"
],
function (Settings, Box2D, CollisionDetector) {

2
app/Game/Core/Player.js
View file

@ -1,5 +1,5 @@
define([
"Game/Core/Physics/Doll",
"Game/" + GLOBALS.context + "/Physics/Doll",
"Game/Config/Settings"
],

8
app/Game/Server/Collision/Detector.js
View file

@ -1,9 +1,8 @@
define([
"Game/Core/Collision/Detector",
"Lib/Vendor/Box2D"
"Game/Core/Collision/Detector"
],
function (Parent, Box2D) {
function (Parent) {
function Detector (player) {
Parent.call(this, player);
@ -11,5 +10,8 @@ function (Parent, Box2D) {
Detector.prototype = Object.create(Parent.prototype);
Detector.IDENTIFIER = Parent.IDENTIFIER; // Needed because otherwise it will not be
// inherited because it is not in prototype
return Detector;
});

2
app/Game/Server/Loader/Level.js
View file

@ -1,5 +1,5 @@
define([
"Game/Core/Level"
"Game/Core/Loader/Level"
],
function(Parent) {

1
channel.js
View file

@ -1,3 +1,4 @@
GLOBALS = { context: "Server" };
var requirejs = require('requirejs');
requirejs.config({

2
client.js
View file

@ -1,3 +1,5 @@
GLOBALS = { context: "Client" };
requirejs.config({
baseUrl: 'app',
deps: ['Lib/Utilities/Extensions']

1
server.js
View file

@ -1,3 +1,4 @@
GLOBALS = { context: "Server" };
var requirejs = require('requirejs');
var inspector;