Archives/OpenTTD-patches
2
0
Fork 0
mirror of https://github.com/JGRennison/OpenTTD-patches.git synced 2024-10-31 15:20:10 +00:00
Code Issues Packages Projects Releases Wiki Activity
56,639 Commits 12 Branches 178 Tags 449 MiB
4689113553
Commit Graph

56639 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jonathan G Rennison
4689113553 Debug: De-duplicate formatting of hex dates for desync/random logging 2023-12-19 17:55:57 +00:00
Jonathan G Rennison
61d65c9861 Use std::array for industry/industry spec input/output arrays 2023-12-19 02:39:54 +00:00
Jonathan G Rennison
03e0ec8276 Strong typedef: Use strong typedefs for date, date tick, minutes types 
Add delta types
Adjust/add type conversion functions
Add various utility methods on types
Remove the various minute macros
Fix some minute conversion inconsistencies
 2023-12-19 02:39:54 +00:00
Jonathan G Rennison
1e7b56e13a Strong typedef: Add missing ClampTo, IsInsideMM specialisations 2023-12-19 02:23:23 +00:00
Jonathan G Rennison
1d23ae5fdd Strong typedef: Add edit_base() method to return a base reference 2023-12-19 02:23:23 +00:00
Jonathan G Rennison
8d0506412c Strong typedef: Add mixin for integer with "delta" behaviour 
Subtracting returns a separate delta type
e.g. for absolute times to durations
 2023-12-19 02:23:23 +00:00
Jonathan G Rennison
25d9d24f94 Strong typedef: Add mixin for scalable integer 2023-12-18 23:08:24 +00:00
Jonathan G Rennison
a6baa29f0c Core: Add missing strong_typedef_type.hpp 2023-12-18 19:15:15 +00:00
Jonathan G Rennison
2857ea88e9 stdafx: Add missing EMPTY_BASES define 2023-12-18 19:14:52 +00:00
Jonathan G Rennison
80eae8c468 Fix missing header reference in src/core/CMakeLists.txt 2023-12-18 17:35:56 +00:00
Jonathan G Rennison
8ac13f58cb Saveload: Default savegame time units to days when loading vanilla saves 2023-12-17 23:08:34 +00:00
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
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
Jonathan G Rennison
e9612338ff Fix condition for extending train reverse distance due to overspeed 2023-12-14 19:27:52 +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
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
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
Jonathan G Rennison
c466292d8a Version: Committing version data for tag: jgrpp-0.56.1 2023-12-08 23:00:42 +00:00
Loïc Guilloux
714d2c04e4 Fix: [CI] Don't let SDL2 dependencies install too much stuff (#11537) 
(cherry picked from commit 06b1bd3da4)
 2023-12-08 22:29:15 +00:00
Jonathan G Rennison
48cc6a686b Change settings for using default signal graphics and signal recolouring 2023-12-08 21:53:52 +00:00
Jonathan G Rennison
bae2936491 Routing restrictions: Slots are no longer considered "advanced" 2023-12-08 20:55:57 +00:00
Jonathan G Rennison
8f752249e3 Fix PBS reservation overlays of wrong track type on dual rail type tiles 2023-12-08 20:37:40 +00:00
Jonathan G Rennison
f532970014 VarAction2: Add extra DSG flag for early exit when executing CBs 
For when some branches of a non CB switch DSG contain CB switches,
but some don't and so would end up on the graphics chain, as there is
no further CB switch to exit at
 2023-12-07 17:53:13 +00:00
Jonathan G Rennison
92d14ac980 GRF analysis: Exit early in ACOM_CB36_PROP mode for var 10 adjusts 2023-12-07 02:13:11 +00:00
Jonathan G Rennison
ef77a9be28 GRF analysis: Check for indtile anim next frame callback per layout subset 2023-12-07 01:51:47 +00:00
Jonathan G Rennison
91d872c88e GRF analysis: Handle industry tile 0x43 individual x/y checks 
In ACOM_INDUSTRY_TILE mode
 2023-12-07 01:00:54 +00:00
Jonathan G Rennison
0aa27cfda3 Fix ctrl-click signal cycling not checking custom signal style restrictions 2023-12-06 21:04:42 +00:00
Jonathan G Rennison
b6768e4f5a Fix handling of string parameters in query window caption 2023-12-06 20:37:56 +00:00
Jonathan G Rennison
e03b998c41 Fix depot ctrl-right-click tooltip with multiple cargoes 
See: #616
 2023-12-06 20:18:26 +00:00
Jonathan G Rennison
6ccd097d94 Don't maintain unused new signal style mappings when there are no signals 
(Except for network clients)

Avoid unnecessary style remapping and signal recalculation operations
 2023-12-05 18:21:42 +00:00
Jonathan G Rennison
4f8a7382ca Ensure new signal style mapping array is zero-inited 2023-12-05 17:55:03 +00:00
Jonathan G Rennison
3a38eb6861 Fix initial info totals when opening group/vehicle window 2023-12-03 22:56:29 +00:00