Commit Graph

58736 Commits

Author SHA1 Message Date
Jonathan G Rennison
16dfb84978 Merge branch 'master' into jgrpp
# Conflicts:
#	src/company_cmd.h
#	src/console_gui.cpp
#	src/music.cpp
#	src/pathfinder/npf/npf.cpp
#	src/roadveh_cmd.cpp
#	src/saveload/afterload.cpp
#	src/saveload/saveload.h
#	src/script/api/script_types.hpp
#	src/settings_gui.cpp
#	src/settings_table.cpp
#	src/settings_type.h
#	src/ship_cmd.cpp
#	src/strings.cpp
#	src/table/settings/pathfinding_settings.ini
#	src/train_cmd.cpp
#	src/vehicle_type.h
#	src/waypoint_gui.cpp
2024-08-17 17:49:19 +01:00
Jonathan G Rennison
e2510b4627 Merge branch 'master' into jgrpp
Company password removal/pubkey access: mostly skipped

# Conflicts:
#	src/company_cmd.h
#	src/network/core/tcp_game.h
#	src/network/network_server.cpp
#	src/saveload/saveload.h
2024-08-17 15:31:57 +01:00
Jonathan G Rennison
7dd8729a33 Merge branch 'master' into jgrpp
# Conflicts:
#	src/cachecheck.cpp
#	src/network/network.cpp
#	src/openttd.cpp
#	src/pathfinder/follow_track.hpp
#	src/saveload/saveload.cpp
#	src/textfile_gui.cpp
2024-08-17 15:31:57 +01:00
Jonathan G Rennison
1406b36fde Set default hotkey for picker tool to / (SLASH) 2024-08-14 00:59:03 +01:00
Jonathan G Rennison
5b36c1db11 Merge branch 'master' into jgrpp
# Conflicts:
#	src/bridge_gui.cpp
#	src/build_vehicle_gui.cpp
#	src/core/geometry_func.hpp
#	src/disaster_vehicle.cpp
#	src/dropdown.cpp
#	src/dropdown_func.h
#	src/engine_gui.h
#	src/genworld_gui.cpp
#	src/industry_cmd.cpp
#	src/industrytype.h
#	src/network/network_content.cpp
#	src/newgrf.cpp
#	src/newgrf_airport.h
#	src/newgrf_engine.cpp
#	src/order_gui.cpp
#	src/pathfinder/water_regions.cpp
#	src/saveload/town_sl.cpp
#	src/slider_func.h
#	src/station_cmd.cpp
#	src/station_gui.cpp
#	src/table/airport_defaults.h
#	src/tilematrix_type.hpp
#	src/vehicle_gui.cpp
#	src/vehicle_gui_base.h
#	src/video/sdl_v.cpp
2024-08-13 20:34:12 +01:00
Jonathan G Rennison
fbfb752b1c Simplify texts and GUI behaviour for cargo scaling mode settings 2024-08-13 01:43:35 +01:00
Jonathan G Rennison
4c3072e719 Departures: Fix manual memory management, avoid leaks 2024-08-13 01:39:26 +01:00
Jonathan G Rennison
3717b5b934 Sign window: Ctrl-click sign to open extra viewport at sign coordinates 2024-08-13 00:54:11 +01:00
Jonathan G Rennison
7b26ec91c6 Sign window: Remove dead code for WID_SIL_FILTER_ENTER_BTN 2024-08-13 00:48:50 +01:00
Jonathan G Rennison
13e13e875c Order window: Clicking selected label order opens edit window 2024-08-13 00:31:07 +01:00
Jonathan G Rennison
157f713388 Departures: Support scheduled dispatch vehicle slot conditionals
Also iterate orders more times when these are present
2024-08-13 00:17:14 +01:00
Jonathan G Rennison
371d7c10d7 Departures: Fix wrong tick in scheduled dispatch evaluation 2024-08-12 23:57:43 +01:00
Jonathan G Rennison
3003f8796e Add conditional order sub-mode for vehicle dispatch slot 2024-08-12 23:57:43 +01:00
Jonathan G Rennison
a2b6363584 Scheduled dispatch: Store vehicle last dispatch records 2024-08-12 23:57:43 +01:00
TELK
0d863bdf0d Update: Korean translation 2024-08-11 11:29:18 +01:00
Jonathan G Rennison
5d62cb361d Debug: Enable debug window for rail waypoints 2024-08-11 10:55:09 +01:00
Jonathan G Rennison
37b129c3c0 Merge branch 'master' into jgrpp
# Conflicts:
#	src/effectvehicle.cpp
#	src/fileio.cpp
#	src/gfx.cpp
#	src/newgrf_commons.h
#	src/road_gui.cpp
#	src/saveload/gamelog_sl.cpp
#	src/saveload/saveload.cpp
#	src/settings_gui.cpp
#	src/settings_internal.h
#	src/settings_table.cpp
#	src/signs_gui.cpp
#	src/smallmap_gui.cpp
#	src/sortlist_type.h
#	src/table/settings.h.preamble
#	src/table/settings/company_settings.ini
#	src/table/settings/currency_settings.ini
#	src/table/settings/difficulty_settings.ini
#	src/table/settings/economy_settings.ini
#	src/table/settings/game_settings.ini
#	src/table/settings/gui_settings.ini
#	src/table/settings/linkgraph_settings.ini
#	src/table/settings/locale_settings.ini
#	src/table/settings/misc_settings.ini
#	src/table/settings/multimedia_settings.ini
#	src/table/settings/network_private_settings.ini
#	src/table/settings/network_settings.ini
#	src/table/settings/news_display_settings.ini
#	src/table/settings/old_gameopt_settings.ini
#	src/table/settings/pathfinding_settings.ini
#	src/table/settings/script_settings.ini
#	src/table/settings/win32_settings.ini
#	src/table/settings/window_settings.ini
#	src/table/settings/world_settings.ini
#	src/vehicle_gui.cpp
#	src/vehiclelist.cpp
#	src/video/opengl.cpp
#	src/viewport.cpp
2024-08-09 23:16:07 +01:00
Jonathan G Rennison
77c0197216 CMake: Remove -fno-strict-aliasing compiler flag 2024-08-09 23:16:07 +01:00
Jonathan G Rennison
70793de97b Fix type casts for position updates in BufferDeserialisationHelper 2024-08-09 23:15:57 +01:00
Jonathan G Rennison
2a204ea033 cpp-btree: Use union to avoid strict aliasing violation in leaf_fields 2024-08-09 23:15:57 +01:00
Jonathan G Rennison
1c6df3451b Saveload: Improve efficiency of SlReadSimpleGamma 2024-08-09 23:15:57 +01:00
Jonathan G Rennison
22a6dc642d Saveload: Refactor interface for memory dumper raw write functions 2024-08-08 21:36:30 +01:00
Jonathan G Rennison
d0cbc48f7d Saveload: Move AcquireBytes loop out of CheckBytes 2024-08-08 21:00:16 +01:00
Jonathan G Rennison
0ab976e069 Saveload: Refactor interface for read buffer raw read functions 2024-08-08 21:00:16 +01:00
Jonathan G Rennison
cef83e30b5 Saveload: Fix return type of SlReadUint16 2024-08-08 20:28:08 +01:00
Jonathan G Rennison
89d2cf3a16 Fix 77f27e08: Crash due to incorrect use of AirportSpec::GetIndex 2024-08-08 19:06:11 +01:00
Jonathan G Rennison
e4bd353d12 Saveload: Avoid redundant loads of map pointer in map chunk saves 2024-08-08 01:18:39 +01:00
Jonathan G Rennison
b16db11e02 Saveload: Improve codegen in WriteBytesFromHandler
-fno-strict-aliasing is enabled, so don't rely on the compiler
being able to elide obvious accesses
2024-08-08 01:17:48 +01:00
Jonathan G Rennison
f66521e62e Saveload: Avoid redundant loads of map pointer in map chunk loads 2024-08-08 00:57:20 +01:00
Jonathan G Rennison
a57be2bebd Saveload: Improve codegen in ReadBytesToHandler
-fno-strict-aliasing is enabled, so don't rely on the compiler
being able to elide obvious accesses
2024-08-08 00:45:41 +01:00
Jonathan G Rennison
406965677c Fix speed of excessively fast ships on aqueducts 2024-08-07 19:05:42 +01:00
Jonathan G Rennison
56fc3ec6ce Fix f7248539: Cargo reserved count not set in station goods entry save 2024-08-05 19:15:59 +01:00
Jonathan G Rennison
8450747010 Saveload: Fix minor formatting issues 2024-08-05 19:15:20 +01:00
Jonathan G Rennison
e554cb9d62 NewGRF: Add extended house variables to get uncapped building counts, other IDs 2024-08-05 18:41:47 +01:00
Jonathan G Rennison
49972e56a1 Fix incorrect lang string code 2024-08-04 15:31:05 +01:00
Qwest8K
4c31e0cdfd
Update: Russian translation - Day length factor (#716) 2024-08-04 15:29:43 +01:00
TELK
94a7e6ba26 Fix: Korean translation 2024-08-04 15:28:30 +01:00
Jonathan G Rennison
318b86083b NewGRF: Add extended house variables to get uncapped building counts 2024-08-04 15:04:29 +01:00
Jonathan G Rennison
3f5e10ab38 Debug: Show house min/max years 2024-08-04 14:21:44 +01:00
Jonathan G Rennison
eb9d71ab2a Debug: Fix formatting of object intro/expiry dates 2024-08-04 14:21:29 +01:00
Jonathan G Rennison
1dd8890a8f Saveload: Use table format for pending speed restrictions chunk 2024-08-03 14:09:27 +01:00
Jonathan G Rennison
da53196399 Saveload: Move vehicle current order extra data to sub-chunk 2024-08-03 13:41:39 +01:00
Jonathan G Rennison
8471f9b625 Saveload: Move train lookahead to sub-chunk 2024-08-03 13:25:38 +01:00
Jonathan G Rennison
43e1036786 Saveload: Move vehicle unbunching state to sub-chunk 2024-08-03 12:55:33 +01:00
Jonathan G Rennison
711f594464 Saveload: Use table format for vehicles chunk 2024-08-03 12:30:37 +01:00
Jonathan G Rennison
66c0d4c20d Saveload: Fix handling of chunk table/non-table mode in SlPrepareNamedSaveLoadTableForPtrOrNull 2024-08-03 11:56:13 +01:00
Jonathan G Rennison
6af9b4b2ae Saveload: Add NSL_STRUCT wrapper
For use with pointer fix/null
2024-08-03 11:53:53 +01:00
Jonathan G Rennison
aef51c08cf Saveload: De-duplicate save load struct handler factory lambda 2024-08-03 11:43:05 +01:00
Jonathan G Rennison
3e1b0f76f4 Fix handing of sprites in action A which are rejected due to GRM misuse 2024-08-03 08:55:15 +01:00
Jonathan G Rennison
177b75af77 Fix train unit ID allocation when moving engine to new train, reaching train limit
See: #725
2024-08-02 20:46:51 +01:00