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

Master to testing #1088

Merged
merged 46 commits into from
Apr 13, 2021
Merged

Master to testing #1088

merged 46 commits into from
Apr 13, 2021

Commits on Aug 30, 2020

  1. Add Schinese icon

    @TianQiBuTian
    TianQiBuTian committed Aug 30, 2020
    Configuration menu
    Copy the full SHA
    c489626 View commit details
    Browse the repository at this point in the history

Commits on Nov 14, 2020

  1. - no need to allocate a new List each time if we can work with locks … 

    …instead.

- use of lock statement instead Monitor directly.
- removed commented out debug.log calls.
- formatting

(cherry picked from commit c878dd2)
    @DaEgi01 @krzychu124
    DaEgi01 authored and krzychu124 committed Nov 14, 2020
    Configuration menu
    Copy the full SHA
    57b3a44 View commit details
    Browse the repository at this point in the history

  2. fixed stay-in-lane for MOM tracks. 

    (cherry picked from commit 4d281c8)
    @kianzarrin @krzychu124
    kianzarrin authored and krzychu124 committed Nov 14, 2020
    Configuration menu
    Copy the full SHA
    d0633b4 View commit details
    Browse the repository at this point in the history

  3. Updated icons for RoadSelectionPanel to optimized 8bit as the previou… 

    …s version causes sometimes at rebuild strange white pixel artifacts.

(cherry picked from commit 4544d30)
    @chameleon-tbn @krzychu124
    chameleon-tbn authored and krzychu124 committed Nov 14, 2020
    Configuration menu
    Copy the full SHA
    c052823 View commit details
    Browse the repository at this point in the history

  4. Bugfix floating vehicles if ParkingAI disabled 

                                                                        (cherry picked from commit e32778a)
    @krzychu124
    krzychu124 committed Nov 14, 2020
    Configuration menu
    Copy the full SHA
    eb34bdd View commit details
    Browse the repository at this point in the history

  5. Apply Shift+Click speed limit to entire roundabout (#920) 

    #869: Apply Shift+Click speed limit to entire roundabout

(cherry picked from commit ec3227d)
    @krzychu124
    krzychu124 committed Nov 14, 2020
    Configuration menu
    Copy the full SHA
    37c5d02 View commit details
    Browse the repository at this point in the history

  6. Right-click close main menu if no tool selected, right-click exit too… 

    …l - set current tool to None, update OSD

(cherry picked from commit 3c0b6e4)

Road selection Panel - close on single right click, but leave menu open

(cherry picked from commit 39087f6)
    @krzychu124
    krzychu124 committed Nov 14, 2020
    Configuration menu
    Copy the full SHA
    2278e4c View commit details
    Browse the repository at this point in the history

  7. Version bump

    @krzychu124
    krzychu124 committed Nov 14, 2020
    Configuration menu
    Copy the full SHA
    2914bdc View commit details
    Browse the repository at this point in the history

Commits on Nov 19, 2020

  1. Merge pull request #1033 from CitiesSkylinesMods/11.5-plus-cherry-picks 

    Release stable 11.5.1
    @krzychu124
    krzychu124 committed Nov 19, 2020
    Configuration menu
    Copy the full SHA
    e8675d4 View commit details
    Browse the repository at this point in the history

Commits on Nov 20, 2020

  1. Fix - RMB lane connector - to select node

    @krzychu124
    krzychu124 committed Nov 20, 2020
    1 Configuration menu
    Copy the full SHA
    5875d42 View commit details
    Browse the repository at this point in the history

Commits on Nov 21, 2020

  1. Merge branch 'master' into schinese-icon

    @TianQiBuTian
    TianQiBuTian committed Nov 21, 2020
    Configuration menu
    Copy the full SHA
    b684109 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1037 from CitiesSkylinesMods/fix/rmb-lane-connect… 

    …or-hotfix

Fix RMB lane connector
    @krzychu124
    krzychu124 committed Nov 21, 2020
    Configuration menu
    Copy the full SHA
    a3cd8fa View commit details
    Browse the repository at this point in the history

Commits on Apr 7, 2021

  1. Fixed SA1410 warnings by replacing the delegates with lambdas.

    @DaEgi01
    DaEgi01 committed Apr 7, 2021
    Configuration menu
    Copy the full SHA
    24f741c View commit details
    Browse the repository at this point in the history

  2. Fixed "SA1137 Elements should have the same indentation" warnings.

    @DaEgi01
    DaEgi01 committed Apr 7, 2021
    Configuration menu
    Copy the full SHA
    f064a2c View commit details
    Browse the repository at this point in the history

  3. Fixed "SA1137 Elements should have the same indentation" warning.

    @DaEgi01
    DaEgi01 committed Apr 7, 2021
    Configuration menu
    Copy the full SHA
    4e85745 View commit details
    Browse the repository at this point in the history

Commits on Apr 8, 2021

  1. Fixed all instances of delegate instance allocation (HAA0603) where i… 

    …ts used to feed GUILayout.Window.

This will reduce allocations when some UI tools are open.
    @DaEgi01
    DaEgi01 committed Apr 8, 2021
    Configuration menu
    Copy the full SHA
    514a644 View commit details
    Browse the repository at this point in the history

  2. cleaning up life cycle code (#1068) 

    * made lifecycle functions/variables static and removed OnCreated OnRelease for better hot reload.
* cleanup lifecycle/Patcher.
    @kianzarrin
    kianzarrin committed Apr 8, 2021
    Configuration menu
    Copy the full SHA
    ebe29ea View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into Warning_SA1410

    @DaEgi01
    DaEgi01 committed Apr 8, 2021
    Configuration menu
    Copy the full SHA
    1bcbc71 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' into Warning_SA1137

    @DaEgi01
    DaEgi01 committed Apr 8, 2021
    Configuration menu
    Copy the full SHA
    d461fa2 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'master' into Warning_HAA0603_GUILayoutWindow

    @DaEgi01
    DaEgi01 committed Apr 8, 2021
    Configuration menu
    Copy the full SHA
    515b40e View commit details
    Browse the repository at this point in the history

  6. Merge pull request #1069 from CitiesSkylinesMods/Warning_SA1410 

    Fixed SA1410 warnings by replacing the delegates with lambdas.
    @DaEgi01
    DaEgi01 committed Apr 8, 2021
    Configuration menu
    Copy the full SHA
    1678f64 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'master' into Warning_SA1137

    @DaEgi01
    DaEgi01 committed Apr 8, 2021
    Configuration menu
    Copy the full SHA
    8fee629 View commit details
    Browse the repository at this point in the history

  8. Merge pull request #1070 from CitiesSkylinesMods/Warning_SA1137 

    Fixed SA1137 Elements should have the same indentation warnings.
    @DaEgi01
    DaEgi01 committed Apr 8, 2021
    Configuration menu
    Copy the full SHA
    fd8f2d6 View commit details
    Browse the repository at this point in the history

  9. Merge branch 'master' into Warning_HAA0603_GUILayoutWindow 

    # Conflicts:
#	TLM/TLM/UI/SubTools/VehicleRestrictionsTool.cs
    @DaEgi01
    DaEgi01 committed Apr 8, 2021
    Configuration menu
    Copy the full SHA
    2670f8c View commit details
    Browse the repository at this point in the history

  10. Merge pull request #1071 from CitiesSkylinesMods/Warning_HAA0603_GUIL… 

    …ayoutWindow

Fixed all instances of delegate instance allocation (HAA0603) where i…
    @DaEgi01
    DaEgi01 committed Apr 8, 2021
    Configuration menu
    Copy the full SHA
    89898f2 View commit details
    Browse the repository at this point in the history

  11. Merge tag '11.5.1-hotfix1' into release_merge_ours

    @DaEgi01
    DaEgi01 committed Apr 8, 2021
    Configuration menu
    Copy the full SHA
    6180d23 View commit details
    Browse the repository at this point in the history

Commits on Apr 9, 2021

  1. Merge pull request #1073 from CitiesSkylinesMods/release_merge_ours 

    This is just a 11.5.1-hotfix1 merge with strategy=ours into master.
    @DaEgi01
    DaEgi01 committed Apr 9, 2021
    Configuration menu
    Copy the full SHA
    cf220a9 View commit details
    Browse the repository at this point in the history

Commits on Apr 11, 2021

  1. Main Camera cache reinitialization to prevent use of inactive camera

    @krzychu124
    krzychu124 committed Apr 11, 2021
    Configuration menu
    Copy the full SHA
    443acad View commit details
    Browse the repository at this point in the history

  2. Hide overlays if no longer necessary

    @krzychu124
    krzychu124 committed Apr 11, 2021
    Configuration menu
    Copy the full SHA
    2c541a3 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #1080 from CitiesSkylinesMods/1065-overlay-rendere… 

    …d-in-tool-disabled

Hide overlays if no longer necessary
    @krzychu124
    krzychu124 committed Apr 11, 2021
    Configuration menu
    Copy the full SHA
    a8bc6e2 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' into 1078-camera-cache-fix

    @krzychu124
    krzychu124 committed Apr 11, 2021
    Configuration menu
    Copy the full SHA
    a908bec View commit details
    Browse the repository at this point in the history

  5. Merge pull request #1079 from CitiesSkylinesMods/1078-camera-cache-fix 

    Main Camera cache reinitialization to prevent use of inactive camera
    @krzychu124
    krzychu124 committed Apr 11, 2021
    Configuration menu
    Copy the full SHA
    319e882 View commit details
    Browse the repository at this point in the history

Commits on Apr 12, 2021

  1. 730 cleanup loading custom path manager (#1072) 

    * encapsulate code for the lifecycle of CustomPathManager.
* restore old path manager and its path finds when unloading.
* hot unload now works
    @kianzarrin
    kianzarrin committed Apr 12, 2021
    Configuration menu
    Copy the full SHA
    57c0e92 View commit details
    Browse the repository at this point in the history

  2. harmon patcher continues on error (#1076) 

    Harmony patcher continues on error (#1074).
Also, it logs which functions have been patched failed patching (#1075).
    @kianzarrin
    kianzarrin committed Apr 12, 2021
    Configuration menu
    Copy the full SHA
    f4d55ae View commit details
    Browse the repository at this point in the history

  3. lifecycle class (#1077) 

    Moved all lifecycle code to a TMPELifeCycle.
    @kianzarrin
    kianzarrin committed Apr 12, 2021
    Configuration menu
    Copy the full SHA
    6b0b6cc View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' into schinese-icon 

    # Conflicts:
#	TLM/TLM/UI/Textures/RoadUI.cs
#	TLM/TLM/UI/Textures/TrafficLightTextures.cs
    @DaEgi01
    DaEgi01 committed Apr 12, 2021
    Configuration menu
    Copy the full SHA
    92d6a6a View commit details
    Browse the repository at this point in the history

  5. fixed merge bug.

    @DaEgi01
    DaEgi01 committed Apr 12, 2021
    Configuration menu
    Copy the full SHA
    01ac7bf View commit details
    Browse the repository at this point in the history

  6. Converted .ruleset to .editorconfig

    @DaEgi01
    DaEgi01 committed Apr 12, 2021
    Configuration menu
    Copy the full SHA
    290e8ae View commit details
    Browse the repository at this point in the history

Commits on Apr 13, 2021

  1. Merge pull request #1082 from CitiesSkylinesMods/ruleset_to_editorconfig 

    Converted .ruleset to .editorconfig
    @DaEgi01
    DaEgi01 committed Apr 13, 2021
    Configuration menu
    Copy the full SHA
    ea0f419 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into schinese-icon

    @DaEgi01
    DaEgi01 committed Apr 13, 2021
    Configuration menu
    Copy the full SHA
    f961808 View commit details
    Browse the repository at this point in the history

  3. Removed warnings 

    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'
    @DaEgi01
    DaEgi01 committed Apr 13, 2021
    Configuration menu
    Copy the full SHA
    70767bf View commit details
    Browse the repository at this point in the history

  4. Merge pull request #1081 from CitiesSkylinesMods/schinese-icon 

    Schinese icon
    @DaEgi01
    DaEgi01 committed Apr 13, 2021
    Configuration menu
    Copy the full SHA
    738e9f2 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'master' into doc_warning_removal

    @DaEgi01
    DaEgi01 committed Apr 13, 2021
    Configuration menu
    Copy the full SHA
    4cc466b View commit details
    Browse the repository at this point in the history

  6. Merge pull request #1083 from CitiesSkylinesMods/doc_warning_removal 

    Removed some documentation warnings.
    @DaEgi01
    DaEgi01 committed Apr 13, 2021
    Configuration menu
    Copy the full SHA
    baad59a View commit details
    Browse the repository at this point in the history

  7. Merge branch 'testing' of https://github.com/krzychu124/Cities-Skylin… 

    …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
    @krzychu124
    krzychu124 committed Apr 13, 2021
    Configuration menu
    Copy the full SHA
    cac1b15 View commit details
    Browse the repository at this point in the history

  8. Removed invalid references (RedirectionFramework deleted after migrat… 

    …ion)
    @krzychu124
    krzychu124 committed Apr 13, 2021
    Configuration menu
    Copy the full SHA
    a226e16 View commit details
    Browse the repository at this point in the history