Merge remote-tracking branch 'upstream/main'

MobilePorting · Nov 18, 2024 · db6a9e9 · db6a9e9
2 parents 80091f2 + d5fc2ee
commit db6a9e9
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 4 deletions.
diff --git a/gitVersion.txt b/gitVersion.txt
@@ -1 +1 @@
-0.9.0
+0.9.1
diff --git a/source/Main.hx b/source/Main.hx
@@ -50,7 +50,7 @@ class Main extends Sprite
 	public static var stage3D:AwayStage;
 	#end
 
-	public static final PSYCH_ONLINE_VERSION:String = "0.9.0";
+	public static final PSYCH_ONLINE_VERSION:String = "0.9.1";
 	public static final CLIENT_PROTOCOL:Float = 5;
 	public static final GIT_COMMIT:String = online.backend.Macros.getGitCommitHash();
 

diff --git a/source/backend/ClientPrefs.hx b/source/backend/ClientPrefs.hx
@@ -102,6 +102,7 @@ import states.TitleState;
 	public var disableFreeplayIcons:Bool = false;
 	public var showFP:Bool = false;
 	public var disableFreeplayAlphabet:Bool = false;
+	public var disableLagDetection:Bool = false;
 
 	public function new()
 	{

diff --git a/source/online/gui/sidebar/MainTab.hx b/source/online/gui/sidebar/MainTab.hx
@@ -59,7 +59,7 @@ class MainTab extends TabSprite {
 
 		chatInputPlaceholder = new TextField();
 		chatInputPlaceholder.defaultTextFormat = TabSprite.getDefaultFormat();
-		chatInputPlaceholder.text = "(Click here to chat)";
+		chatInputPlaceholder.text = "(Click here or press TAB to chat)";
 		chatInputPlaceholder.selectable = false;
 		chatInputPlaceholder.y = Lib.application.window.height - (chatInputPlaceholder.textHeight + 5);
 		chatInputPlaceholder.width = Std.int(widthTab);

diff --git a/source/options/GameplaySettingsSubState.hx b/source/options/GameplaySettingsSubState.hx
@@ -133,6 +133,12 @@ class GameplaySettingsSubState extends BaseOptionsMenu
 			'bool');
 		addOption(option);
 
+		var option:Option = new Option('Disable Lag Detection',
+			'If checked, the game will no longer rewind 3 seconds when a lag is detected',
+			'disableLagDetection',
+			'bool');
+		addOption(option);
+
 		super();
 	}
 

diff --git a/source/states/PlayState.hx b/source/states/PlayState.hx
@@ -2400,7 +2400,7 @@ class PlayState extends MusicBeatState
 		}
 
 		if (!GameClient.isConnected()) {
-			if (!finishingSong && elapsed >= 0.1 && Conductor.songPosition > lastLagPos) {
+			if (!ClientPrefs.data.disableLagDetection && !finishingSong && elapsed >= 0.1 && Conductor.songPosition > lastLagPos) {
 				setSongTime(Conductor.songPosition - 3000);
 				lastLagPos = Conductor.songPosition;
 				Alert.alert("Mod Lag Detected (-3s)");