diff --git a/data/icon.png b/data/icon.png index 9ab8b6ba..33dd12da 100644 Binary files a/data/icon.png and b/data/icon.png differ diff --git a/index.html b/index.html index c3c0d731..e9dcc3ba 100644 --- a/index.html +++ b/index.html @@ -3,7 +3,7 @@ - Marble Blast Gold Haxe Port + Marble Blast Platinum Haxe Port diff --git a/src/Settings.hx b/src/Settings.hx index 72539ae3..bf6cde5d 100644 --- a/src/Settings.hx +++ b/src/Settings.hx @@ -288,6 +288,11 @@ class Settings { levelStatistics.set(key, value); } } + if (optionsSettings.marbleIndex == null) { + optionsSettings.marbleIndex = 0; + optionsSettings.marbleSkin = "base"; + optionsSettings.marbleModel = "data/shapes/balls/ball-superball.dts"; + } highscoreName = json.highscoreName; } else { save(); diff --git a/src/gui/JukeboxDlg.hx b/src/gui/JukeboxDlg.hx index 6c2a518d..cc8c3afc 100644 --- a/src/gui/JukeboxDlg.hx +++ b/src/gui/JukeboxDlg.hx @@ -32,7 +32,13 @@ class JukeboxDlg extends GuiImage { var markerFelt24 = markerFelt32b.toSdfFont(cast 18 * Settings.uiScale, MultiChannel); var markerFelt18 = markerFelt32b.toSdfFont(cast 14 * Settings.uiScale, MultiChannel); - var songFiles = ResourceLoader.fileSystem.dir("data/sound/music"); + #if hl + var songPath = "data/sound/music"; + #end + #if js + var songPath = "sound/music"; + #end + var songFiles = ResourceLoader.fileSystem.dir(songPath); var songList = songFiles.map(x -> StringTools.replace(x.name, ".ogg", "")); var playing:Bool = !AudioManager.currentMusicPaused; diff --git a/src/gui/MainMenuGui.hx b/src/gui/MainMenuGui.hx index 047dbbdc..3e026b49 100644 --- a/src/gui/MainMenuGui.hx +++ b/src/gui/MainMenuGui.hx @@ -146,7 +146,7 @@ class MainMenuGui extends GuiImage { versionText.vertSizing = Bottom; versionText.position = new Vector(502, 66); versionText.extent = new Vector(97, 72); - versionText.text.text = "

1.1.2

"; + versionText.text.text = "

1.2.0

"; this.addChild(versionText); } }