update readme

CHANGELOG.md

@@ -1,3 +1,26 @@
+# 1.7.3
+Hotfix time!
+- Fixed chat messages being escaped a bit too much.
+
+# 1.7.2
+This update brings the following bugfixes:
+- Added Import and Export Progress to Options menu to transfer game progress between devices.
+- Added momentum based scrolling on touch devices for menus.
+- Added TURN server support for multiplayer. Players behind strict NATs should now be able to play multiplayer without issues.
+- Made the game files to be case insensitive to allow running the game on case sensitive filesystems without issues.
+- Escaped all user input to prevent HTML injection in the UI.
+- Fixed various race condition issues.
+- Improved camera sensitivity on touch devices.
+- Implemented camera centering for touch controls when free look is disabled.
+- Various performance improvements and crash fixes.
+- Implemented console cheat commands. DefaultMarble.attribute = value; to change marble attributes.
+- Fixed a bug with the timer when playing a replay.
+- Fixed a crash that could happen in multiplayer.
+- Fixed not being able to load textures in certain custom levels.
+- Fixed softlock when playing a user installed custom level.
+- Fixed gravity changes not rewinding properly.
+- Fixed skies not rendering correctly at times in the web version.
+
 # 1.7.1
 This update brings the following bugfixes:
 - Fixed a crash when the marble goes out of bounds.

README.md

@@ -11,15 +11,15 @@ The browser port supports touch controls, meaning it can be played on mobile dev
 ### Marble Blast Platinum: [Play](https://marbleblast.randomityguy.me/)
 ### Marble Blast Ultra: [Play](https://marbleblastultra.randomityguy.me/)
 ## Windows and Mac
-### Marble Blast Gold: [Download](https://github.com/RandomityGuy/MBHaxe/releases/tag/1.1.12)
+### Marble Blast Gold: [Download](https://github.com/RandomityGuy/MBHaxe/releases/tag/1.1.13)
-### Marble Blast Platinum: [Download](https://github.com/RandomityGuy/MBHaxe/releases/tag/1.7.1)
+### Marble Blast Platinum: [Download](https://github.com/RandomityGuy/MBHaxe/releases/tag/1.7.3)
 ### Marble Blast Ultra: [Download](https://github.com/RandomityGuy/MBHaxe/releases/tag/1.2.5-mbu)
 ## Mac Instructions - Important
 Put the .app file in either /Applications or ~/Applications in order to run it properly.  
 You will also have to bypass Gatekeeper since the .app is not signed.
 ## Android
-### Marble Blast Gold: [Download](https://github.com/RandomityGuy/MBHaxe/releases/download/1.1.12/MBHaxe-Gold.apk)
+### Marble Blast Gold: [Download](https://github.com/RandomityGuy/MBHaxe/releases/download/1.1.13/MBHaxe-Gold.apk)
-### Marble Blast Platinum: [Download](https://github.com/RandomityGuy/MBHaxe/releases/download/1.7.1/MBHaxe-Platinum.apk)
+### Marble Blast Platinum: [Download](https://github.com/RandomityGuy/MBHaxe/releases/download/1.7.3/MBHaxe-Platinum.apk)
 ### Marble Blast Ultra: [Download](https://github.com/RandomityGuy/MBHaxe/releases/download/1.2.5-mbu/MBHaxe-Ultra.apk)
 
 ## Xbox (NEW!)
@@ -103,12 +103,11 @@ In browser, you can just resize your window. You can use the browser zoom featur
 In native version, you can just resize the window if windowed or use the resolution options in the menu or just directly modify settings.json  
 
 ## How do I change my FOV?
-Edit settings.json for native version, edit the MBHaxeSettings key in LocalStorage in browser.  
+There is an FOV slider in the options menu.
-In the Platinum and Ultra versions, there is an FOV slider.
 
 ## How do I unlock/lock FPS?
 You cannot unlock fps in the browser, it is forever set to vsync.
-In the native version, use the options menu to unlock/lock fps, or edit settings.json and set "vsync" to false to unlock fps.
+In the native version, use the options menu to unlock/lock fps.
 
 ## Hey can you please add this new feature?
 If this new feature of yours already exists in MBG but not in this port, then I will try to add it, if I get time to do so, otherwise chances are, I won't add it since I have other things to do and would rather not waste my time on this any further. You are free to do pull requests if you have already implemented said feature.

src/MarbleGame.hx

@@ -42,7 +42,7 @@ class MarbleGame {
 
 	static var instance:MarbleGame;
 
-	static var currentVersion = "1.7.2";
+	static var currentVersion = "1.7.3";
 
 	var world:MarbleWorld;
 

src/gui/ChatCtrl.hx

@@ -89,10 +89,10 @@ class ChatCtrl extends GuiControl {
 				if (StringTools.trim(this.chatHudInput.text.text) != "") {
 					sendText = '<font color="#F29515">${StringTools.htmlEscape(Settings.highscoreName.substr(0, 20))}:</font> ${StringTools.htmlEscape(this.chatHudInput.text.text.substr(0, 150))}';
 					if (Net.isClient) {
-						NetCommands.sendChatMessage(StringTools.htmlEscape(sendText));
+						NetCommands.sendChatMessage(sendText);
 					}
 					if (Net.isHost) {
-						NetCommands.sendServerChatMessage(StringTools.htmlEscape(sendText));
+						NetCommands.sendServerChatMessage(sendText);
 					}
 				}
 				this.chatHudInput.text.text = "";
@@ -118,7 +118,7 @@ class ChatCtrl extends GuiControl {
 	}
 
 	public function addChatMessage(text:String) {
-		var realText = StringTools.htmlEscape(text);
+		var realText = text;
 		this.chats.push({
 			text: realText,
 			age: 10.0

src/gui/MPPlayMissionGui.hx

@@ -434,10 +434,10 @@ class MPPlayMissionGui extends GuiImage {
 				if (StringTools.trim(chatInput.text.text) != "") {
 					var sendText = '<font color="#F29515">${StringTools.htmlEscape(Settings.highscoreName.substr(0, 20))}:</font> ${StringTools.htmlEscape(chatInput.text.text.substr(0, 100))}';
 					if (Net.isClient) {
-						NetCommands.sendChatMessage(StringTools.htmlEscape(sendText));
+						NetCommands.sendChatMessage(sendText);
 					}
 					if (Net.isHost) {
-						NetCommands.sendServerChatMessage(StringTools.htmlEscape(sendText));
+						NetCommands.sendServerChatMessage(sendText);
 					}
 				}
 				chatInput.text.text = "";
@@ -728,7 +728,7 @@ class MPPlayMissionGui extends GuiImage {
 	}
 
 	public static function addChatMessage(s:String) {
-		var realText = StringTools.htmlEscape(s);
+		var realText = s;
 		allChats.push(realText);
 		if (allChats.length > 100) {
 			allChats = allChats.slice(allChats.length - 100);

src/gui/MainMenuGui.hx

@@ -47,6 +47,13 @@ class MainMenuGui extends GuiImage {
 			return [normal, hover, pressed];
 		}
 
+		function loadStaticButtonImages(path:String) {
+			var normal = ResourceLoader.getResource('${path}.png', ResourceLoader.getImage, this.imageResources).toTile();
+			var hover = ResourceLoader.getResource('${path}.png', ResourceLoader.getImage, this.imageResources).toTile();
+			var pressed = ResourceLoader.getResource('${path}.png', ResourceLoader.getImage, this.imageResources).toTile();
+			return [normal, hover, pressed];
+		}
+
 		var siteButton = new GuiButton(loadButtonImages('data/ui/menu/site'));
 		siteButton.horizSizing = Right;
 		siteButton.vertSizing = Top;
@@ -232,6 +239,38 @@ class MainMenuGui extends GuiImage {
 		}
 		this.addChild(github);
 
+		#if js
+		var mbg = new GuiButton(loadStaticButtonImages("data/ui/icon_mbg"));
+		mbg.horizSizing = Right;
+		mbg.vertSizing = Top;
+		mbg.position = new Vector(0, 380);
+		mbg.extent = new Vector(76, 76);
+		mbg.pressedAction = (sender) -> {
+			js.Browser.window.open("https://marbleblastgold.randomityguy.me");
+		}
+		this.addChild(mbg);
+
+		var mbu = new GuiButton(loadStaticButtonImages("data/ui/icon_mbu"));
+		mbu.horizSizing = Right;
+		mbu.vertSizing = Top;
+		mbu.position = new Vector(76, 380);
+		mbu.extent = new Vector(76, 76);
+		mbu.pressedAction = (sender) -> {
+			js.Browser.window.open("https://marbleblastultra.randomityguy.me");
+		}
+		this.addChild(mbu);
+
+		var discord = new GuiButton(loadStaticButtonImages("data/ui/discord"));
+		discord.horizSizing = Right;
+		discord.vertSizing = Top;
+		discord.position = new Vector(0, 320);
+		discord.extent = new Vector(152, 60);
+		discord.pressedAction = (sender) -> {
+			js.Browser.window.open("https://discord.gg/q4JdnRbVhF");
+		}
+		this.addChild(discord);
+		#end
+
 		#if js
 		var urlParams = new js.html.URLSearchParams(js.Browser.window.location.search);
 		var playParam = urlParams.get("app");

src/modes/HuntMode.hx

@@ -96,7 +96,7 @@ class HuntMode extends NullMode {
 					}
 				} else if (element._type == MissionElementType.SimGroup) {
 					var scanPls = true;
-					if (Net.connectedServerInfo.oldSpawns) {
+					if (Net.isMP && Net.connectedServerInfo.oldSpawns) {
 						if (element._name.toLowerCase() == "newversion") {
 							// Remove this
 							elToRemove.push(element);
@@ -121,8 +121,8 @@ class HuntMode extends NullMode {
 	};
 
 	override function getSpawnTransform() {
-		var idx = Net.connectedServerInfo.competitiveMode ? idealSpawnIndex : Math.floor(rng2.randRange(0, playerSpawnPoints.length - 1));
+		var idx = (Net.isMP && Net.connectedServerInfo.competitiveMode) ? idealSpawnIndex : Math.floor(rng2.randRange(0, playerSpawnPoints.length - 1));
-		if (!Net.connectedServerInfo.competitiveMode) {
+		if (!(Net.isMP && Net.connectedServerInfo.competitiveMode)) {
 			var allTaken = true;
 			for (spw in spawnPointTaken) {
 				if (!spw) {
@@ -370,7 +370,7 @@ class HuntMode extends NullMode {
 				var gemPos = gemElem.gem.getAbsPos().getPosition();
 
 				if (level.mission.missionInfo.game == "PlatinumQuest") {
-					if (Net.connectedServerInfo.oldSpawns) {
+					if (Net.isMP && Net.connectedServerInfo.oldSpawns) {
 						// Spawn chances!
 						var chance = switch (gemElem.gem.gemColor.toLowerCase()) {
 							case "red.gem":
@@ -836,7 +836,7 @@ class HuntMode extends NullMode {
 	}
 
 	override function update(t:src.TimeState) {
-		if (Net.connectedServerInfo.competitiveMode) {
+		if (this.level.isMultiplayer && Net.connectedServerInfo.competitiveMode) {
 			if (competitiveTimerStartTicks != 0) {
 				var currentTime = Net.isHost ? t.ticks : @:privateAccess level.marble.serverTicks;
 				var endTime = competitiveTimerStartTicks + (20000 >> 5);