Master to testing #1088
Merged
Master to testing #1088
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…instead. - use of lock statement instead Monitor directly. - removed commented out debug.log calls. - formatting (cherry picked from commit c878dd2)
(cherry picked from commit 4d281c8)
…s version causes sometimes at rebuild strange white pixel artifacts. (cherry picked from commit 4544d30)
(cherry picked from commit e32778a)
Release stable 11.5.1
…or-hotfix Fix RMB lane connector
…ts used to feed GUILayout.Window. This will reduce allocations when some UI tools are open.
* made lifecycle functions/variables static and removed OnCreated OnRelease for better hot reload. * cleanup lifecycle/Patcher.
Fixed SA1410 warnings by replacing the delegates with lambdas.
Fixed SA1137 Elements should have the same indentation warnings.
# Conflicts: # TLM/TLM/UI/SubTools/VehicleRestrictionsTool.cs
…ayoutWindow Fixed all instances of delegate instance allocation (HAA0603) where i…
This is just a 11.5.1-hotfix1 merge with strategy=ours into master.
…d-in-tool-disabled Hide overlays if no longer necessary
Main Camera cache reinitialization to prevent use of inactive camera
* encapsulate code for the lifecycle of CustomPathManager. * restore old path manager and its path finds when unloading. * hot unload now works
Moved all lifecycle code to a TMPELifeCycle.
# Conflicts: # TLM/TLM/UI/Textures/RoadUI.cs # TLM/TLM/UI/Textures/TrafficLightTextures.cs
Converted .ruleset to .editorconfig
SA1600 Elements should be documented SA1602 Enumeration items should be documented SA1611 Element parameters should be documented SA1615 Element return value should be documented SA1623 The property's documentation summary text should begin with: 'Gets'
Schinese icon
Removed some documentation warnings.
…es-Traffic-Manager-President-Edition into master-to-testing � Conflicts: � TLM/TLM/Custom/AI/CustomTrainAI.cs � TLM/TLM/Custom/PathFinding/CustomPathFind.cs � TLM/TLM/Custom/PathFinding/CustomPathManager.cs � TLM/TLM/Patcher.cs � TLM/TLM/TLM.csproj � TLM/TLM/ThreadingExtension.cs � TLM/TLM/TrafficManagerMod.cs
DaEgi01
approved these changes
Apr 13, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
To minimize number of changes and simplify review
master->testingAfter merge
testinggoes back tomaster- hopefully without conflicts and no need for review.Conflicts: