Merge remote-tracking branch 'tmpe/master' into u-based-mainmenu

CHANGELOG.md

@@ -23,6 +23,26 @@ This changelog includes all versions and major variants of the mod going all the
 > * **TM** = Traffic Manager
 > * **CSLT** = Cities Skylines Traffic (later renamed to Traffic++)
 > * **TLM** = Taffic Lights Manager (later renamed to Traffic Manager)
+>  
+> Date format: dd/mm/yyyy
+
+#### TM:PE V[11.3.0](https://github.com/CitiesSkylinesMods/TMPE/compare/11.2.3...11.3.0) LABS, 10/04/2020
+
+- Added: Advanced auto lane connector tool (select a node, then `Ctrl + S`) (#706, #703)
+- Fixed: Stay-in-lane should not connect solitary lanes (#706, #617)
+- Fixed: Lane arrows UI too small on some resolutions except at junctions (#726, #571)
+- Updated: Lane connectors: `Shift + S` changed to `Ctrl + S` (see Options > Keybinds tab) (#706)
+- Updated: Lane Arrows UI now respects UI scale slider (see Options > General tab) (#726)
+- Updated: Improved UI for lane arrows tool (#726, #571)
+- Updated: Translations (will add more info later) (#726)
+
+#### TM:PE V[11.2.3](https://github.com/CitiesSkylinesMods/TMPE/compare/11.2.2...11.2.3) STABLE, 08/04/2020
+
+- Fixed: Unable to set default speed limits for roads that need DLCs (#821, #818)
+
+#### TM:PE V[11.2.3](https://github.com/CitiesSkylinesMods/TMPE/compare/11.2.2...11.2.3) LABS, 08/04/2020
+
+- Fixed: Unable to set default speed limits for roads that need DLCs (#821, #818)
 
 #### TM:PE V[11.2.2](https://github.com/CitiesSkylinesMods/TMPE/compare/11.2.1...11.2.2) STABLE, 26/03/2020
 

README.md

@@ -39,13 +39,23 @@ Official releases:
 
 Recent updates:
 
-#### TM:PE V[11.2.3](https://github.com/CitiesSkylinesMods/TMPE/compare/11.2.2...11.2.3) STABLE, 08/04/2020
+#### TM:PE V[11.3.0](https://github.com/CitiesSkylinesMods/TMPE/compare/11.2.3...11.3.0) LABS, 10/04/2020
 
-- Fixed: DLC filter wasn't working, causing some roads to not appear in default speed limit UI (#818).
+- Added: Advanced auto lane connector tool (select a node, then `Ctrl + S`) (#706, #703)
+- Fixed: Stay-in-lane should not connect solitary lanes (#706, #617)
+- Fixed: Lane arrows UI too small on some resolutions except at junctions (#726, #571)
+- Updated: Lane connectors: `Shift + S` changed to `Ctrl + S` (see Options > Keybinds tab) (#706)
+- Updated: Lane Arrows UI now respects UI scale slider (see Options > General tab) (#726)
+- Updated: Improved UI for lane arrows tool (#726, #571)
+- Updated: Translations (will add more info later) (#726)
 
 #### TM:PE V[11.2.3](https://github.com/CitiesSkylinesMods/TMPE/compare/11.2.2...11.2.3) STABLE, 08/04/2020
 
-- Fixed: DLC filter wasn't working, causing some roads to not appear in default speed limit UI (#818).
+- Fixed: Unable to set default speed limits for roads that need DLCs (#821, #818)
+
+#### TM:PE V[11.2.3](https://github.com/CitiesSkylinesMods/TMPE/compare/11.2.2...11.2.3) LABS, 08/04/2020
+
+- Fixed: Unable to set default speed limits for roads that need DLCs (#821, #818)
 
 See [Full Changelog](https://github.com/CitiesSkylinesMods/TMPE/blob/master/CHANGELOG.md) for details of all releases.
 

TLM/SharedAssemblyInfo.cs

@@ -20,4 +20,4 @@
 //      Minor Version
 //      Build Number
 //      Revision
-[assembly: AssemblyVersion("11.2.3.*")]
+[assembly: AssemblyVersion("11.3.0.*")]

TLM/TLM/TLM.csproj

@@ -277,6 +277,8 @@
     <Compile Include="UI\SubTools\SpeedLimits\MphSignStyle.cs" />
     <Compile Include="UI\SubTools\SpeedLimits\SpeedLimitsTool.cs" />
     <Compile Include="UI\SubTools\SpeedLimits\SpeedUnit.cs" />
+    <Compile Include="UI\SubTools\TimedTrafficLights\TimedTrafficLightsTool.cs" />
+    <Compile Include="UI\SubTools\TimedTrafficLights\TTLToolMode.cs" />
     <Compile Include="UI\Textures\JunctionRestrictions.cs" />
     <Compile Include="UI\Textures\MainMenu.cs" />
     <Compile Include="UI\Textures\RoadUI.cs" />
@@ -290,7 +292,6 @@
     <Compile Include="UI\SubTools\JunctionRestrictionsTool.cs" />
     <Compile Include="UI\SubTools\LaneConnectorTool.cs" />
     <Compile Include="UI\SubTools\VehicleRestrictionsTool.cs" />
-    <Compile Include="UI\SubTools\TimedTrafficLightsTool.cs" />
     <Compile Include="UI\SubTools\ManualTrafficLightsTool.cs" />
     <Compile Include="UI\SubTools\PrioritySignsTool.cs" />
     <Compile Include="UI\SubTools\ToggleTrafficLightsTool.cs" />

TLM/TLM/UI/MainMenu/MainMenuWindow.cs

@@ -38,7 +38,7 @@ private static readonly MenuButtonDef[] TOOL_BUTTON_DEFS
                                     },
                   new MenuButtonDef {
                                         ButtonType = typeof(TimedTrafficLightsButton),
-                                        Mode = ToolMode.TimedLightsButton,
+                                        Mode = ToolMode.TimedTrafficLights,
                                         IsEnabledFunc = TimedTrafficLightsButton.IsButtonEnabled,
                                     },
                   new MenuButtonDef {

TLM/TLM/UI/MainMenu/TimedTrafficLightsButton.cs

@@ -5,7 +5,7 @@ namespace TrafficManager.UI.MainMenu {
     using TrafficManager.U.Button;
 
     public class TimedTrafficLightsButton : BaseMenuToolModeButton {
-        protected override ToolMode ToolMode => ToolMode.TimedLightsSelectNode;
+        protected override ToolMode ToolMode => ToolMode.TimedTrafficLights;
 
         public override void SetupButtonSkin(HashSet<string> atlasKeys) {
             // Button backround (from BackgroundPrefix) is provided by MainMenuPanel.Start

TLM/TLM/UI/SubTools/TimedTrafficLights/TTLToolMode.cs

@@ -0,0 +1,18 @@
+namespace TrafficManager.UI.SubTools {
+    internal enum TTLToolMode {
+        /// <summary>Timed traffic light submode.</summary>
+        SelectNode,
+
+        /// <summary>Timed traffic light submode.</summary>
+        ShowLights,
+
+        /// <summary>Timed traffic light submode.</summary>
+        AddNode,
+
+        /// <summary>Timed traffic light submode.</summary>
+        RemoveNode,
+
+        /// <summary>Timed traffic light submode.</summary>
+        CopyLights,
+    }
+}