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.

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

Road sign themes reloadable + Canadian signs #1215

Merged
merged 80 commits into from
Dec 31, 2021
Merged
Show file tree
Hide file tree
Changes from 77 commits
Commits
Show all changes
80 commits
Select commit Hold shift + click to select a range
7ae637e
Speedlimits UI changes preparation: Changes to U library
kvakvs Sep 12, 2021
b250236
Remove Redirection Framework
kvakvs Oct 3, 2021
0e415a9
Speed Limits UI: New textures, new overlay and util classes
kvakvs Oct 18, 2021
3301b4b
Rebase on fresh master
kvakvs Oct 18, 2021
6ed359a
Merge branch 'master' into u-speedlimits-tool-7
kvakvs Nov 14, 2021
22ec96a
Fixes for after master was merged
kvakvs Nov 14, 2021
4d80bfb
laneSpeedLimit and laneSpeedLimitArray use game units for speed
kvakvs Nov 15, 2021
31448bd
SetLaneSpeedLimit accepts action with null override, but requires it …
kvakvs Nov 15, 2021
b47ff59
Tooltip position for speedlimits is now corrected for UIScale. UI fon…
kvakvs Nov 16, 2021
60b58ed
Do not recreate Speed Limits tool window if MPH setting was not chang…
kvakvs Nov 16, 2021
01d9291
On tool reactivation, visible segments and segment centers cache is c…
kvakvs Nov 16, 2021
ae77565
Check for Null when rendering overlay, if window has not been yet cre…
kvakvs Nov 16, 2021
ec7897a
SetSpeedLimitAction.cs: Speed limit value is now guarded, and only ac…
kvakvs Nov 21, 2021
cbe20d5
Minor cosmetics for SegmentLaneMarker.cs, moved useful function IsUnd…
kvakvs Nov 22, 2021
d327e4a
WIP render segment center signs
kvakvs Nov 26, 2021
05c126b
Merge Master into U-Speedlimits-Tool-7
kvakvs Nov 26, 2021
42eec09
Show single speed limit mode for segments; average value for both dir…
kvakvs Nov 27, 2021
4940d9c
Set speed limits for segment
kvakvs Nov 27, 2021
8353d1e
Render seg-default speed limit if Alt is held
kvakvs Nov 27, 2021
8929f32
Triple mode for edit Segments, Lanes and Defaults. Holding alt shows …
kvakvs Nov 27, 2021
10a7518
Draw circle with default speed limit, when no override. Fix for recta…
kvakvs Nov 27, 2021
d0f02ca
Review cleanup
kvakvs Nov 28, 2021
1a9a15f
Null window check for getting the mouse coords
kvakvs Dec 1, 2021
ad8cb8e
Krzychu's fix to parking manager freeze bug
kvakvs Dec 1, 2021
f408bfa
Merge master
kvakvs Dec 1, 2021
5d5ac2b
Keybind for speed limits now opens speed limits; Holding Alt will not…
kvakvs Dec 3, 2021
ab8fb29
Draw hovered segments and lanes (even more than one if mouse hovers o…
kvakvs Dec 3, 2021
d324e73
Speed limits Translations: English, Russian, Ukrainian
kvakvs Dec 4, 2021
e243837
Events in ModUI grouped into a inner class; New event for UI Language…
kvakvs Dec 4, 2021
4352e6f
Lane highlight for speed limits lane mode with Shift; Warning for che…
kvakvs Dec 4, 2021
caa2faa
Overlay drawing code moved
kvakvs Dec 4, 2021
c4c8bfb
Down arrow is rendered for speed limit icons of underground nodes
kvakvs Dec 4, 2021
9b4a9df
Disabled sign fading due to bug in screen UI scaling calculations
kvakvs Dec 4, 2021
f10a565
Fixed screen position calculations for GUI rects and fading signs
kvakvs Dec 4, 2021
aad56e0
Underground nodes don't show in overground mode. Added hint for that
kvakvs Dec 4, 2021
294d562
Language change makes the speed limits window wonky. Close it.
kvakvs Dec 4, 2021
14b216e
Merge branch 'master' into u-speedlimits-tool-7
kvakvs Dec 4, 2021
26ee314
More review/testing fixes: Cosmetic window sizing and special palette…
kvakvs Dec 5, 2021
b460f4f
Loadable/reloadable themes for road signs; Compatibility for kmph/mph…
kvakvs Dec 5, 2021
936e300
Translations; Translation key fixes
kvakvs Dec 5, 2021
3b9de26
Renamed German signs directory, imported Canadian style signs
kvakvs Dec 5, 2021
20b7566
Translations for renamed German theme, and canadian theme
kvakvs Dec 5, 2021
cbd4f42
Saving config properly on incompatible theme and MPH choices
kvakvs Dec 5, 2021
dc5d80d
UI Changes: Default button moved left; Text labels in form removed; B…
kvakvs Dec 5, 2021
937d2db
Merge remote-tracking branch 'kvakvs/u-speedlimits-tool-7' into featu…
kvakvs Dec 5, 2021
e9d42c5
New event for display MPH checkbox change (when switching road sign s…
kvakvs Dec 5, 2021
94b6e89
New event for display MPH checkbox change (when switching road sign s…
kvakvs Dec 5, 2021
d740f71
Fix after merging in base branch
kvakvs Dec 5, 2021
c09f33d
Window draghandle size fix; Reset defaults now working again.
kvakvs Dec 6, 2021
6d62ddf
Tooltips hide over GUI
kvakvs Dec 6, 2021
46a6039
Increase max overlay distance for road signs. Render road without ove…
kvakvs Dec 6, 2021
1a408d2
Aubergine10: Buttons contain themed signs, replace with blue sausages
kvakvs Dec 6, 2021
2506eca
Draw large blue speed limit defaults in lane mode
kvakvs Dec 6, 2021
ccf8a9d
Merge remote-tracking branch 'kvakvs/u-speedlimits-tool-7' into featu…
kvakvs Dec 6, 2021
a693735
Reload atlases in debug but keep in release
kvakvs Dec 6, 2021
01239c6
Merge remote-tracking branch 'kvakvs/u-speedlimits-tool-7' into featu…
kvakvs Dec 6, 2021
6bf4ee1
Merge remote-tracking branch 'kvakvs/u-speedlimits-tool-7' into featu…
kvakvs Dec 6, 2021
e878a12
For users without theme key in config, preselect German theme in the …
kvakvs Dec 6, 2021
39d2618
Green road signs; / and Delete keybinds; No numbered keybinds, no +- …
kvakvs Dec 6, 2021
6c8ce5f
Ctrl, select +- keys, slash, delete keys; Translations for new keybinds
kvakvs Dec 6, 2021
cb4b88f
Merge remote-tracking branch 'kvakvs/u-speedlimits-tool-7' into featu…
kvakvs Dec 6, 2021
491fc62
Form is now focused to allow keybinds to work; Esc now closes tool an…
kvakvs Dec 7, 2021
d0936ef
Overlay icons do not fade; UI intersection test now checks OSD panel.
kvakvs Dec 7, 2021
aa20d01
Unlimited button is now placed 2nd, is blue and behaves like a speed …
kvakvs Dec 7, 2021
73ab6fa
Keypress does not work as good as Keyup.
kvakvs Dec 7, 2021
061be92
Holding Alt shows defauls; Holding Alt in defaults shows override; Al…
kvakvs Dec 7, 2021
7d0dafe
Merge remote-tracking branch 'kvakvs/u-speedlimits-tool-7' into featu…
kvakvs Dec 7, 2021
4388cfd
Merge remote-tracking branch 'tmpe/master' into feature/dynamic-sign-…
kvakvs Dec 9, 2021
7492e68
Merge conflict project file fixed, dupe files removed
kvakvs Dec 9, 2021
3cffca3
Close window/deactivate speed limits on MPH option change
kvakvs Dec 9, 2021
9ecee42
Speed limit themes: Minor corrections for Egi's review
kvakvs Dec 10, 2021
fc66449
Window visibility is maintained when the window must be rebuilt; Fix …
kvakvs Dec 24, 2021
5a30aaf
Translations update
kvakvs Dec 24, 2021
8394e02
Merge branch 'master' into feature/dynamic-sign-themes
kvakvs Dec 24, 2021
262fb4e
Merge remote-tracking branch 'tmpe/master' into feature/dynamic-sign-…
kvakvs Dec 27, 2021
9b72e58
Sign themes use only one unit per theme; Use British signs as default…
kvakvs Dec 29, 2021
6d91794
Check the game is loaded before firing option changed events
kvakvs Dec 29, 2021
f2b571f
Null propagation when disposing of event subscribers where event unsu…
kvakvs Dec 30, 2021
971fef8
RebuildMenu regardless of isGameLoaded; Destroy gameobject not component
kvakvs Dec 30, 2021
0360e50
+translations for themes branch
kvakvs Dec 31, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion TLM/TLM/Lifecycle/TMPELifecycle.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
namespace TrafficManager.Lifecycle {
using CitiesHarmony.API;
using ColossalFramework;
using ColossalFramework.Globalization;
using ColossalFramework.UI;
using CSUtil.Commons;
Expand Down
2,923 changes: 0 additions & 2,923 deletions TLM/TLM/Resources/SpeedLimits/Kmh/roadsigns-km-german.svg

This file was deleted.

Binary file added TLM/TLM/Resources/SpeedLimits/Kmph_Canada/0.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added TLM/TLM/Resources/SpeedLimits/Kmph_Canada/10.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added TLM/TLM/Resources/SpeedLimits/Kmph_Canada/100.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added TLM/TLM/Resources/SpeedLimits/Kmph_Canada/105.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added TLM/TLM/Resources/SpeedLimits/Kmph_Canada/110.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added TLM/TLM/Resources/SpeedLimits/Kmph_Canada/120.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added TLM/TLM/Resources/SpeedLimits/Kmph_Canada/125.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added TLM/TLM/Resources/SpeedLimits/Kmph_Canada/130.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added TLM/TLM/Resources/SpeedLimits/Kmph_Canada/135.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added TLM/TLM/Resources/SpeedLimits/Kmph_Canada/140.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added TLM/TLM/Resources/SpeedLimits/Kmph_Canada/15.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added TLM/TLM/Resources/SpeedLimits/Kmph_Canada/20.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added TLM/TLM/Resources/SpeedLimits/Kmph_Canada/25.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added TLM/TLM/Resources/SpeedLimits/Kmph_Canada/30.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added TLM/TLM/Resources/SpeedLimits/Kmph_Canada/35.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added TLM/TLM/Resources/SpeedLimits/Kmph_Canada/40.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added TLM/TLM/Resources/SpeedLimits/Kmph_Canada/5.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added TLM/TLM/Resources/SpeedLimits/Kmph_Canada/50.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added TLM/TLM/Resources/SpeedLimits/Kmph_Canada/55.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added TLM/TLM/Resources/SpeedLimits/Kmph_Canada/60.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added TLM/TLM/Resources/SpeedLimits/Kmph_Canada/65.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added TLM/TLM/Resources/SpeedLimits/Kmph_Canada/70.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added TLM/TLM/Resources/SpeedLimits/Kmph_Canada/80.png
Binary file added TLM/TLM/Resources/SpeedLimits/Kmph_Canada/85.png
Binary file added TLM/TLM/Resources/SpeedLimits/Kmph_Canada/90.png
Binary file added TLM/TLM/Resources/SpeedLimits/Kmph_Canada/95.png
5 changes: 3 additions & 2 deletions TLM/TLM/Resources/Translations/Options.csv
Original file line number Diff line number Diff line change
Expand Up @@ -153,5 +153,6 @@ Opsi ini hanya sekadar menambah realisme kepada game."
"VR.Option:No double crossings","Keine doppelten Übergänge","at a segment to segment transition, only the smaller segment gets crossings.","En una transición de segmento a segmento, solo los segmentos más pequeños muestran cruce peatonal","Dans une transition d'un segment à un autre, seul le plus petit segment aura un passage piéton","A szegmensek közötti átmenetnél csak a kisebb szegmens kap gyalogátkelőt.","Nessun doppio attraversamento","セグメント間の横断歩道が二重になるのを防止し、狭い道路側のみにする","구간이 바뀔 때 더 작은 구간에서만 교차로가 생성됩니다.","Geen dubbele kruisingen","Przejście dla pieszych tylko na węższym segmencie przy łączeniu segmentów różnej szerokości","Sem cruzamentos duplos","Без двойных пешеходных переходов","禁用雙重行人穿越道","禁用双方向人行横道","at a segment to segment transition, only the smaller segment gets crossings.","Çift kesişim olamaz","Заборонити подвійні пішохідні переходи","","Dvojité priechody pre chodcov nie sú možné","ไม่มีการข้ามสองครั้ง","","","ﺕﺎﻌﻃﺎﻘﺗ ﻰﻠﻋ ﻂﻘﻓ ﺮﻐﺻﻷﺍ ﺀﺰﺠﻟﺍ ﻞﺼﺤﻳ ، ﺀﺰﺟ ﻰﻟﺇ ﺀﺰﺟ ﻦﻣ ﻝﺎﻘﺘﻧﻻﺍ ﻲﻓ","Pada transisi ruas-ke-ruas, hanya ruas yang lebih kecil yang mendapatkan penyeberangan."
"VR.Option:Dedicated turning lanes","Dedizierte Abbiegespuren","Dedicated turning lanes","Carriles dedicados para girar","Voies dédiées pour tourner","Dedikált kanyarodósávok","Corsie di svolta dedicate","専用の右左折レーン","회전 전용 차선","Toegewijde lijn om terug te draaien","Dedykowane pasy do skrętu","","Выделенные полосы для поворота","專用轉向車道","专用转弯车道","Dedicated turning lanes","Dönüş şeritleri ayrılır","Виділені смуги для руху в різних напрямках","","Vyhradené odbočovacie pruhy","เลนเลี้ยวเฉพาะ","","","ةصصخملا ةراودلا تارمملا","Lajur belok khusus"
"General.Checkbox:Use UnifiedUI","UnifiedUI verwenden","Use UnifiedUI","Utilizar UnifiedUI","","","Usa UnifiedUI","UnifiedUIを使用","UnifiedUI 사용","","Użyj UnifiedUI","","Использовать UnifiedUI","將主選單圖示加入 UnifiedUI 選單","使用 UnifiedUI","Use UnifiedUI","UnifiedUI kullan","Розмістити кнопку TM:PE в панелі UnifiedUI","","Použi UnifiedUI","","","","استخدام واجهة مستخدم موحدة","Gunakan UnifiedUI"
"Keybind.SpeedLimits:Decrease selected speed","Ausgewählte Geschwindigkeit verringern","Decrease selected speed","","","","Riduci la velocità selezionata","","선택한 속도 제한 감소","","Zmniejsz wybraną prędkość","","Уменьшить выбранную скорость","收緊速限","降低目标车速","Decrease selected speed","","Зменшити обрану швидкість","","","","","","ﺓﺩﺪﺤﻤﻟﺍ ﺔﻋﺮﺴﻟﺍ ﺾﻔﺧ ",""
"Keybind.SpeedLimits:Increase selected speed","Ausgewählte Geschwindigkeit erhöhen","Increase selected speed","","","","Aumenta la velocità selezionata","","선택한 속도 제한 증가","","Zwiększ wybraną prędkość","","Увеличить выбранную скорость","提高速限","提高目标车速","Increase selected speed","","Збільшити обрану швидкість","","","","","","ﺓﺩﺪﺤﻤﻟﺍ ﺔﻋﺮﺴﻟﺍ ﺓﺩﺎﻳﺯ",""
"Keybind.SpeedLimits:Decrease selected speed","Ausgewählte Geschwindigkeit verringern","Decrease selected speed","","","","Riduci la velocità selezionata","選択した速度を下げる","선택한 속도 제한 감소","","Zmniejsz wybraną prędkość","","Уменьшить выбранную скорость","收緊速限","降低目标车速","Decrease selected speed","","Зменшити обрану швидкість","","","","","","ﺓﺩﺪﺤﻤﻟﺍ ﺔﻋﺮﺴﻟﺍ ﺾﻔﺧ ","Kurangkan kecepatan"
"Keybind.SpeedLimits:Increase selected speed","Ausgewählte Geschwindigkeit erhöhen","Increase selected speed","","","","Aumenta la velocità selezionata","選択した速度を上げる","선택한 속도 제한 증가","","Zwiększ wybraną prędkość","","Увеличить выбранную скорость","提高速限","提高目标车速","Increase selected speed","","Збільшити обрану швидкість","","","","","","ﺓﺩﺪﺤﻤﻟﺍ ﺔﻋﺮﺴﻟﺍ ﺓﺩﺎﻳﺯ","Tingkatkan kecepatan"
"KeybindCategory:SpeedLimits","Geschwindigkeitsbegrenzungen","Speed Limits","","","","KeybindCategory:SpeedLimits","制限速度","속도 제한","","","","Ограничения скорости","","","Speed Limits","","Обмеження швидкості","","","","","","",""
Loading