diff --git a/.circleci/config.yml b/.circleci/config.yml index 2a7313b7..71f57910 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -184,9 +184,11 @@ jobs: - run: name: Package app bundle + environment: + COMMIT_TAG: pipeline.git.tag command: | cd ~/MBHaxe - ./package-macos.sh v1.3.1 + ./package-macos.sh v$COMMIT_TAG cd "macos-dist/MarbleBlast Platinum.app/Contents/MacOS" otool -L marblegame cd ../Frameworks @@ -221,6 +223,9 @@ jobs: # Invoke jobs via workflows # See: https://circleci.com/docs/2.0/configuration-reference/#workflows workflows: - say-hello-workflow: + build-mac: jobs: - - build + - build: + filters: + tags: + only: /^\d+.\d+.\d+$/ \ No newline at end of file diff --git a/src/MarbleWorld.hx b/src/MarbleWorld.hx index ded877f9..c45d57be 100644 --- a/src/MarbleWorld.hx +++ b/src/MarbleWorld.hx @@ -1631,9 +1631,9 @@ class MarbleWorld extends Scheduler { public function addBonusTime(t:Float) { this.bonusTime += t; if (t > 0) { - this.playGui.addMiddleMessage('+${t}s', 0x99ff99); + this.playGui.addMiddleMessage('-${t}s', 0x99ff99); } else if (t < 0) { - this.playGui.addMiddleMessage('${t}s', 0xff9999); + this.playGui.addMiddleMessage('+${- t}s', 0xff9999); } else { this.playGui.addMiddleMessage('+0s', 0xcccccc); } @@ -1723,7 +1723,8 @@ class MarbleWorld extends Scheduler { playGui.setCenterText('outofbounds'); AudioManager.playSound(ResourceLoader.getResource('data/sound/whoosh.wav', ResourceLoader.getAudio, this.soundResources)); // if (this.replay.mode != = 'playback') - this.schedule(this.timeState.currentAttemptTime + 2, () -> this.restart()); + this.schedule(this.timeState.currentAttemptTime + 2, () -> playGui.setCenterText('none')); + this.schedule(this.timeState.currentAttemptTime + 2.5, () -> this.restart()); } /** Sets a new active checkpoint. */ diff --git a/src/gui/EndGameGui.hx b/src/gui/EndGameGui.hx index 3029ad69..48842fd6 100644 --- a/src/gui/EndGameGui.hx +++ b/src/gui/EndGameGui.hx @@ -221,7 +221,7 @@ class EndGameGui extends GuiControl { if (mission.qualifyTime > timeState.gameplayClock) { text += "You beat the Par Time!"; } else { - text += 'You didn\'nt pass the Par Time!'; + text += 'You didn\'t pass the Par Time!'; } } }