dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
56,953 Commits 1 Branch 0 Tags
39a0e29f90a6d0df6dd0961a0b1b1412c3621e4a
Commit Graph

56953 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jonathan G Rennison
2e06374f6f Merge branch 'master' into jgrpp 
# Conflicts:
#	src/build_vehicle_gui.cpp
#	src/company_gui.cpp
#	src/gfx_func.h
#	src/group_gui.cpp
#	src/industry_gui.cpp
#	src/misc_gui.cpp
#	src/news_gui.cpp
#	src/settings_gui.cpp
#	src/ship_gui.cpp
#	src/smallmap_gui.cpp
#	src/station_gui.cpp
#	src/subsidy_gui.cpp
#	src/timetable_gui.cpp
#	src/toolbar_gui.cpp
#	src/town_gui.cpp
#	src/vehicle_gui.cpp
#	src/viewport.cpp
#	src/widget.cpp
#	src/widgets/dropdown.cpp
#	src/window.cpp
 2023-12-17 01:16:48 +00:00
Jonathan G Rennison
2267badd28 Remove "Show cargo type filter in vehicle lists" setting 2023-12-17 00:37:17 +00:00
Jonathan G Rennison
5ae74ecf8e Merge branch 'master' into jgrpp 
# Conflicts:
#	src/articulated_vehicles.cpp
#	src/articulated_vehicles.h
#	src/autoreplace_cmd.cpp
#	src/build_vehicle_gui.cpp
#	src/company_gui.cpp
#	src/core/format.hpp
#	src/genworld_gui.cpp
#	src/gfx.cpp
#	src/group_gui.cpp
#	src/linkgraph/linkgraph_gui.cpp
#	src/misc/endian_buffer.hpp
#	src/music/music_driver.hpp
#	src/newgrf_gui.cpp
#	src/rail_cmd.cpp
#	src/road_gui.cpp
#	src/settings_type.h
#	src/strgen/strgen.cpp
#	src/strings.cpp
#	src/timetable_cmd.cpp
#	src/town.h
#	src/vehicle.cpp
#	src/vehicle_gui.cpp
#	src/vehicle_gui_base.h
#	src/widget.cpp
#	src/widgets/dropdown.cpp
#	src/widgets/road_widget.h
 2023-12-17 00:37:16 +00:00
Peter Nelson
661e0cd82d Fix: Make compact picker windows expand to fill if necessary. (#11591) 2023-12-16 23:08:42 +00:00
translators
651343d69e Update: Translations from eints 
english (au): 17 changes by krysclarke
english (us): 17 changes by 2TallTyler
italian: 30 changes by Rivarossi
russian: 17 changes by Ln-Wolf
french: 36 changes by ottdfevr
portuguese (brazilian): 30 changes by pasantoro
 2023-12-16 18:36:51 +00:00
translators
0e6038f0e5 Update: Translations from eints 
english (us): 19 changes by 2TallTyler
vietnamese: 14 changes by KhoiCanDev
turkish: 26 changes by BeratSJ
dutch: 19 changes by Afoklala
 2023-12-15 18:38:09 +00:00
Tyler Trahan
8816c9dd26 Change: Improve and standardize wording of World Generation helptexts 2023-12-15 09:57:44 -05:00
Tyler Trahan
1343d7e25a Change: Don't mention TerraGenesis in setting helptexts 
We no longer show the land generator in the World Generation GUI, so this is less important to explain in tooltips.
 2023-12-15 09:57:44 -05:00
Tyler Trahan
1e8aa9ce22 Add: Use more tooltips in World Generation GUI 2023-12-15 09:57:44 -05:00
Peter Nelson
302e8852c1 Fix: Crash if squirrel compatibility scripts cannot be parsed. (#11589) 2023-12-15 01:25:36 +00:00
Loïc Guilloux
7726f8f245 Fix: [Script] Properly store the previous AsyncMode state (#11587) 2023-12-14 21:29:44 +00:00
Peter Nelson
bbf3028f89 Fix #11585: Crash when cleaning AI/GS with nested AsyncMode. 
Do not throw sanity check when in_shutdown is true. This is also applied to
ExecMode and TestMode as they follow the same pattern.
 2023-12-14 20:54:31 +00:00
Peter Nelson
47dd04d16c Fix: Don't crash when saving a crashlog save with no main window open. 2023-12-14 20:54:31 +00:00
Peter Nelson
da2d21f5b0 Fix: Left-over printf-style format passed to fmt. (#11584) 2023-12-14 19:35:35 +00:00
Jonathan G Rennison
e9612338ff Fix condition for extending train reverse distance due to overspeed 2023-12-14 19:27:52 +00:00
translators
63c006a174 Update: Translations from eints 
korean: 20 changes by telk5093
danish: 13 changes by bscargo
portuguese (brazilian): 18 changes by pasantoro
 2023-12-14 18:38:27 +00:00
Jonathan G Rennison
97b86b7147 Codechange: Use MakeParameters with GetNextParameter in FormatString (#11583) 
Instead of StringParameters subspan, to avoid GSs being able to
cause subspan boundary assertion failures
 2023-12-14 10:41:31 -05:00
Peter Nelson
12bb750128 Codechange: Cargo filters no longer take an index. (#11582) 
Update naming of functions to reflect that parameter is now a cargoid.
 2023-12-14 01:48:45 +00:00
Jonathan G Rennison
164e218736 String: Use MakeParameters with GetNextParameter 
Instead of StringParameters subspan, to avoid GSs being able to
cause subspan boundary assertion failures
 2023-12-14 01:07:26 +00:00
Jonathan G Rennison
7cf6600b47 String: Fix incorrect use of strecat to append error messages 2023-12-14 01:04:40 +00:00
Jonathan G Rennison
7a5ac8dd04 MInGW: Work around include ordering issue with regex, shared_mutex, condition_variable 2023-12-13 23:11:20 +00:00
Jonathan G Rennison
ea3b991f72 MinGW: Remove direct mingw-std-threads includes 2023-12-13 23:11:20 +00:00
Jonathan G Rennison
ba7d2c92d2 MinGW: Update mingw-std-threads 
Remove requirement for MinGW-specific includes
 2023-12-13 23:11:20 +00:00
Peter Nelson
916676998f Fix #11500: Rename Textfile GUI's LinkType to HyperlinkType. (#11502) 
This disambiguates it with LinkType in league tables.

(cherry picked from commit e3622da408)
 2023-12-13 20:05:18 +00:00
Jonathan G Rennison
34668bff87 Test: Add upstream tests 2023-12-13 20:05:18 +00:00
Peter Nelson
d6515d6c98 Fix 0a8bcdd: Scaling non-sprite fonts does not depend on _font_zoom changing. (#11579) 2023-12-13 19:51:44 +00:00
Jonathan G Rennison
24c8a8f887 Spritecache: Move SpriteCache, SpriteDataBuffer to internal header 2023-12-13 19:24:37 +00:00
Jonathan G Rennison
527742d585 GUI: Fix WindowDesc inikey issues 2023-12-13 19:24:37 +00:00
translators
8e05001001 Update: Translations from eints 
english (au): 18 changes by krysclarke
russian: 18 changes by Ln-Wolf
 2023-12-13 18:38:37 +00:00
Jonathan G Rennison
15ed39b5ac CMake: Use openttd_lib split build from upstream 
Add option to disable for cross-compiling
 2023-12-13 18:01:54 +00:00
Peter Nelson
6c5aeae01b Fix #11577: Extra viewport opened in wrong location. (#11578) 
ExtraViewportWindow calls IninitializeViewport() with focus as 0, which is ambiguous as focus should be either a TileIndex or a VehicleID.

Instead, pass the tile and let InitializeViewport() handle setting all the coordinates.
 2023-12-13 02:19:16 +00:00
Peter Nelson
0a8bcdd344 Change: Be selective about clearing sprite/font caches on interface scale change. (#11576) 
Sprite cache contains all zoom levels anyway, so does not need to be reloaded.

Font cache does not need to be clear if the font zoom hasn't changed, i.e. when changing the max sprite zoom level setting.
 2023-12-11 21:03:54 +00:00
translators
b62fafc5d4 Update: Translations from eints 
english (au): 1 change by krysclarke
italian: 1 change by Rivarossi
german: 7 changes by SecretIdetity
russian: 1 change by Ln-Wolf
danish: 1 change by bscargo
french: 1 change by glx22
 2023-12-11 18:39:36 +00:00
Peter Nelson
dc27f1649a Fix e2425b7: Sprites no longer refreshed if max zoom level changed. 
Handle this via AdjustGUIZoom() instead.
 2023-12-11 14:16:49 +00:00
Peter Nelson
162ffc288d Fix e2425b7: WidgetDimensions and depot sizes not set up if blitter forced. 
Set up WidgetDimensions and depot sizes during InitWindowSystem().
 2023-12-11 14:16:49 +00:00
Tyler Trahan
2bada59193 Feature: Mode to display timetable in seconds 2023-12-11 07:12:45 -05:00
Tyler Trahan
2a62caa30b Codechange: Use Ticks for BaseConsist timetable fields 2023-12-11 07:12:45 -05:00
Tyler Trahan
051abb2fad Change: Don't show scoring year in high score table (#11546) 2023-12-10 18:05:51 -05:00
Peter Nelson
6e8c27b8e5 Change: Hide bevel for resizeable sparse layout windows. (#11572) 
When clicked, the button is still highlighted to show that it is active.

The bevel is controlled with widget_data by RWV_SHOW_BEVEL or RWV_HIDE_BEVEL values.
 2023-12-10 17:25:36 +00:00
SamuXarick
a3d56e2c6e Fix: Prevent overflow when calculating max town noise (#11564) 
Max town noise could overflow if the population was high enough. The value is now clamped.
 2023-12-10 15:42:55 +00:00
Peter Nelson
09251d993c Change: Use sparse padding for network server list. (#11571) 2023-12-10 14:48:58 +00:00
Peter Nelson
102fc6a9d1 Cleanup: iif should be iff (if-and-only-if) (#11570) 2023-12-10 12:05:28 +00:00
Peter Nelson
8186182e4c Codechange: Set displayed plane earlier to avoid ReInit. 2023-12-10 12:01:55 +00:00
Peter Nelson
fb60f8f2f5 Codechange: Simplify BuildRailStationWindow initialization. 2023-12-10 12:01:55 +00:00
Peter Nelson
66b064cbad Codechange: Use return value of SetDisplayedPlane to simplify CompanyWindow. 2023-12-10 12:01:55 +00:00
Peter Nelson
ebf299e1b4 Codechange: Make SetDisplayedPlane return whether the plane changed or not. 2023-12-10 12:01:55 +00:00
Peter Nelson
d6060a4d47 Change: Use sparse padding for start network server window. (#11569) 2023-12-09 23:35:46 +00:00
Peter Nelson
a759d35f26 Fix #11352: Draw all network server info as multiline strings. (#11567) 
This also allows the 'header' (which is not actually a widget) to grow
as necessary to fit the server name.
 2023-12-09 20:43:36 +00:00
Peter Nelson
c0ea0589b4 Fix: AirportGetNearestTown incorrectly assumed first TileIterator result was origin. (#11565) 
Not all TileIterators are equal, and some do not start at the top-corner, so the perimeter check was wrong. As the caller already has thie origin tile, use that instead.
 2023-12-09 09:47:41 +00:00
Peter Nelson
10f94fb0dd Codechange: Remove runtime variable size assertion. 2023-12-09 08:13:03 +00:00