Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Migration to Harmony / RedirectionFramework #260

Merged
merged 44 commits into from
Jul 15, 2019
Merged

Migration to Harmony / RedirectionFramework #260

merged 44 commits into from
Jul 15, 2019

Conversation

VictorPhilipp
Copy link
Collaborator

@VictorPhilipp VictorPhilipp commented Mar 30, 2019 •
edited by FireController1847

Fixes #119

@VictorPhilipp
#119: Removed emergency evasion feature from harmony integration branch
2e7debb
@VictorPhilipp
#119: Removed EVE code
6eb5445
@VictorPhilipp
#119: Post van classification added
c2cf352
@VictorPhilipp
#119: Cargo plane classification added
5ec97c7
@VictorPhilipp
Merge branch '230-trains-maintain-their-lanes' into 119-migration-to-…
4a5f315 
…harmony

# Conflicts:
#	README.md
#	TLM/TLM/TLM.csproj
#	TLM/TLM/Util/ModsCompatibilityChecker.cs
@VictorPhilipp
Merge branch '218-parking-ai-despawns-vehicles' into 119-migration-to…
2df1e71 
…-harmony

# Conflicts:
#	TLM/TLM/Custom/AI/CustomCarAI.cs
#	TLM/TLM/Custom/AI/CustomCargoTruckAI.cs
#	TLM/TLM/Custom/AI/CustomCitizenAI.cs
#	TLM/TLM/Custom/AI/CustomPassengerCarAI.cs
#	TLM/TLM/Custom/AI/CustomTrainAI.cs
#	TLM/TLM/Custom/AI/CustomTramBaseAI.cs
#	TLM/TLM/Manager/Impl/AdvancedParkingManager.cs
#	TLM/TLM/Manager/Impl/ExtCitizenInstanceManager.cs
#	TLM/TLM/Traffic/Data/ExtCitizenInstance.cs
@VictorPhilipp
Merge branch '112-traffic-using-one-lane-on-highways' into 119-migrat…
b54ca83 
…ion-to-harmony

# Conflicts:
#	TLM/TLM/Custom/PathFinding/CustomPathFind2.cs
@VictorPhilipp
Merge branch 'turn-on-red' into 119-migration-to-harmony
05f457a 
# Conflicts:
#	TLM/TLM/Geometry/Impl/SegmentGeometry.cs
#	TLM/TLM/LoadingExtension.cs
#	TLM/TLM/Manager/Impl/GeometryManager.cs
#	TLM/TLM/Manager/Impl/JunctionRestrictionsManager.cs
#	TLM/TLM/Manager/Impl/OptionsManager.cs
#	TLM/TLM/Manager/Impl/TrafficPriorityManager.cs
#	TLM/TLM/Manager/Impl/VehicleBehaviorManager.cs
#	TLM/TLM/State/ConfigData/Debug.cs
#	TLM/TLM/State/Configuration.cs
#	TLM/TLM/State/GlobalConfig.cs
#	TLM/TLM/State/Options.cs
#	TLM/TLM/TLM.csproj
#	TLM/TLM/Traffic/Impl/SegmentEnd.cs
#	TLM/TLM/UI/SubTools/JunctionRestrictionsTool.cs
#	TLM/TMPE.API/Manager/IGeometryManager.cs
#	TLM/TMPE.API/Manager/IJunctionRestrictionsManager.cs
#	TLM/TMPE.API/Traffic/Data/SegmentEndFlags.cs
#	TLM/TMPE.API/Traffic/Data/SegmentFlags.cs
@VictorPhilipp
Merge branch '_labs' into 119-migration-to-harmony
2f99c88
@VictorPhilipp
#119: Fixed compiler errors from merging with master
6ac102d
@VictorPhilipp
#119: Restored StartPathFind refactorings
0a20869
@VictorPhilipp
#119: Fixed some merging errors
38d7d0c
@VictorPhilipp
Merge branch '_labs' into 119-migration-to-harmony
986f6c9
@VictorPhilipp
Updated RedirectionFramework (Harmony v1.2.0.1)
ba791ed
@VictorPhilipp
Merge branch 'labs' into 119-migration-to-harmony
d3ef70b 
# Conflicts:
#	TLM/TLM/Custom/AI/CustomCitizenAI.cs
#	TLM/TLM/Custom/AI/CustomHumanAI.cs
#	TLM/TLM/Custom/AI/CustomPassengerCarAI.cs
#	TLM/TLM/Manager/IExtCitizenInstanceManager.cs
#	TLM/TLM/Manager/Impl/AdvancedParkingManager.cs
#	TLM/TLM/Traffic/Data/ExtCitizenInstance.cs
#	TLM/TLM/TrafficManagerMod.cs
@VictorPhilipp
merge labs
6b2ccbf
@VictorPhilipp
Fixed compilation errors
26867ef
@VictorPhilipp
updated ref to redirection framework
9ff076d
VictorPhilipp
VictorPhilipp commented Mar 30, 2019
View reviewed changes
.gitmodules Outdated Show resolved Hide resolved
@VictorPhilipp VictorPhilipp changed the title #119: Migration to harmony #119: Migration to Harmony / RedirectionFramework Mar 30, 2019
@originalfoo originalfoo added enhancement Improve existing feature LABS TM:PE LABS branch STABLE TM:PE STABLE branch labels Apr 2, 2019
@VictorPhilipp
Copy link
Collaborator Author

VictorPhilipp commented Jun 6, 2019 •
edited

Thanks for testing! I fixed the null reference issue.

@originalfoo originalfoo mentioned this pull request Jun 20, 2019
Merged
4 tasks
krzychu124 and others added 11 commits June 24, 2019 01:32
@krzychu124
Merge branch 'master' of https://github.com/krzychu124/Cities-Skyline…
7b1f4e3 
…s-Traffic-Manager-President-Edition into 119-migration-to-harmony

# Conflicts:
#	TLM/TLM/Custom/AI/CustomCitizenAI.cs
#	TLM/TLM/Custom/AI/CustomPassengerCarAI.cs
#	TLM/TLM/Custom/AI/CustomVehicleAI.cs
#	TLM/TLM/Custom/PathFinding/CustomPathManager.cs
#	TLM/TLM/Manager/IVehicleBehaviorManager.cs
#	TLM/TLM/Manager/Impl/AdvancedParkingManager.cs
#	TLM/TLM/Manager/Impl/JunctionRestrictionsManager.cs
#	TLM/TLM/Manager/Impl/RoutingManager.cs
#	TLM/TLM/Manager/Impl/VehicleBehaviorManager.cs
#	TLM/TLM/Traffic/Data/ExtCitizenInstance.cs
#	TLM/TMPE.sln
@krzychu124
Vehicle limit fix after incomplete merge
a33333c
@krzychu124
Merge with master, resolved conflict with TrafficManagerMod.cs
d9bd167
@krzychu124
GameVersion numbers update
fc90187
@originalfoo
README.md - new format based on 10.21.1
a1c9b62
@originalfoo
TrafficManagerMod.cs - based on 10.21.1
d69eb91 
Hopefully one less merge conflict
@krzychu124
Merge branch 'master' of https://github.com/krzychu124/Cities-Skyline…
20e7300 
…s-Traffic-Manager-President-Edition into 119-migration-to-harmony-merged

# Conflicts:
#	README.md
#	TLM/TLM/State/Options.cs
#	TLM/TLM/TLM.csproj
#	TLM/TLM/TrafficManagerMod.cs
#	TLM/TLM/UI/TrafficManagerTool.cs
@krzychu124
Merge branch '119-migration-to-harmony' of https://github.com/krzychu…
83fb981 
…124/Cities-Skylines-Traffic-Manager-President-Edition into 119-migration-to-harmony-merged

# Conflicts:
#	TLM/TLM/TrafficManagerMod.cs
@kvakvs
Moved type and old legacy type given different namespaces
9b3996c
@kvakvs
ConfigData members and Config untabified
6ec4c8c
@krzychu124
Merge pull request #427 from kvakvs/119-migration-to-harmony-savegamefix
7948df5 
Fixes Harmony savegame compat with the pre-Harmony master
@originalfoo originalfoo mentioned this pull request Jul 15, 2019
Merged
originalfoo and others added 2 commits July 15, 2019 19:37
@originalfoo
Update lang_template.txt
2b179bb 
Added couple of missing keys
@krzychu124
Merge pull request #428 from krzychu124/119-migration-to-harmony-merged
f6595dc 
Master to harmony branch, resolved conflicts, savegame compatibility fix
@originalfoo
Update README.md
6b37e17 
Added the 10.21 stuff in for now, also a message about us working on v11.
krzychu124
krzychu124 approved these changes Jul 15, 2019
View reviewed changes
Copy link
Member

@krzychu124 krzychu124 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM 👍

originalfoo
originalfoo approved these changes Jul 15, 2019
View reviewed changes
Copy link
Member

@originalfoo originalfoo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍 LGTM!

kvakvs
kvakvs approved these changes Jul 15, 2019
View reviewed changes
Copy link
Collaborator

@kvakvs kvakvs left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looked through everything carefully.
Looking good.
Remaining tabs and usings and formatting will be addressed in subsequent PRs.

@originalfoo
Copy link
Member

Testing in-game seems OK to me, and seems to be save/loading successfully.

@krzychu124 krzychu124 merged commit ef4fc55 into master Jul 15, 2019
@originalfoo originalfoo deleted the 119-migration-to-harmony branch July 24, 2019 17:34
@originalfoo originalfoo mentioned this pull request Jul 24, 2019
Closed
@originalfoo originalfoo added the code cleanup Refactor code, remove old code, improve maintainability label Aug 13, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@originalfoo originalfoo originalfoo approved these changes

@krzychu124 krzychu124 krzychu124 approved these changes

@kvakvs kvakvs kvakvs approved these changes

Assignees
No one assigned
Labels
code cleanup Refactor code, remove old code, improve maintainability enhancement Improve existing feature Harmony LABS TM:PE LABS branch STABLE TM:PE STABLE branch technical Tasks that need to be performed in order to improve quality and maintainability
Projects
None yet
Milestone
11.0
Development

Successfully merging this pull request may close these issues.

Migration to Harmony
5 participants
@VictorPhilipp @krzychu124 @originalfoo @kvakvs @Victor-Philipp-Negoescu