diff --git a/.circleci/config.yml b/.circleci/config.yml index b1d2c77a..aec2a90f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -34,7 +34,7 @@ jobs: name: Install Haxe command: | set -eux - download_url="https://github.com/HaxeFoundation/haxe/releases/download/4.2.5/haxe-4.2.5-osx.tar.gz" + download_url="https://github.com/HaxeFoundation/haxe/releases/download/4.3.1/haxe-4.3.1-osx.tar.gz" echo "Downloading [$download_url]..." mkdir /tmp/haxe curl -fsSL --retry 3 --retry-delay 5 "$download_url" -o /tmp/haxe.tar.gz @@ -245,7 +245,7 @@ jobs: command: | cd ~/MBHaxe ./package-macos.sh v$COMMIT_TAG - cd "macos-dist/MarbleBlast Platinum.app/Contents/MacOS" + cd "macos-dist/MarbleBlast Ultra.app/Contents/MacOS" otool -L marblegame cd ../Frameworks cp /usr/local/lib/{ui.hdll,openal.hdll,fmt.hdll,sdl.hdll,libSDL2-2.0.0.dylib,ssl.hdll,uv.hdll} . @@ -269,21 +269,21 @@ jobs: name: Sign app bundle command: | cd ~/MBHaxe/macos-dist - xattr -rc "MarbleBlast Platinum.app" - cp "MarbleBlast Platinum.app/Contents/Entitlements.plist" . - codesign --deep --entitlements Entitlements.plist -fs - "MarbleBlast Platinum.app" + xattr -rc "MarbleBlast Ultra.app" + cp "MarbleBlast Ultra.app/Contents/Entitlements.plist" . + codesign --deep --entitlements Entitlements.plist -fs - "MarbleBlast Ultra.app" - run: name: ZIP Bundle command: | cd ~/MBHaxe - rm -rf "macos-dist/MarbleBlast Platinum.app.in" - zip -r MBHaxe-Platinum-Mac.zip macos-dist/ + rm -rf "macos-dist/MarbleBlast Ultra.app.in" + zip -r MBHaxe-Ultra-Mac.zip macos-dist/ - run: name: Upload to Artifact Storage command: | - scp -o StrictHostKeyChecking=no -i $KEYPATH -P $PORT ~/MBHaxe/MBHaxe-Platinum-Mac.zip $REMOTEDIR/MBHaxe-Platinum-Mac.zip + scp -o StrictHostKeyChecking=no -i $KEYPATH -P $PORT ~/MBHaxe/MBHaxe-Ultra-Mac.zip $REMOTEDIR/MBHaxe-Ultra-Mac.zip # - store_artifacts: # path: ~/MBHaxe/MBHaxe-Platinum-Mac.zip @@ -322,7 +322,7 @@ jobs: - run: name: Install Haxe command: | - download_url="https://github.com/HaxeFoundation/haxe/releases/download/4.2.5/haxe-4.2.5-win64.zip" + download_url="https://github.com/HaxeFoundation/haxe/releases/download/4.3.1/haxe-4.3.1-win64.zip" echo "Downloading [$download_url]..." mkdir /tmp/haxe curl -fsSL --retry 3 --retry-delay 5 "$download_url" -o /tmp/haxe.zip @@ -405,12 +405,12 @@ jobs: name: Zip bundle command: | cd ~/project - 7z a MBHaxe-Platinum-Win.zip release/ + 7z a MBHaxe-Ultra-Win.zip release/ - run: name: Upload to Artifact Storage command: | - scp -o StrictHostKeyChecking=no -i $KEYPATH -P $PORT ~/project/MBHaxe-Platinum-Win.zip $REMOTEDIR/MBHaxe-Platinum-Win.zip + scp -o StrictHostKeyChecking=no -i $KEYPATH -P $PORT ~/project/MBHaxe-Ultra-Win.zip $REMOTEDIR/MBHaxe-Ultra-Win.zip # - store_artifacts: # path: ~/project/MBHaxe-Platinum-Win.zip diff --git a/index.html b/index.html index e9dcc3ba..46b59887 100644 --- a/index.html +++ b/index.html @@ -3,7 +3,7 @@ - Marble Blast Platinum Haxe Port + Marble Blast Ultra Haxe Port diff --git a/macos-dist/MarbleBlast Platinum.app.in/Contents/Resources/icon.icns b/macos-dist/MarbleBlast Platinum.app.in/Contents/Resources/icon.icns deleted file mode 100644 index 9915d8c9..00000000 Binary files a/macos-dist/MarbleBlast Platinum.app.in/Contents/Resources/icon.icns and /dev/null differ diff --git a/macos-dist/MarbleBlast Platinum.app.in/Contents/Entitlements.plist b/macos-dist/MarbleBlast Ultra.app.in/Contents/Entitlements.plist similarity index 100% rename from macos-dist/MarbleBlast Platinum.app.in/Contents/Entitlements.plist rename to macos-dist/MarbleBlast Ultra.app.in/Contents/Entitlements.plist diff --git a/macos-dist/MarbleBlast Platinum.app.in/Contents/Frameworks/licenses/SDL.txt b/macos-dist/MarbleBlast Ultra.app.in/Contents/Frameworks/licenses/SDL.txt old mode 100755 new mode 100644 similarity index 100% rename from macos-dist/MarbleBlast Platinum.app.in/Contents/Frameworks/licenses/SDL.txt rename to macos-dist/MarbleBlast Ultra.app.in/Contents/Frameworks/licenses/SDL.txt diff --git a/macos-dist/MarbleBlast Platinum.app.in/Contents/Frameworks/licenses/bungee.font.txt b/macos-dist/MarbleBlast Ultra.app.in/Contents/Frameworks/licenses/bungee.font.txt old mode 100755 new mode 100644 similarity index 100% rename from macos-dist/MarbleBlast Platinum.app.in/Contents/Frameworks/licenses/bungee.font.txt rename to macos-dist/MarbleBlast Ultra.app.in/Contents/Frameworks/licenses/bungee.font.txt diff --git a/macos-dist/MarbleBlast Platinum.app.in/Contents/Frameworks/licenses/gluten.font.txt b/macos-dist/MarbleBlast Ultra.app.in/Contents/Frameworks/licenses/gluten.font.txt old mode 100755 new mode 100644 similarity index 100% rename from macos-dist/MarbleBlast Platinum.app.in/Contents/Frameworks/licenses/gluten.font.txt rename to macos-dist/MarbleBlast Ultra.app.in/Contents/Frameworks/licenses/gluten.font.txt diff --git a/macos-dist/MarbleBlast Platinum.app.in/Contents/Frameworks/licenses/hashlink.txt b/macos-dist/MarbleBlast Ultra.app.in/Contents/Frameworks/licenses/hashlink.txt old mode 100755 new mode 100644 similarity index 100% rename from macos-dist/MarbleBlast Platinum.app.in/Contents/Frameworks/licenses/hashlink.txt rename to macos-dist/MarbleBlast Ultra.app.in/Contents/Frameworks/licenses/hashlink.txt diff --git a/macos-dist/MarbleBlast Platinum.app.in/Contents/Frameworks/licenses/haxe.txt b/macos-dist/MarbleBlast Ultra.app.in/Contents/Frameworks/licenses/haxe.txt old mode 100755 new mode 100644 similarity index 100% rename from macos-dist/MarbleBlast Platinum.app.in/Contents/Frameworks/licenses/haxe.txt rename to macos-dist/MarbleBlast Ultra.app.in/Contents/Frameworks/licenses/haxe.txt diff --git a/macos-dist/MarbleBlast Platinum.app.in/Contents/Frameworks/licenses/heaps.txt b/macos-dist/MarbleBlast Ultra.app.in/Contents/Frameworks/licenses/heaps.txt old mode 100755 new mode 100644 similarity index 100% rename from macos-dist/MarbleBlast Platinum.app.in/Contents/Frameworks/licenses/heaps.txt rename to macos-dist/MarbleBlast Ultra.app.in/Contents/Frameworks/licenses/heaps.txt diff --git a/macos-dist/MarbleBlast Platinum.app.in/Contents/Frameworks/licenses/incompetech.txt b/macos-dist/MarbleBlast Ultra.app.in/Contents/Frameworks/licenses/incompetech.txt old mode 100755 new mode 100644 similarity index 100% rename from macos-dist/MarbleBlast Platinum.app.in/Contents/Frameworks/licenses/incompetech.txt rename to macos-dist/MarbleBlast Ultra.app.in/Contents/Frameworks/licenses/incompetech.txt diff --git a/macos-dist/MarbleBlast Platinum.app.in/Contents/Frameworks/licenses/libjpeg-turbo.txt b/macos-dist/MarbleBlast Ultra.app.in/Contents/Frameworks/licenses/libjpeg-turbo.txt old mode 100755 new mode 100644 similarity index 100% rename from macos-dist/MarbleBlast Platinum.app.in/Contents/Frameworks/licenses/libjpeg-turbo.txt rename to macos-dist/MarbleBlast Ultra.app.in/Contents/Frameworks/licenses/libjpeg-turbo.txt diff --git a/macos-dist/MarbleBlast Platinum.app.in/Contents/Frameworks/licenses/libogg.txt b/macos-dist/MarbleBlast Ultra.app.in/Contents/Frameworks/licenses/libogg.txt old mode 100755 new mode 100644 similarity index 100% rename from macos-dist/MarbleBlast Platinum.app.in/Contents/Frameworks/licenses/libogg.txt rename to macos-dist/MarbleBlast Ultra.app.in/Contents/Frameworks/licenses/libogg.txt diff --git a/macos-dist/MarbleBlast Platinum.app.in/Contents/Frameworks/licenses/libpng.txt b/macos-dist/MarbleBlast Ultra.app.in/Contents/Frameworks/licenses/libpng.txt old mode 100755 new mode 100644 similarity index 100% rename from macos-dist/MarbleBlast Platinum.app.in/Contents/Frameworks/licenses/libpng.txt rename to macos-dist/MarbleBlast Ultra.app.in/Contents/Frameworks/licenses/libpng.txt diff --git a/macos-dist/MarbleBlast Platinum.app.in/Contents/Frameworks/licenses/libuv.txt b/macos-dist/MarbleBlast Ultra.app.in/Contents/Frameworks/licenses/libuv.txt old mode 100755 new mode 100644 similarity index 100% rename from macos-dist/MarbleBlast Platinum.app.in/Contents/Frameworks/licenses/libuv.txt rename to macos-dist/MarbleBlast Ultra.app.in/Contents/Frameworks/licenses/libuv.txt diff --git a/macos-dist/MarbleBlast Platinum.app.in/Contents/Frameworks/licenses/libvorbis.txt b/macos-dist/MarbleBlast Ultra.app.in/Contents/Frameworks/licenses/libvorbis.txt old mode 100755 new mode 100644 similarity index 100% rename from macos-dist/MarbleBlast Platinum.app.in/Contents/Frameworks/licenses/libvorbis.txt rename to macos-dist/MarbleBlast Ultra.app.in/Contents/Frameworks/licenses/libvorbis.txt diff --git a/macos-dist/MarbleBlast Platinum.app.in/Contents/Frameworks/licenses/openal.txt b/macos-dist/MarbleBlast Ultra.app.in/Contents/Frameworks/licenses/openal.txt old mode 100755 new mode 100644 similarity index 100% rename from macos-dist/MarbleBlast Platinum.app.in/Contents/Frameworks/licenses/openal.txt rename to macos-dist/MarbleBlast Ultra.app.in/Contents/Frameworks/licenses/openal.txt diff --git a/macos-dist/MarbleBlast Platinum.app.in/Contents/Frameworks/licenses/zlib.txt b/macos-dist/MarbleBlast Ultra.app.in/Contents/Frameworks/licenses/zlib.txt old mode 100755 new mode 100644 similarity index 100% rename from macos-dist/MarbleBlast Platinum.app.in/Contents/Frameworks/licenses/zlib.txt rename to macos-dist/MarbleBlast Ultra.app.in/Contents/Frameworks/licenses/zlib.txt diff --git a/macos-dist/MarbleBlast Platinum.app.in/Contents/Info.plist b/macos-dist/MarbleBlast Ultra.app.in/Contents/Info.plist similarity index 95% rename from macos-dist/MarbleBlast Platinum.app.in/Contents/Info.plist rename to macos-dist/MarbleBlast Ultra.app.in/Contents/Info.plist index 1f7073c4..6843c933 100644 --- a/macos-dist/MarbleBlast Platinum.app.in/Contents/Info.plist +++ b/macos-dist/MarbleBlast Ultra.app.in/Contents/Info.plist @@ -9,7 +9,7 @@ CFBundleIconFile icon.icns CFBundleIdentifier - com.randomityguy.mbhaxe.mbp + com.randomityguy.mbhaxe.mbu CFBundleInfoDictionaryVersion 6.0 CFBundleName diff --git a/macos-dist/MarbleBlast Platinum.app.in/Contents/MacOS/.gitkeep b/macos-dist/MarbleBlast Ultra.app.in/Contents/MacOS/.gitkeep similarity index 100% rename from macos-dist/MarbleBlast Platinum.app.in/Contents/MacOS/.gitkeep rename to macos-dist/MarbleBlast Ultra.app.in/Contents/MacOS/.gitkeep diff --git a/macos-dist/MarbleBlast Ultra.app.in/Contents/Resources/icon.icns b/macos-dist/MarbleBlast Ultra.app.in/Contents/Resources/icon.icns new file mode 100644 index 00000000..8a3dbce0 Binary files /dev/null and b/macos-dist/MarbleBlast Ultra.app.in/Contents/Resources/icon.icns differ diff --git a/macos-dist/README.txt b/macos-dist/README.txt index 3088892a..a3ac5c7f 100644 --- a/macos-dist/README.txt +++ b/macos-dist/README.txt @@ -4,4 +4,4 @@ It will say "Unverified Developer". Go to System Preferences (or System Settings If you get error saying that the app is "damaged," please remove the quarantine flag. -sudo xattr -r -d com.apple.quarantine "MarbleBlast Platinum.app" \ No newline at end of file +sudo xattr -r -d com.apple.quarantine "MarbleBlast Ultra.app" \ No newline at end of file diff --git a/src/Main.hx b/src/Main.hx index 6ff95dd9..c3e61845 100644 --- a/src/Main.hx +++ b/src/Main.hx @@ -39,7 +39,9 @@ class Main extends hxd.App { super.init(); s3d.renderer = new Renderer(); + #if debug s3d.checkPasses = false; + #end #if (hl && !android) hl.UI.closeConsole(); diff --git a/src/mis/MisParser.hx b/src/mis/MisParser.hx index 3840298d..d2d8917d 100644 --- a/src/mis/MisParser.hx +++ b/src/mis/MisParser.hx @@ -48,13 +48,13 @@ class MisParser { // Read the localization strings var lfile = ResourceLoader.getFileEntry("data/englishStrings.inf"); var contents = lfile.entry.getText(); - var lines = contents.split('\r\n'); + var lines = contents.split('\n'); localizations = []; var rgx = ~/(\$(?:\w|\d|:)+)\s*=\s*"(.+?)";/g; for (line in lines) { if (rgx.match(line)) { - if (!localizations.exists(rgx.matched(1))) - localizations.set(rgx.matched(1), rgx.matched(2)); + if (!localizations.exists(StringTools.trim(rgx.matched(1)))) + localizations.set(StringTools.trim(rgx.matched(1)), StringTools.trim(rgx.matched(2))); } } }