thirdpartymirrors/MBHaxe
1
0
Fork 0
mirror of https://github.com/RandomityGuy/MBHaxe.git synced 2025-12-24 00:42:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix typos and build only on tagged commits

Browse source
This commit is contained in:
RandomityGuy 2022-12-19 15:08:06 +05:30
parent 8cecb8934c
commit 5e08f085b7
3 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
.circleci/config.yml
View file

@ -184,9 +184,11 @@ jobs:
- run: - run:
name: Package app bundle name: Package app bundle
environment:
COMMIT_TAG: pipeline.git.tag
command: | command: |
cd ~/MBHaxe cd ~/MBHaxe
./package-macos.sh v1.3.1 ./package-macos.sh v$COMMIT_TAG
cd "macos-dist/MarbleBlast Platinum.app/Contents/MacOS" cd "macos-dist/MarbleBlast Platinum.app/Contents/MacOS"
otool -L marblegame otool -L marblegame
cd ../Frameworks cd ../Frameworks
@ -221,6 +223,9 @@ jobs:
# Invoke jobs via workflows # Invoke jobs via workflows
# See: https://circleci.com/docs/2.0/configuration-reference/#workflows # See: https://circleci.com/docs/2.0/configuration-reference/#workflows
workflows: workflows:
say-hello-workflow: build-mac:
jobs: jobs:
- build - build:
filters:
tags:
only: /^\d+.\d+.\d+$/

7
src/MarbleWorld.hx
View file

@ -1631,9 +1631,9 @@ class MarbleWorld extends Scheduler {
public function addBonusTime(t:Float) { public function addBonusTime(t:Float) {
this.bonusTime += t; this.bonusTime += t;
if (t > 0) { if (t > 0) {
this.playGui.addMiddleMessage('+${t}s', 0x99ff99); this.playGui.addMiddleMessage('-${t}s', 0x99ff99);
} else if (t < 0) { } else if (t < 0) {
this.playGui.addMiddleMessage('${t}s', 0xff9999); this.playGui.addMiddleMessage('+${- t}s', 0xff9999);
} else { } else {
this.playGui.addMiddleMessage('+0s', 0xcccccc); this.playGui.addMiddleMessage('+0s', 0xcccccc);
} }
@ -1723,7 +1723,8 @@ class MarbleWorld extends Scheduler {
playGui.setCenterText('outofbounds'); playGui.setCenterText('outofbounds');
AudioManager.playSound(ResourceLoader.getResource('data/sound/whoosh.wav', ResourceLoader.getAudio, this.soundResources)); AudioManager.playSound(ResourceLoader.getResource('data/sound/whoosh.wav', ResourceLoader.getAudio, this.soundResources));
// if (this.replay.mode != = 'playback') // 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. */ /** Sets a new active checkpoint. */

2
src/gui/EndGameGui.hx
View file

@ -221,7 +221,7 @@ class EndGameGui extends GuiControl {
if (mission.qualifyTime > timeState.gameplayClock) { if (mission.qualifyTime > timeState.gameplayClock) {
text += "You beat the Par Time!"; text += "You beat the Par Time!";
} else { } else {
text += '<font color="#F55555">You didn\'nt pass the Par Time!</font>'; text += '<font color="#F55555">You didn\'t pass the Par Time!</font>';
} }
} }
} }