Commit Graph

54210 Commits

Author SHA1 Message Date
Jonathan G Rennison
6d4474b84e Merge tag '13.0-beta2' into jgrpp
# Conflicts:
#	src/cheat_gui.cpp
#	src/company_gui.cpp
#	src/console_gui.cpp
#	src/depot_gui.cpp
#	src/error_gui.cpp
#	src/gfx.cpp
#	src/graph_gui.cpp
#	src/group_gui.cpp
#	src/lang/english.txt
#	src/lang/korean.txt
#	src/lang/polish.txt
#	src/misc_gui.cpp
#	src/network/network_content_gui.h
#	src/newgrf_debug_gui.cpp
#	src/order_gui.cpp
#	src/rail_gui.cpp
#	src/road_gui.cpp
#	src/settings_gui.cpp
#	src/settings_type.h
#	src/station_gui.cpp
#	src/subsidy_gui.cpp
#	src/table/settings/gui_settings.ini
#	src/timetable_gui.cpp
#	src/town_gui.cpp
#	src/train_cmd.cpp
#	src/vehicle_gui.cpp
#	src/viewport.cpp
#	src/water_cmd.cpp
#	src/widgets/dropdown.cpp
#	src/window_gui.h
2022-12-04 20:43:11 +00:00
translators
2c5eb206d4 Update: Translations from eints
vietnamese: 39 changes by KhoiCanDev
spanish: 2 changes by MontyMontana
2022-12-04 18:40:57 +00:00
Jonathan G Rennison
02e19521bc Merge branch 'master' into jgrpp
# Conflicts:
#	src/build_vehicle_gui.cpp
#	src/cheat_gui.cpp
#	src/company_gui.cpp
#	src/error_gui.cpp
#	src/fios_gui.cpp
#	src/gfx_func.h
#	src/graph_gui.cpp
#	src/group_gui.cpp
#	src/misc_gui.cpp
#	src/newgrf_debug_gui.cpp
#	src/order_gui.cpp
#	src/road_gui.cpp
#	src/roadveh_gui.cpp
#	src/settings_gui.cpp
#	src/ship_gui.cpp
#	src/station_gui.cpp
#	src/statusbar_gui.cpp
#	src/subsidy_gui.cpp
#	src/timetable_gui.cpp
#	src/town_gui.cpp
#	src/train_gui.cpp
#	src/tree_gui.cpp
#	src/vehicle_gui.cpp
#	src/widget.cpp
#	src/widgets/dropdown.cpp
#	src/window_gui.h
2022-12-04 13:53:44 +00:00
Jonathan G Rennison
77dc6915a7 Departure boards: Don't show "no info requested" message when departure_show_both enabled 2022-12-04 12:10:10 +00:00
Jonathan G Rennison
d19771c36b Merge PR #457 into jgrpp 2022-12-04 12:06:14 +00:00
Michael Lutz
ab9d77ebbe Add: [Script] Regression for ScriptAccounting. 2022-12-04 11:27:24 +01:00
Michael Lutz
1c205b2cda Fix #10212: [Script] Nested ScriptAccounting scopes are not restored properly. 2022-12-04 11:27:24 +01:00
cakepie
a6965cf854 Departure boards: reword strings to better reflect that both arrivals and departures may be displayed 2022-12-04 14:22:08 +08:00
cakepie
d5e1954e3b Departure boards: ignore departure_show_both setting for waypoints 2022-12-04 14:17:51 +08:00
PeterN
b79360862d Fix eb4ba1991: Signal icons incorrectly positioned in UI. (#10199)
(cherry picked from commit 387c57b023)
2022-12-04 00:23:46 +00:00
Jonathan G Rennison
5bbf1f5375 Merge branch 'master' into jgrpp
# Conflicts:
#	src/core/geometry_type.hpp
#	src/error_gui.cpp
#	src/rail_gui.cpp
#	src/tree_gui.cpp
#	src/vehicle_gui.cpp
#	src/widgets/dropdown.cpp
2022-12-03 23:40:37 +00:00
Jonathan G Rennison
7a6a7a3bfa Fix duplication of tree sprite table 2022-12-03 22:48:49 +00:00
dP
c91033ac5e Feature: [GS] Scriptable league tables (#10001)
(cherry picked from commit 5e14a20b3b)
2022-12-03 22:28:49 +00:00
Peter Nelson
1260e51d84 Add: Define scaled WidgetDimensions.
Includes RectPadding container.

(cherry picked from commit b5693becdc)
2022-12-03 22:28:49 +00:00
Peter Nelson
fb3b2c63bc Add: RectPadding type.
This is similar to Rect but specifies padding to apply to a Rect.

(cherry picked from commit 75b222b0d9)
2022-12-03 22:28:49 +00:00
Peter Nelson
cabb4b08d9 Codechange: Add some Rect helpers.
Shrink/Expand/Translate are marked nodiscard as they provide a new Rect
rather than modifying the original Rect.

(cherry picked from commit d8e01f8aa5)
2022-12-03 22:28:49 +00:00
Jonathan G Rennison
bbd84815b8 Script: Add missing function wrappers for 6 - 9 arguments 2022-12-03 22:28:49 +00:00
Jonathan G Rennison
dc96fbc573 Script: Store CommandCost::GetResultData 2022-12-03 22:28:49 +00:00
Jonathan G Rennison
44c4cc80a1 Fix whitespace in DumpSubCommandLog 2022-12-03 22:28:49 +00:00
Jonathan G Rennison
aaf0385dc5 Add command/string helpers for string separator control character 2022-12-03 22:28:49 +00:00
Jonathan G Rennison
690ef6cc22 Saveload: Add support for using upstream save/load for specific chunks 2022-12-03 22:28:49 +00:00
Jonathan G Rennison
a608a2592d Add a CommandCost result data field
Allow inlining one of extra_message, tile, result without aux allocation
2022-12-03 22:28:49 +00:00
Jonathan G Rennison
523cf75a7a Change CommandCost success bool to a flags field 2022-12-03 22:28:49 +00:00
Jonathan G Rennison
c777c43be2 Fix string codes in galician 2022-12-03 22:28:49 +00:00
Fedello
7e0a86c842 [Feat] Updated galician Translations up to 0.49.2 (#455)
* [Feat] Updated galician Translations up to 0.49.2

* [Fix] commited previous wrong file

Co-authored-by: pvillaverde <pvillaverde@qualigy.com>
2022-12-03 21:58:09 +00:00
PeterN
1131608eb4 Fix #10114: Incorrect drag-highlight position with non-power-of-2 scaling. (#10211) 2022-12-03 09:31:52 +00:00
cakepie
5fa9e5efb1 Departure boards: Fix unintuitive "A"/"D" widget lowered states when disabled by departure_show_both 2022-12-03 10:03:16 +08:00
cakepie
b76359d485 Departure boards: Fix no entries shown if "show both" setting turned on while window already open with "Show Deps" false 2022-12-03 09:51:03 +08:00
Jonathan G Rennison
822c29e6c2 Road stops: Auto-select an available type on selecting a class
Or on opening the road stop window
2022-12-02 19:40:07 +00:00
Jonathan G Rennison
f4fcb83efd Road stops: Disable road stop specs for wrong bus/lorry type 2022-12-02 19:26:45 +00:00
Jonathan G Rennison
5fdb82abda Departure boards: Fix repeated departure sets with implicit orders
See: #456
2022-12-02 19:09:01 +00:00
Jonathan G Rennison
1f544c69b5 Departure boards: Ensure conditional order give up mode exits correctly 2022-12-02 18:48:15 +00:00
translators
644012dea2 Update: Translations from eints
dutch: 7 changes by Afoklala
2022-12-02 18:45:14 +00:00
cakepie
6b6a0adeb4 Departure boards: Fix swapped ship/acft tooltips, use dedicated strings with more appropriate wording instead of repurposing from WID_SV_* widgets' tooltips in station_gui 2022-12-03 00:47:06 +08:00
cakepie
821be47a60 Departure boards: cleanup: move misplaced comment 2022-12-03 00:12:09 +08:00
cakepie
87aa379aa9 Departure boards: Refactor widget toggling 2022-12-03 00:08:16 +08:00
cakepie
c0d3088817 Departure boards: Fix "show via" widget needs redrawn when changed as a side effect of "show deps" toggled 2022-12-02 23:26:16 +08:00
translators
a7f78af4aa Update: Translations from eints
chinese (simplified): 3 changes by XiaoJi-Game
2022-12-01 18:47:04 +00:00
PeterN
485368f607 Fix: Missing extra padding when drawing tooltip text. (#10201)
* Fix: Missing extra padding when drawing tooltip text.

This padding is included when calculating the size of the tooltips, the
difference caused a mismatch in height for some tooltips.

* Codechange: Don't draw grey panel underneath tooltip.

This removes the default framerect padding so it is now added explicitly.
SetMinimalSize is also removed as this is overridden in UpdateWidgetSize
anyway.
2022-11-29 18:55:02 +00:00
translators
3100c6e7d0 Update: Translations from eints
chinese (simplified): 30 changes by XiaoJi-Game
2022-11-29 18:44:34 +00:00
Jonathan G Rennison
afd3004ea0 Debug: Avoid compiler warnings in debug window cargo class printing 2022-11-29 17:58:51 +00:00
Jonathan G Rennison
e97781608f Crashlog: Windows: Show some memory stats for out of memory crashes 2022-11-29 17:53:15 +00:00
PeterN
387c57b023 Fix eb4ba1991: Signal icons incorrectly positioned in UI. (#10199) 2022-11-28 20:03:27 +00:00
Jonathan G Rennison
2832fc16f5 Template replacement: Use more descriptive strings for add vehicle button 2022-11-28 19:54:41 +00:00
Jonathan G Rennison
210cec6c98 Merge pull request #453 from telk5093/jgrpp
Update: Korean translation up to 0.49.2
2022-11-28 19:54:04 +00:00
translators
41c893dd4e Update: Translations from eints
chinese (simplified): 13 changes by XiaoJi-Game
russian: 4 changes by Ln-Wolf
slovak: 7 changes by legitalk
catalan: 77 changes by J0anJosep
turkish: 7 changes by EndChapter
polish: 7 changes by pAter-exe
2022-11-28 18:45:52 +00:00
TELK
e882ba6063 Update: Korean translation up to 0.49.2 2022-11-28 20:18:18 +09:00
PeterN
eaf1e33bd7 Fix #10021: Object GUI resized when switching between different objects. (#10196)
* Fix: Scale object gui margin by interface scale.

* Fix: Improve padding on object info text.

* Fix #10021: Resizing for 1/2/4 object views didn't account for interface scale.

As halving and doubling padding is problematic due to rounding, it is now
added on lower view counts instead of removing on higher view counts.
2022-11-28 00:27:57 +00:00
Jonathan G Rennison
81e035dc63 Version: Committing version data for tag: jgrpp-0.49.2 2022-11-28 00:05:33 +00:00
Jonathan G Rennison
2eecf19edb Fix engine changes not updating build template train windows 2022-11-27 20:22:28 +00:00