Merge branch 'reznal/1.6-working' into dev-1.6 #1
Conversation
This file contains hidden or 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
This reverts commit 6818510.
Need to test the linux and osx versions.
- Improved SyncDebugPanel
- Added player count to AsyncTimeComp - VTR is 1 if players are on the map, 15 otherwise. - Changes to Saveable MP Logs
- Added MP log files - Added Variable Tick Rate handling - Added player count to AsyncTimeComp - VTR is 1 if players are on the map, 15 otherwise.
- Cleaned everything up
Renamed WorldRenderedNow To WorldRendered
- Now accounts for players disconnecting unexpectedly - No longer count a player as on a map if they have the world map open
- Fixed a remaining WorldRendered - Added extra error handlint to SyncDebugPanel
- Patched all version of System.HashCode.Combine which will cover all future functions of this to.
# Conflicts: # Source/Client/Persistent/CampCreationPatches.cs # Source/Client/Persistent/CaravanFormingPatches.cs
Debug additions - PerformanceCalculator, PerformanceRecorder
- Colour changes - Places with colour - Copied - Partially copied - Deleted Shuffle now only runs on cells when its deterministic. Serialized Plan
# Conflicts: # Source/Client/Syncing/Dict/SyncDictRimWorld.cs
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
No description provided.