Jonathan G Rennison
|
2ed248a61d
|
Merge branch 'master' into jgrpp
# Conflicts:
# .github/workflows/ci-build.yml
# .github/workflows/release-linux.yml
# src/aircraft_cmd.cpp
# src/airport_gui.cpp
# src/articulated_vehicles.cpp
# src/build_vehicle_gui.cpp
# src/company_gui.cpp
# src/genworld_gui.cpp
# src/gfx_layout.cpp
# src/misc_gui.cpp
# src/newgrf.cpp
# src/newgrf_config.h
# src/newgrf_engine.cpp
# src/news_gui.cpp
# src/order_gui.cpp
# src/roadveh_cmd.cpp
# src/saveload/saveload.h
# src/saveload/vehicle_sl.cpp
# src/ship_cmd.cpp
# src/statusbar_gui.cpp
# src/table/settings/network_private_settings.ini
# src/table/settings/network_settings.ini
# src/toolbar_gui.cpp
# src/train_cmd.cpp
# src/vehicle_gui.cpp
|
2023-05-31 23:21:38 +01:00 |
|
Jonathan G Rennison
|
43d58ce6c8
|
GRF: Extend EntityIDMapping/OverrideManagerBase to 16 bit entity IDs
|
2023-02-11 00:30:40 +00:00 |
|
Jonathan G Rennison
|
32fe84cfdd
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/clear_cmd.cpp
# src/main_gui.cpp
# src/saveload/newgrf_sl.cpp
# src/water_cmd.cpp
|
2023-01-26 22:32:08 +00:00 |
|
Jonathan G Rennison
|
d1f1a6942a
|
Add support for loading trunk savegames versions 293 - 299 (12.0)
Use modified upstream saveload implementation for these versions
Re-arrange headers to support multiple saveload implementations
|
2021-11-01 18:33:39 +00:00 |
|