Browse Source

Merge branch 'Fix-issue-#21' into 'staging'

Removed console.log #21

See merge request !14
tags/v0.1.2
Big Bad Waffle 7 years ago
parent
commit
0c22450476
5 changed files with 3 additions and 12 deletions
  1. +0
    -3
      src/client/plugins/pixi.particles.js
  2. +1
    -1
      src/server/components/dialogue.js
  3. +2
    -5
      src/server/components/stats.js
  4. +0
    -1
      src/server/config/spells/spellSlowBlast.js
  5. +0
    -2
      src/server/config/spells/spellWarnBlast.js

+ 0
- 3
src/client/plugins/pixi.particles.js View File

@@ -630,9 +630,6 @@ if (!Array.prototype.random) {
this.rawPosition.x += this.velocity.x * delta;
this.rawPosition.y += this.velocity.y * delta;

//if (isNaN(this.velocity.x))
// console.log(this.startSpeed + ' ' + this.endSpeed);

this.position.x = ~~(this.rawPosition.x / 2) * 2;
this.position.y = ~~(this.rawPosition.y / 2) * 2;
}


+ 1
- 1
src/server/components/dialogue.js View File

@@ -86,7 +86,7 @@ define([
console.log('NO DIALOGUE STATES?!?!??!');
console.log('NO DIALOGUE STATES?!?!??!');
console.log('NO DIALOGUE STATES?!?!??!');
console.log(this.obj);
console.log(this.obj);
return null;
}
var stateConfig = this.states[state];


+ 2
- 5
src/server/components/stats.js View File

@@ -232,11 +232,8 @@ define([

if (a.obj.stats)
a.obj.stats.getXp(inc);
else {
console.log('give xp to???');
console.log(a.obj);
}

a.obj.fireEvent('afterKillMob', target);
}



+ 0
- 1
src/server/config/spells/spellSlowBlast.js View File

@@ -128,7 +128,6 @@ define([
},

cast: function(action) {
console.log(1);
this.castingEffect = this.obj.effects.addEffect({
type: 'casting'
});


+ 0
- 2
src/server/config/spells/spellWarnBlast.js View File

@@ -82,8 +82,6 @@ define([
}]
};

console.log(this.particles);

syncer.queue('onGetObject', effect);

this.queueCallback(this.onWarningOver.bind(this, x, y), this.delay * 350);


Loading…
Cancel
Save