Merge branch 'master' into dots
commit
9c73e39298
|
@ -593,7 +593,7 @@ GameLib.System.GUI.prototype.buildArrayManagerControl = function(
|
||||||
|
|
||||||
var idObject = {};
|
var idObject = {};
|
||||||
|
|
||||||
var selectionObject = GameLib.EntityManager.Instance.queryComponents(constructors).reduce(
|
var selectionObject = GameLib.EntityManager.Instance.queryComponentsByConstructor(constructors).reduce(
|
||||||
function(result, component) {
|
function(result, component) {
|
||||||
result[component.name] = component;
|
result[component.name] = component;
|
||||||
idObject[component.id] = component;
|
idObject[component.id] = component;
|
||||||
|
|
|
@ -150,7 +150,7 @@ GameLib.System.Input.prototype.instanceCreated = function(data) {
|
||||||
|
|
||||||
if (data.component instanceof GameLib.Controls.D3.Editor) {
|
if (data.component instanceof GameLib.Controls.D3.Editor) {
|
||||||
if (this.editorControls.length > 0) {
|
if (this.editorControls.length > 0) {
|
||||||
console.log('ignoring multiple editor controls')
|
console.log('Ignoring multiple editor controls')
|
||||||
} else {
|
} else {
|
||||||
this.editorControls.push(data.component);
|
this.editorControls.push(data.component);
|
||||||
this.registerEditorControls();
|
this.registerEditorControls();
|
||||||
|
@ -159,7 +159,7 @@ GameLib.System.Input.prototype.instanceCreated = function(data) {
|
||||||
|
|
||||||
if (data.component instanceof GameLib.Controls.Touch) {
|
if (data.component instanceof GameLib.Controls.Touch) {
|
||||||
if (this.touchControls.length > 0) {
|
if (this.touchControls.length > 0) {
|
||||||
console.log('ignoring multiple touch controls')
|
console.log('Ignoring multiple touch controls')
|
||||||
} else {
|
} else {
|
||||||
this.touchControls.push(data.component);
|
this.touchControls.push(data.component);
|
||||||
this.registerTouchControls();
|
this.registerTouchControls();
|
||||||
|
@ -168,7 +168,7 @@ GameLib.System.Input.prototype.instanceCreated = function(data) {
|
||||||
|
|
||||||
if (data.component instanceof GameLib.Controls.Keyboard) {
|
if (data.component instanceof GameLib.Controls.Keyboard) {
|
||||||
if (this.keyboardControls.length > 0 || this.editorControls.length > 0) {
|
if (this.keyboardControls.length > 0 || this.editorControls.length > 0) {
|
||||||
console.log('ignoring multiple keyboard controls')
|
console.log('Ignoring multiple keyboard controls')
|
||||||
} else {
|
} else {
|
||||||
this.keyboardControls.push(data.component);
|
this.keyboardControls.push(data.component);
|
||||||
this.registerKeyboardControls();
|
this.registerKeyboardControls();
|
||||||
|
@ -177,7 +177,7 @@ GameLib.System.Input.prototype.instanceCreated = function(data) {
|
||||||
|
|
||||||
if (data.component instanceof GameLib.Controls.Mouse) {
|
if (data.component instanceof GameLib.Controls.Mouse) {
|
||||||
if (this.mouseControls.length > 0) {
|
if (this.mouseControls.length > 0) {
|
||||||
console.log('ignoring multiple mouse controls')
|
console.log('Ignoring multiple mouse controls')
|
||||||
} else {
|
} else {
|
||||||
this.mouseControls.push(data.component);
|
this.mouseControls.push(data.component);
|
||||||
this.registerMouseControls();
|
this.registerMouseControls();
|
||||||
|
|
|
@ -636,7 +636,7 @@ GameLib.System.Storage.prototype.xhrLoad = function(
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
console.log("Loading...", 'success');
|
console.log('Loading from ' + url);
|
||||||
|
|
||||||
var xhr = new XMLHttpRequest();
|
var xhr = new XMLHttpRequest();
|
||||||
xhr.open("GET", url);
|
xhr.open("GET", url);
|
||||||
|
|
Loading…
Reference in New Issue