Merge branch 'MegaMek:master' into more-gm-tools

MegaMek · Dec 5, 2024 · 561ffda · 561ffda
2 parents 054f162 + 6e563d5
commit 561ffda
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/megamek/docs/history.txt b/megamek/docs/history.txt
@@ -23,7 +23,7 @@ MEGAMEK VERSION HISTORY:
 + PR #6230: Allow fleeing at end of movement
 + Fix #3018: Fixes Battle Armor Plasma Rifles not applying TacOps Optional Rules
 + Fix #3827: Fixes target's side's ECM not effecting sensor spottingFixes
-
++ Fix: Disable Simultaneous Movement due to numerous issues
 
 0.50.01 (2024-11-10 1800 UTC)
 + PR #5962, #5964, #5966, #5974, #5931, #5983, #6154, #6159: Internal code changes (TWGameManager, extract processMovement, allow more classes for InputFilter, Victory, move test scenarios to testresources),

diff --git a/megamek/src/megamek/common/options/GameOptions.java b/megamek/src/megamek/common/options/GameOptions.java
@@ -286,7 +286,7 @@ public synchronized void initialize() {
         addOption(initiative, OptionsConstants.INIT_PROTOS_MOVE_MULTI, false);
         addOption(initiative, OptionsConstants.INIT_INF_PROTO_MOVE_MULTI, 3);
         addOption(initiative, OptionsConstants.INIT_SIMULTANEOUS_DEPLOYMENT, false);
-        addOption(initiative, OptionsConstants.INIT_SIMULTANEOUS_MOVEMENT, false);
+        //addOption(initiative, OptionsConstants.INIT_SIMULTANEOUS_MOVEMENT, false);
         addOption(initiative, OptionsConstants.INIT_SIMULTANEOUS_TARGETING, false);
         addOption(initiative, OptionsConstants.INIT_SIMULTANEOUS_FIRING, false);
         addOption(initiative, OptionsConstants.INIT_SIMULTANEOUS_PHYSICAL, false);