Jonathan G Rennison
|
37b8b59c85
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/date_type.h
# src/linkgraph/linkgraphjob.cpp
# src/linkgraph/linkgraphschedule.cpp
# src/saveload/saveload.h
# src/table/settings/linkgraph_settings.ini
|
2023-05-22 19:50:45 +01:00 |
|
Jonathan G Rennison
|
c89079a210
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/saveload/cargopacket_sl.cpp
# src/saveload/saveload.h
# src/strings.cpp
# src/vehicle.cpp
|
2023-04-12 20:02:57 +01:00 |
|
Jonathan G Rennison
|
9521e7ef2b
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/elrail.cpp
# src/ground_vehicle.hpp
# src/landscape.cpp
# src/saveload/afterload.cpp
# src/saveload/saveload.h
# src/tile_cmd.h
# src/town_cmd.cpp
# src/tunnelbridge_cmd.cpp
|
2023-04-12 19:34:11 +01:00 |
|
Jonathan G Rennison
|
82803b98e0
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/game/game_gui.cpp
# src/graph_gui.cpp
# src/linkgraph/linkgraph_gui.h
# src/newgrf.cpp
# src/order_gui.cpp
# src/saveload/engine_sl.cpp
# src/saveload/saveload.h
# src/script/api/script_text.cpp
# src/script/script_gui.cpp
# src/settings_table.cpp
# src/strings.cpp
# src/table/settings/economy_settings.ini
# src/table/settings/locale_settings.ini
# src/timetable_gui.cpp
|
2023-04-10 15:11:53 +01:00 |
|
Jonathan G Rennison
|
2716217775
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/saveload/saveload.h
|
2023-03-19 22:23:31 +00:00 |
|
Jonathan G Rennison
|
2ea1766677
|
Merge branch 'master' into jgrpp
# Conflicts:
# .github/workflows/commit-checker.yml
# src/industry_cmd.cpp
# src/industry_gui.cpp
# src/landscape.cpp
# src/linkgraph/linkgraph_gui.cpp
# src/order_base.h
# src/order_cmd.cpp
# src/order_gui.cpp
# src/saveload/afterload.cpp
# src/saveload/league_sl.cpp
# src/saveload/saveload.h
# src/script/api/script_object.hpp
# src/script/squirrel_helper.hpp
# src/settings_table.cpp
# src/station_cmd.cpp
# src/table/settings.h.preamble
# src/tree_cmd.cpp
# src/tree_map.h
# src/vehicle.cpp
# src/waypoint_cmd.cpp
|
2023-03-04 16:45:05 +00:00 |
|
Jonathan G Rennison
|
24b744f7c8
|
Merge branch 'master' into jgrpp
# Conflicts:
# bin/ai/CMakeLists.txt
# bin/game/CMakeLists.txt
# src/saveload/saveload.h
|
2023-01-02 01:23:36 +00:00 |
|
Jonathan G Rennison
|
aba8e88d8c
|
Enable loading of upstream savegames up to version 302
|
2022-11-02 18:46:24 +00:00 |
|
Jonathan G Rennison
|
0818ce4ae7
|
Merge branch 'master' into jgrpp (SLV_U64_TICK_COUNTER)
# Conflicts:
# src/date.cpp
# src/date_func.h
# src/newgrf.cpp
# src/newgrf_animation_base.h
# src/saveload/gamelog_sl.cpp
# src/saveload/misc_sl.cpp
# src/saveload/saveload.h
# src/stdafx.h
|
2022-10-03 19:58:31 +01: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 |
|