Master to harmony branch, resolved conflicts, savegame compatibility fix #428

krzychu124 · 2019-07-15T16:40:21Z

Highlights:

merged-in master,
resolved conflicts,
fixed savegame compatibility - now you can use savegame created on harmony branch(v11.0) with previous builds (<11.0) (thanks kvakvs)

…ction - Fixes #326

Separated out the branch string, so we can now distinguish between DEBUG, LABS and STABLE. Also minor code rearranging to aid readability.

Using the new LABS token allows us to dynamically add other version of TM:PE (either STABLE or LABS as applicalbe) to the incompatible mod checker. This still won't detect local install versions, but it will drastically reduce number of users who have more than one TM:PE subbed and subsequently reduce the issues with non-saving road config.

VersionLabel.cs references the `Version` value, so made it static like it was before (not ideal, but not a regression either). Also added L, D, or S to denote build branch which will be useful for support purposes.

Fixed blunder with location of the additions to incompatible mods list.

This adds the branch to the title on the incompatible mods dialog. I've updated language files as applicable; most were untranslated, except `fr` and `ko` - `ko` didn't include the word `Traffic Manager` and `fr` had the translation at the start so easy to modify.

Changed workshop ids to ulong.

Updated to full string, not abbreviation.

* Local TMPE build now detected * UI shows "Delete" button for it * Click handler knows difference, but doesn't yet delete * Directive block is commented out for testing * Needs additional work for completion!

Added local mod deletion + code cleanup, still testing

Moved detection to correct fine, now detects properly even if no other incompatible mods present. Also tested unload/delete which seems to be working fine.

Minor code cleanup

Improved code readability

Tested and seems to work, although I can't figure out why the wrong folder name is shown for local builds.

#333 (comment)

Just trying to restart the build process.

`Path.GetDirectoryName(mod.modPath)` was assuming last item on the path was a file, but `mod.modPath` doesn't include a file.

- Parking AI: Last segment before parking space is now required to be accessible by car - Bugfix: Random parking broken - Bugfix: Pedestrian crossing restriction affects road-side parking - Pedestrian crossing is allowed at untouchable bent nodes - Removed u-turn lane arrow check at transition nodes

- Bugfix: Changes of default junction restrictions are not reflected in the UI overlay - Bugfix: Resetting stuck cims unpauses the simulation (#351)

Minor fixes: Saving/Loading junction restrictions, UI overlay, Reset stuck cims

There was already locale key for `Delete` so only new key is for `Unsubscribe`

First attempt at removing panel when a mod is removed. Also, if no mods left, the dialog closes.

When offline, the LABS and STABLE builds won't check for local TM:PE mods. This prevents offline LABS/STABLE builds from deleting themselves lol.

Assuming any form of offline will cause `PluginManager.noWorkshop` to be `true`, check that first.

Version 10.21.1 hotfix

Update lang_zh.txt

It's features such as Improved AI (aka Advanced Vehicle AI and DLS in TM:PE) and lane connections are now part of TM:PE.

Changelog: Added Traffic++ history

…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

…124/Cities-Skylines-Traffic-Manager-President-Edition into 119-migration-to-harmony-merged # Conflicts: # TLM/TLM/TrafficManagerMod.cs

Fixes Harmony savegame compat with the pre-Harmony master

originalfoo · 2019-07-15T18:19:04Z

Just a small PR then 🤣 How does this relate to PR #260 - does it replace it or is it part of it?

kvakvs · 2019-07-15T18:20:37Z

I assume it solves rebase conflict by reverse-merging the master, and also this savegame fix from the last night. It is not easy to review though, essentially reviewing stuff that happened since March.

krzychu124 · 2019-07-15T18:21:45Z

As you can see it's PR to #260 PR :) Then we can merge #260 to master
To be precise it's #260 base with merged master and that savegame fix :)

TLM/TLM/Properties/AssemblyInfo.cs

Added couple of missing keys

originalfoo · 2019-07-15T18:44:06Z

I assume we're ignoring inconsistent using placement until everything is merged?

krzychu124 · 2019-07-15T18:45:32Z

I assume we're ignoring inconsistent using placement until everything is merged?

Isn't that change in #419 ?

kvakvs · 2019-07-15T18:46:20Z

I will do multiple passes over the remaining files later, to make them more or less StyleCop compliant and to clean up remaining tabified files. Not everything at once.

originalfoo · 2019-07-15T18:49:14Z

Stuff I've looked at so far seems good. I'll do some more checking later this evening, particularly around stuff like mod compatibility checker.

kvakvs

Went through every file (ignoring the whitespaces) and it
looks good

originalfoo

👍 LGTM

krzychu124 and others added 30 commits May 24, 2019 20:24

Added 'Release LABS' build configuration and LABS preprocessor instru…

67b3318

…ction - Fixes #326

Merge branch 'master' into 326-differentiate-labs-and-stable

68aafeb

Update TrafficManagerMod.cs

95f51ae

Separated out the branch string, so we can now distinguish between DEBUG, LABS and STABLE. Also minor code rearranging to aid readability.

Made version static again to fix Menu UI

cecbeb6

VersionLabel.cs references the `Version` value, so made it static like it was before (not ideal, but not a regression either). Also added L, D, or S to denote build branch which will be useful for support purposes.

Update ModsCompatibilityChecker.cs

b4b737c

Fixed blunder with location of the additions to incompatible mods list.

Update ModsCompatibilityChecker.cs

1eabb10

Changed workshop ids to ulong.

Update VersionLabel.cs

63982a6

Updated to full string, not abbreviation.

Partial implementation for detect and delete of local TMPE build

d4afd0f

* Local TMPE build now detected * UI shows "Delete" button for it * Click handler knows difference, but doesn't yet delete * Directive block is commented out for testing * Needs additional work for completion!

#225: Regular vehicles do not change lanes at toll booths

b9e57ac

Update IncompatibleModsPanel.cs

4891a21

Added local mod deletion + code cleanup, still testing

Correctly detect and delete local TMPE builds

959fe78

Moved detection to correct fine, now detects properly even if no other incompatible mods present. Also tested unload/delete which seems to be working fine.

Update IncompatibleModsPanel.cs

72a92cb

Minor code cleanup

Update IncompatibleModsPanel.cs

48cd41d

Improved code readability

Refactored to allow detection of multiple local builds

a5d9caa

Tested and seems to work, although I can't figure out why the wrong folder name is shown for local builds.

Fixed inline variable declaration that was breaking build

3cc1098

#333 (comment)

Update ModsCompatibilityChecker.cs

290e9ca

Just trying to restart the build process.

Fix path display for local builds

b914f90

`Path.GetDirectoryName(mod.modPath)` was assuming last item on the path was a file, but `mod.modPath` doesn't include a file.

Removed unnecessary events

f600d00

#225: emergency vehicles do not change lanes at toll booths

366bfde

#259: corrected junction check at transition nodes

a61f0cc

- Fixed minor issues regarding saving/loading junction restrictions

bb85e62

- Bugfix: Changes of default junction restrictions are not reflected in the UI overlay - Bugfix: Resetting stuck cims unpauses the simulation (#351)

Use actual array size instead of fixed MAX_VEHICLE_COUNT constant

c99d4da

Merge pull request #358 from krzychu124/minor-fixes

cec8307

Minor fixes: Saving/Loading junction restrictions, UI overlay, Reset stuck cims

Translate Delete and Unsibscribe buttons

84384e9

There was already locale key for `Delete` so only new key is for `Unsubscribe`

Remove panel when unsubscribing

26d55d1

First attempt at removing panel when a mod is removed. Also, if no mods left, the dialog closes.

Detect offline or --noWorkshop states

4e8c8dd

When offline, the LABS and STABLE builds won't check for local TM:PE mods. This prevents offline LABS/STABLE builds from deleting themselves lol.

Improved offline detection

57dfc56

Assuming any form of offline will cause `PluginManager.noWorkshop` to be `true`, check that first.

originalfoo and others added 12 commits July 6, 2019 22:09

Updated changelogs for 10.21.1

0aa0c80

Merge branch 'master' into 10.21.1-hotfix

8f93a80

Merge pull request #414 from krzychu124/10.21.1-hotfix

012a4c9

Version 10.21.1 hotfix

Update CHANGELOG.md

381bdb5

Merge pull request #417 from Emphasia/10.21

40791c8

Update lang_zh.txt

Added complete history of Traffic++

613a3b6

It's features such as Improved AI (aka Advanced Vehicle AI and DLS in TM:PE) and lane connections are now part of TM:PE.

Merge pull request #422 from krzychu124/changelog-tpp

36631b9

Changelog: Added Traffic++ history

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

Moved type and old legacy type given different namespaces

9b3996c

ConfigData members and Config untabified

6ec4c8c

Merge pull request #427 from kvakvs/119-migration-to-harmony-savegamefix

7948df5

Fixes Harmony savegame compat with the pre-Harmony master

krzychu124 added the technical Tasks that need to be performed in order to improve quality and maintainability label Jul 15, 2019

krzychu124 added this to the 11.0 milestone Jul 15, 2019

krzychu124 requested review from kvakvs and originalfoo July 15, 2019 16:40

originalfoo reviewed Jul 15, 2019

View reviewed changes

TLM/TLM/Properties/AssemblyInfo.cs Show resolved Hide resolved

Update lang_template.txt

2b179bb

Added couple of missing keys

kvakvs approved these changes Jul 15, 2019

View reviewed changes

originalfoo approved these changes Jul 15, 2019

View reviewed changes

krzychu124 merged commit f6595dc into 119-migration-to-harmony Jul 15, 2019

originalfoo deleted the 119-migration-to-harmony-merged branch March 29, 2020 21:59

originalfoo added the Harmony label Feb 7, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Master to harmony branch, resolved conflicts, savegame compatibility fix #428

Master to harmony branch, resolved conflicts, savegame compatibility fix #428

krzychu124 commented Jul 15, 2019 •

edited

Loading

originalfoo commented Jul 15, 2019

kvakvs commented Jul 15, 2019

krzychu124 commented Jul 15, 2019 •

edited

Loading

originalfoo commented Jul 15, 2019

krzychu124 commented Jul 15, 2019

kvakvs commented Jul 15, 2019

originalfoo commented Jul 15, 2019

kvakvs left a comment

originalfoo left a comment

Master to harmony branch, resolved conflicts, savegame compatibility fix #428

Master to harmony branch, resolved conflicts, savegame compatibility fix #428

Conversation

krzychu124 commented Jul 15, 2019 • edited Loading

originalfoo commented Jul 15, 2019

kvakvs commented Jul 15, 2019

krzychu124 commented Jul 15, 2019 • edited Loading

originalfoo commented Jul 15, 2019

krzychu124 commented Jul 15, 2019

kvakvs commented Jul 15, 2019

originalfoo commented Jul 15, 2019

kvakvs left a comment

Choose a reason for hiding this comment

originalfoo left a comment

Choose a reason for hiding this comment

krzychu124 commented Jul 15, 2019 •

edited

Loading

krzychu124 commented Jul 15, 2019 •

edited

Loading