Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: andybarron/civilwar2015
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: nicklytle/civilwar2015
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Can’t automatically merge. Don’t worry, you can still create the pull request.
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on Mar 22, 2015

  1. Minigame Update 

    Minigame reworked to use mouse input rather than keyboard, Game class
modified to correctly send cursor position to screen objects'
onMouseDown function
    @imjustjoshua
    imjustjoshua committed Mar 22, 2015
    Copy the full SHA
    9ffa929 View commit details
Showing with 391 additions and 361 deletions.
  1. +2 −2 scripts/engine/classes/Game.js
  2. +389 −359 scripts/game/screens/testMini.js
4 changes: 2 additions & 2 deletions scripts/engine/classes/Game.js
View file
Original file line number Diff line number Diff line change
@@ -56,7 +56,7 @@ define(
},

onMouseDown: function(point) {
this.currentScreen.onMouseDown(point);
this.currentScreen.onMouseDown(this.stage.getMousePosition());
},

setScreen: function(screen) {
@@ -84,7 +84,7 @@ define(
window.requestAnimationFrame(this.animationCallback);
this.newTime = new Date();
this.delta = (this.newTime.getTime() - this.oldTime.getTime()) / 1000.0;
if (this.delta > engine.MAX_DELTA) {
if (this.delta > engine.MAX_DELTA) {
this.delta = engine.MAX_DELTA;
}
this.oldTime = this.newTime;
Loading