diff --git a/bootstrap-venv.py b/bootstrap-venv.py index f697c51..e00e2fa 100644 --- a/bootstrap-venv.py +++ b/bootstrap-venv.py @@ -140,9 +140,13 @@ def bootstrap_buildout(venv_dir, bootstrap_path): else: fp.close() - print("Bootstrapping Buildout using: %s %s install..." % ( + print("Bootstrapping Buildout using: %s %s..." % ( python_bin, bootstrap_path)) - subprocess.check_call([python_bin, bootstrap_path, "install"]) + subprocess.check_call([python_bin, bootstrap_path]) + + print("Invoking bootstrapped buildout...") + buildout_bin = os.path.join(os.path.dirname(bootstrap_path), "bin", "buildout") + subprocess.check_call([buildout_bin]) if len(sys.argv) == 2: diff --git a/src/scripts/view/battle/Arena.ts b/src/scripts/view/battle/Arena.ts index 2ba9d22..d9af399 100644 --- a/src/scripts/view/battle/Arena.ts +++ b/src/scripts/view/battle/Arena.ts @@ -26,7 +26,7 @@ module SpaceTac.View { var background = new Phaser.Button(battleview.game, 0, 0, "ui-arena-background"); var expected_width = this.stage.width - 252; var expected_height = this.stage.height - 100; - background.scale.set(expected_width/ background.width, expected_height / background.height); + background.scale.set(expected_width / background.width, expected_height / background.height); this.background = background; // Capture clicks on background diff --git a/src/scripts/view/battle/ArenaShip.ts b/src/scripts/view/battle/ArenaShip.ts index 088775c..0b0123d 100644 --- a/src/scripts/view/battle/ArenaShip.ts +++ b/src/scripts/view/battle/ArenaShip.ts @@ -19,7 +19,7 @@ module SpaceTac.View { super(battleview.game); // Add hover effect - this.hover = new Phaser.Image(battleview.game, 0, 0, "ui-battle-shipspritehover"); + this.hover = new Phaser.Image(battleview.game, 0, 0, "ui-battle-shipspritehover", 0); this.hover.scale.set(0.4, 0.4); this.hover.anchor.set(0.5, 0.5); this.hover.visible = false;