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
57,622 Commits 12 Branches 178 Tags 449 MiB
bd2358f6cc
Commit Graph

57622 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jonathan G Rennison
bd2358f6cc Saveload: Tidy up logging of chunk IDs 
Add helper to dump chunk IDs as strings
Avoid duplicate logging of load steps for upstream load paths
 2024-02-21 19:23:05 +00:00
Jonathan G Rennison
ba1fa3ad29 Saveload: Fix SlNullPointers with upstream chunks 2024-02-21 19:22:16 +00:00
Jonathan G Rennison
b58ecb0cd8 Saveload: Remove unnecessary auto-length use for tracerestrict 2024-02-21 19:18:55 +00:00
Jonathan G Rennison
8e8d698b24 Fix comment spelling errors 2024-02-21 19:10:31 +00:00
Jonathan G Rennison
158fbe19f8 Fix missing includes 2024-02-21 01:44:10 +00:00
Jonathan G Rennison
1f08ea54e5 Script: Fix narrowing conversion warning 2024-02-21 01:44:10 +00:00
Jonathan G Rennison
aad6fadd7f Fix noreturn tag in window crash log 2024-02-21 01:05:23 +00:00
Jonathan G Rennison
c2d581a928 Revert "Iconv: Ensure that OTTD2FS/FS2OTTD are thread-safe" 
This reverts commit 94d326b1e0.
 2024-02-21 00:53:18 +00:00
Jonathan G Rennison
4469925605 Add missing typename specifier 2024-02-21 00:48:41 +00:00
Jonathan G Rennison
a7c7e3d618 Add missing includes for std::runtime_error 2024-02-21 00:36:03 +00:00
Loïc Guilloux
d310a04276 Fix #12133: [Script] Don't crash when emergency saving (#12138) 
(cherry picked from commit 25d1238907)
 2024-02-21 00:17:16 +00:00
Loïc Guilloux
5098c77c38 Fix: [Script] Only show debug script window at the end of savegame loading (#12135) 
(cherry picked from commit 2d7ad9f717)
 2024-02-21 00:17:16 +00:00
Jonathan G Rennison
ff0d212705 Fix incorrect assert of LinkGraph LastCompression date 2024-02-21 00:17:16 +00:00
Jonathan G Rennison
69ae516353 Fix loading of depot unbunch bit from vanilla saves 2024-02-20 23:15:48 +00:00
Jonathan G Rennison
37e6f36b1f Fix off by one in wallclock mode ConvertDateToYMD 2024-02-20 20:09:03 +00:00
Jonathan G Rennison
79388e4207 Include dates and tick counters in state checksum 2024-02-20 18:26:18 +00:00
Jonathan G Rennison
24cd52616c Add getter for calendar sub date fract 2024-02-20 18:18:54 +00:00
Jonathan G Rennison
f32eef4f38 Allow changing time-keeping mode in-game 2024-02-20 18:11:03 +00:00
Jonathan G Rennison
471934e685 Add a helper to get the number of days in a given calendar month 2024-02-20 18:07:04 +00:00
Jonathan G Rennison
6e10f01f59 Fix timetable durations when loading old saves 
With version 1 of XSLFI_TT_WAIT_IN_DEPOT or without XSLFI_TIMETABLE_EXTRA
 2024-02-20 00:33:57 +00:00
Jonathan G Rennison
0993622f09 Fix production cargo icon in industry window 2024-02-20 00:17:11 +00:00
Jonathan G Rennison
40f5f17e32 Tidy up focus management for vehicle dropdowns 2024-02-20 00:01:44 +00:00
Jonathan G Rennison
fc2f746b80 Increase river pathfinding node limit 2024-02-19 23:11:00 +00:00
Jonathan G Rennison
d512602369 Charge scripts for use of ScriptList::FillList 
See: https://github.com/OpenTTD/OpenTTD/issues/12128
 2024-02-19 23:11:00 +00:00
Jonathan G Rennison
351c607dad Call ProcessScheduledResize from FinishInitNested 
This is to make sure that OnResize is called at least once before
the window is first drawn, to set up scrollbar capacities, etc

See: d3c673e2
 2024-02-19 23:11:00 +00:00
Damian Laczak
2aa574a48f Fix #10983: [AdminPort] Correct order of messages 
(cherry picked from commit 49c3215751)
 2024-02-19 23:11:00 +00:00
Peter Nelson
5c35a87ed7 Fix a258833: Don't invalidate station list on vehicle load/unload. (#12112) 
a258833 fixed a bug but as a result causes the station list to be rebuilt every time (once per game tick) a vehicle loads/unloads.

Instead just mark the window for redraw.

(cherry picked from commit f20d241e81)
 2024-02-19 23:11:00 +00:00
Koen Bussemaker
69af0e8f26 Codechange: Skip non-water water region patches in neigbor search 
(cherry picked from commit 8a1cea2ab6)
 2024-02-19 23:11:00 +00:00
Jonathan G Rennison
a98a56669b Merge branch 'master' into jgrpp 
# Conflicts:
#	regression/regression/result.txt
#	src/autoreplace_cmd.cpp
#	src/industry_gui.cpp
#	src/landscape.cpp
#	src/network/network_content.cpp
#	src/newgrf_roadstop.cpp
#	src/pathfinder/yapf/yapf_ship.cpp
#	src/road_gui.cpp
#	src/saveload/ai_sl.cpp
#	src/saveload/saveload.h
#	src/saveload/vehicle_sl.cpp
#	src/station.cpp
#	src/station_gui.cpp
#	src/video/cocoa/cocoa_ogl.h
#	src/video/sdl2_opengl_v.h
#	src/video/video_driver.hpp
#	src/video/win32_v.h
#	src/widget_type.h
#	src/widgets/dropdown.cpp
#	src/widgets/dropdown_type.h
#	src/window.cpp
 2024-02-19 23:11:00 +00:00
Jonathan G Rennison
4097fc4e33 Saveload: Enable upstream mode SlAutolength 
Use non-upstream implementation for SlCopyBytes
 2024-02-19 18:58:32 +00:00
Jonathan G Rennison
8a85055c68 Saveload: Use std::span for autosave temporary buffer view 2024-02-19 18:58:32 +00:00
Jonathan G Rennison
75dd135e8d Merge tag '14.0-beta3' into jgrpp 
# Conflicts:
#	regression/regression/result.txt
#	src/industrytype.h
#	src/network/core/config.h
#	src/network/core/network_game_info.cpp
#	src/network/core/network_game_info.h
#	src/network/core/packet.cpp
#	src/network/core/packet.h
#	src/network/core/tcp.cpp
#	src/network/core/tcp.h
#	src/network/core/tcp_admin.cpp
#	src/network/core/tcp_content.cpp
#	src/network/core/tcp_coordinator.cpp
#	src/network/core/tcp_game.cpp
#	src/network/core/tcp_game.h
#	src/network/core/tcp_turn.cpp
#	src/network/core/udp.cpp
#	src/network/core/udp.h
#	src/network/network_admin.cpp
#	src/network/network_client.cpp
#	src/network/network_client.h
#	src/network/network_command.cpp
#	src/network/network_content.cpp
#	src/network/network_internal.h
#	src/network/network_query.cpp
#	src/network/network_query.h
#	src/network/network_server.cpp
#	src/network/network_server.h
#	src/network/network_turn.cpp
#	src/network/network_udp.cpp
#	src/rail_gui.cpp
#	src/road_gui.cpp
 2024-02-19 17:57:05 +00:00
FedelloKirfed
2e3e93fe32 Update Galician Translations 
(cherry picked from commit 10596e84cf)

#653
 2024-02-19 04:44:03 +00:00
Jonathan G Rennison
1040f9612f Saveload: Tag duplicate detection in SlTableHeader as maybe unused 2024-02-19 04:26:42 +00:00
Jonathan G Rennison
a874bb70b1 Remove unused saveload desc in cheats_sl.cpp 2024-02-19 04:25:44 +00:00
Jonathan G Rennison
6ab1f9a416 Use CargoID instead of CargoSpec in town_production_cargoes 2024-02-19 04:19:09 +00:00
Jonathan G Rennison
19e4895ffd Add cargo mask of town production cargoes 
Use for all non-GUI cases (where display sort order is not required)
 2024-02-19 04:11:25 +00:00
Jonathan G Rennison
8581808952 Merge tag '14.0-beta2' into jgrpp 
# Conflicts:
#	CMakeLists.txt
#	src/cargotype.cpp
#	src/console_cmds.cpp
#	src/graph_gui.cpp
#	src/industry_cmd.cpp
#	src/industrytype.h
#	src/misc_gui.cpp
#	src/network/network_client.cpp
#	src/newgrf.cpp
#	src/newgrf_town.cpp
#	src/object_cmd.cpp
#	src/openttd.cpp
#	src/pathfinder/water_regions.cpp
#	src/saveload/saveload.cpp
#	src/saveload/saveload.h
#	src/table/build_industry.h
#	src/table/engines.h
#	src/vehicle.cpp
#	src/vehicle_cmd.cpp
#	src/vehicle_gui.cpp
 2024-02-19 03:23:19 +00:00
Jonathan G Rennison
c6893388ab Fix order flags collision in OT_GOTO_DEPOT 
Move depot wait is timetabled flag to xflags
 2024-02-19 00:41:05 +00:00
Jonathan G Rennison
821c5970db Disallow unbunching if auto-separation, scheduled dispatch or per-cargo full load 2024-02-19 00:13:55 +00:00
Jonathan G Rennison
f9e8a49df0 Auto-separation: Do not allow enabling if unbunching is present 
Check for scheduled dispatch/unbunching in enable command
Show in button tooltip
 2024-02-18 23:30:19 +00:00
Jonathan G Rennison
df2d4bd83c Scheduled dispatch: Do not allow enabling if unbunching is present 
Check for auto-separation/unbunching in enable command
Show in enable button tooltip and summary text
 2024-02-18 23:29:38 +00:00
Jonathan G Rennison
0fd3f93310 Debug: Add unbunching state to debug info 2024-02-18 22:22:29 +00:00
Jonathan G Rennison
8f9783e7d3 Debug: Adjust vehicle debug text order/indentation 2024-02-18 22:22:29 +00:00
Jonathan G Rennison
fdd666f66a Merge tag '14.0-beta1' into jgrpp 
# Conflicts:
#	src/3rdparty/squirrel/squirrel/sqcompiler.cpp
#	src/aircraft.h
#	src/animated_tile.h
#	src/base_consist.h
#	src/cargotype.h
#	src/company_gui.cpp
#	src/console_cmds.cpp
#	src/core/overflowsafe_type.hpp
#	src/engine_gui.cpp
#	src/industry_gui.cpp
#	src/lang/english.txt
#	src/music/extmidi.cpp
#	src/network/core/network_game_info.cpp
#	src/network/network_server.cpp
#	src/newgrf.cpp
#	src/newgrf_industries.cpp
#	src/order_base.h
#	src/order_cmd.cpp
#	src/order_gui.cpp
#	src/order_type.h
#	src/os/macosx/misc_osx.cpp
#	src/os/windows/crashlog_win.cpp
#	src/rail_gui.cpp
#	src/rail_gui.h
#	src/roadveh.h
#	src/roadveh_cmd.cpp
#	src/saveload/afterload.cpp
#	src/saveload/company_sl.cpp
#	src/saveload/saveload.cpp
#	src/saveload/saveload.h
#	src/saveload/saveload_error.hpp
#	src/script/api/script_town.cpp
#	src/settingsgen/settingsgen.cpp
#	src/ship.h
#	src/ship_cmd.cpp
#	src/smallmap_gui.cpp
#	src/spritecache.cpp
#	src/stdafx.h
#	src/strgen/strgen.cpp
#	src/strgen/strgen.h
#	src/table/settings/script_settings.ini
#	src/timetable_cmd.cpp
#	src/timetable_gui.cpp
#	src/town.h
#	src/town_cmd.cpp
#	src/town_cmd.h
#	src/town_gui.cpp
#	src/train.h
#	src/train_cmd.cpp
#	src/tree_cmd.cpp
#	src/vehicle.cpp
#	src/vehicle_base.h
#	src/vehicle_cmd.cpp
#	src/vehicle_gui.cpp
#	src/vehiclelist.cpp
#	src/waypoint_base.h
#	src/widget.cpp
 2024-02-18 22:22:29 +00:00
Jonathan G Rennison
f0fdc882ea Fix town action description texts in wallclock mode 2024-02-17 18:40:53 +00:00
Jonathan G Rennison
d4d6ad2dfc Debug: Include various speed/acceleration values in vehicle debug window 2024-02-17 12:25:32 +00:00
Jonathan G Rennison
94d326b1e0 Iconv: Ensure that OTTD2FS/FS2OTTD are thread-safe 2024-02-17 12:04:16 +00:00
Jonathan G Rennison
838b166726 Merge branch 'master' into jgrpp 
# Conflicts:
#	src/cheat_gui.cpp
#	src/command.cpp
#	src/command_func.h
#	src/company_base.h
#	src/debug.cpp
#	src/debug.h
#	src/economy.cpp
#	src/engine_type.h
#	src/graph_gui.cpp
#	src/misc_cmd.cpp
#	src/misc_cmd.h
#	src/network/core/os_abstraction.cpp
#	src/openttd.cpp
#	src/saveload/saveload.cpp
#	src/saveload/saveload.h
#	src/settings_type.h
#	src/ship_cmd.cpp
#	src/stdafx.h
#	src/tests/bitmath_func.cpp
#	src/town_cmd.cpp
#	src/town_gui.cpp
 2024-02-17 11:53:35 +00:00
Jonathan G Rennison
074447138c Add method for whether calendar is frozen 2024-02-17 10:18:09 +00:00