Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Resolving merge conflicts.

  • Loading branch information...
commit 9388bf8d78b6c849c8f647d73ca925ede4f12eb4 2 parents 69be2d6 + e6447eb
@presstube authored
Showing with 11 additions and 2 deletions.
  1. +11 −0 src/hunted/Boost.js
  2. +0 −2  src/hunted/HuntedApp.js
View
11 src/hunted/Boost.js
@@ -38,11 +38,17 @@
force = PTUtils.polarDegrees(_p.boostThrust/*mult*/, ship.rotation);
ship.addForce(force);
boostFuel--;
+<<<<<<< HEAD
var shudder = 5;
// app.stage.x += Math.random()*shudder*mult - Math.random()*shudder*mult;
// app.stage.y += Math.random()*shudder*mult - Math.random()*shudder*mult;
app.stage.x += Math.random()*shudder - Math.random()*shudder;
app.stage.y += Math.random()*shudder - Math.random()*shudder;
+=======
+ var shudder = 15;
+ app.stage.x += Math.random()*shudder*mult - Math.random()*shudder*mult;
+ app.stage.y += Math.random()*shudder*mult - Math.random()*shudder*mult;
+>>>>>>> master
var boostChunk = PTUtils.makeTriangle('#fff', width*mult, width*mult);
boostChunk.x = ship.x;
boostChunk.y = ship.y;
@@ -59,6 +65,11 @@
tickCount++;
skin.scaleX = skin.scaleY = (boostFuel / _p.boostFuelLimit);
+<<<<<<< HEAD
+=======
+
+ // console.log('app: ' + window.app);
+>>>>>>> master
};
this.setBoostFuel = function(fuel) {
View
2  src/hunted/HuntedApp.js
@@ -63,8 +63,6 @@
wrapRadius: wrapRadius
});
-
-
stage.addChild(fpsLabel, levelText, scaleStage);
levelText.x = 10; levelText.y = 40;
Please sign in to comment.
Something went wrong with that request. Please try again.