dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
57,615 Commits 1 Branch 0 Tags
c2d581a92876432415d38010b83121ca81c99594
Commit Graph

57615 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jonathan G Rennison
4fac6b295c Merge branch 'master' into jgrpp 
# Conflicts:
#	.github/workflows/release-linux.yml
#	src/base_consist.h
#	src/blitter/32bpp_optimized.cpp
#	src/blitter/32bpp_optimized.hpp
#	src/blitter/32bpp_sse2.hpp
#	src/blitter/8bpp_optimized.hpp
#	src/gfx_func.h
#	src/industry_cmd.cpp
#	src/industrytype.h
#	src/linkgraph/linkgraphjob.cpp
#	src/mixer.cpp
#	src/newgrf_callbacks.h
#	src/openttd.cpp
#	src/os/macosx/macos.mm
#	src/os/windows/win32.cpp
#	src/pathfinder/npf/npf.cpp
#	src/road_cmd.cpp
#	src/saveload/afterload.cpp
#	src/saveload/saveload.h
#	src/saveload/vehicle_sl.cpp
#	src/sound.cpp
#	src/spritecache.cpp
#	src/spriteloader/spriteloader.hpp
#	src/station_map.h
#	src/timetable_cmd.cpp
#	src/timetable_cmd.h
#	src/timetable_gui.cpp
#	src/town_cmd.cpp
#	src/vehicle_cmd.cpp
#	src/vehicle_gui_base.h
#	src/video/opengl.cpp
#	src/video/opengl.h
#	src/viewport.cpp
 2023-12-17 23:00:46 +00:00
Jonathan G Rennison
e9599fd4be Scheduled dispatch: Remove scheduled_dispatch_start_full_date_fract 
Use DateTicksScaled
 2023-12-17 23:00:45 +00:00
Jonathan G Rennison
c76a5ed638 Timetable: Remove timetable_start_subticks, use DateTicksScaled 2023-12-17 23:00:44 +00:00
Jonathan G Rennison
fa29a3d606 Saveload: Increase compile-time checks for saveload arrays/primitive types 2023-12-17 23:00:44 +00:00
SamuXarick
c05ffb22bd Fix #10452: Don't let AyStar max_search_nodes unattended when initializing (#11544) 
Add a constant with the default value of 10000 and have the pathfinding settings refer to it.

Add a preventative method to AyStar when it's initializing, to limit the number of max_search_nodes if left unattended.
 2023-12-17 22:50:53 +01:00
translators
8ab3838387 Update: Translations from eints 
vietnamese: 20 changes by KhoiCanDev
italian: 5 changes by Rivarossi
 2023-12-17 18:37:38 +00:00
Jonathan G Rennison
f399fc040f VarAction2: Don't set skip CB flag if NGOF_NO_OPT_VARACT2_CB_QUICK_EXIT set 2023-12-17 16:38:31 +00:00
Jonathan G Rennison
5062b35b7d VarAction2: Handle deterministic/CB groups under real sprite groups in optimiser 
See: #618
 2023-12-17 14:47:02 +00:00
Jonathan G Rennison
d793da4034 VarAction2: Fix callback analysis through real sprite groups 
See: #618
 2023-12-17 13:57:24 +00:00
Jonathan G Rennison
5f08bde936 Saveload: Remove runtime IsVariableSizeRight check 2023-12-17 13:38:22 +00:00
Jonathan G Rennison
3996161737 Saveload: Use static_assert to check size and general types of variables 2023-12-17 13:35:10 +00:00
Jonathan G Rennison
a993b3e961 Settings: Adjust types some to fix saveload size mismatches 2023-12-17 13:33:21 +00:00
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