dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
82803b98e065c225a2a72cf87283e4032d7e0cfd
openttd/src/saveload
History
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
..
upstream
Merge branch 'master' into jgrpp
2023-04-10 15:11:53 +01:00
afterload.cpp
Merge branch 'master' into jgrpp
2023-04-10 15:11:53 +01:00
ai_sl.cpp
Merge branch 'master' into jgrpp
2022-12-31 18:17:24 +00:00
airport_sl.cpp
Codechange: Use a common sub-class for NewGRFMapping chunks
2021-07-06 22:29:08 +02:00
animated_tile_sl.cpp
Merge branch 'master' into jgrpp-beta
2021-10-25 18:10:15 +01:00
autoreplace_sl.cpp
Cleanup: Remove now unneeded ChunkHandler members
2021-07-06 22:29:08 +02:00
bridge_signal_sl.cpp
Initial implementation of NewGRF custom signal styles
2022-06-19 02:08:38 +01:00
cargomonitor_sl.cpp
Codechange: Use ChunkHandlers sub-classes
2021-07-06 22:29:08 +02:00
cargopacket_sl.cpp
Merge branch 'master' into jgrpp-beta
2021-10-25 18:10:15 +01:00
cheat_sl.cpp
Merge branch 'master' into jgrpp-beta
2021-10-28 01:07:51 +01:00
CMakeLists.txt
Feature: [GS] Scriptable league tables (#10001)
2022-12-03 22:28:49 +00:00
company_sl.cpp
Codechange: migrate size related functions to Map structure
2023-01-21 17:11:40 +01:00
debug_sl.cpp
Merge branch 'master' into jgrpp-beta
2021-10-25 18:10:15 +01:00
depot_sl.cpp
Merge branch 'master' into jgrpp-beta
2021-10-25 18:10:15 +01:00
economy_sl.cpp
Merge branch 'master' into jgrpp-beta
2021-10-25 18:10:15 +01:00
engine_sl.cpp
Merge branch 'master' into jgrpp
2023-04-10 15:11:53 +01:00
extended_ver_sl.cpp
Add text label and departure board via orders
2023-04-09 12:48:50 +01:00
extended_ver_sl.h
Add text label and departure board via orders
2023-04-09 12:48:50 +01:00
game_sl.cpp
Merge branch 'master' into jgrpp
2022-12-31 18:17:24 +00:00
gamelog_sl.cpp
Merge branch 'master' into jgrpp (SLV_U64_TICK_COUNTER)
2022-10-03 19:58:31 +01:00
goal_sl.cpp
Codechange: Use ChunkHandlers sub-classes
2021-07-06 22:29:08 +02:00
group_sl.cpp
Codechange: Use ChunkHandlers sub-classes
2021-07-06 22:29:08 +02:00
industry_sl.cpp
Codechange: Use a common sub-class for NewGRFMapping chunks
2021-07-06 22:29:08 +02:00
labelmaps_sl.cpp
Codechange: migrate size related functions to Map structure
2023-01-21 17:11:40 +01:00
league_sl.cpp
Saveload: Fix upstream version handling of league table chunks
2023-03-07 18:41:23 +00:00
linkgraph_sl.cpp
Codechange: [Linkgraph] Drop node/edge wrappers from LinkGraph.
2023-02-26 21:41:24 +01:00
map_sl.cpp
Saveload: Use traditional map chunks for scenario saves
2023-03-21 18:59:11 +00:00
misc_sl.cpp
Fix 05ec32f5: Savegame load check of DATE chunk
2023-02-10 18:16:00 +00:00
newgrf_sl.cpp
GRF: Extend EntityIDMapping/OverrideManagerBase to 16 bit entity IDs
2023-02-11 00:30:40 +00:00
newgrf_sl.h
Codechange: Use a common sub-class for NewGRFMapping chunks
2021-07-06 22:29:08 +02:00
newsignals_sl.cpp
Store signal style GRF to local map in savegame
2022-06-25 14:33:47 +01:00
object_sl.cpp
Codechange: Use a common sub-class for NewGRFMapping chunks
2021-07-06 22:29:08 +02:00
oldloader_sl.cpp
Merge branch 'master' into jgrpp
2023-04-10 15:11:53 +01:00
oldloader.cpp
Merge branch 'master' into jgrpp-beta
2021-10-18 18:01:27 +01:00
oldloader.h
…
order_sl.cpp
Allow changing colour of orders in order list and timetable windows
2023-04-08 18:13:35 +01:00
plans_sl.cpp
Merge branch 'master' into jgrpp-beta
2021-10-25 18:10:15 +01:00
saveload_buffer.h
…
saveload_common.h
Merge branch 'master' into jgrpp
2023-04-10 15:11:53 +01:00
saveload_filter.h
…
saveload_internal.h
Remove road vehicles during load which are uncorrectably invalid
2022-08-07 20:00:40 +01:00
saveload_types.h
Add support for loading trunk savegames versions 293 - 299 (12.0)
2021-11-01 18:33:39 +00:00
saveload.cpp
Saveload: Add special proc op for whether to save chunk
2023-03-21 18:57:50 +00:00
saveload.h
Feature: Separate rail/road and sea/air velocity units, and add knots. (#10594)
2023-04-08 12:26:13 -04:00
signal_sl.cpp
Merge branch 'master' into jgrpp-beta
2021-10-25 18:10:15 +01:00
signs_sl.cpp
Merge branch 'master' into jgrpp-beta
2021-10-25 18:10:15 +01:00
station_sl.cpp
Codechange: make use of Tile in for all direct map accesses
2023-02-28 07:11:48 +01:00
storage_sl.cpp
Codechange: Use ChunkHandlers sub-classes
2021-07-06 22:29:08 +02:00
story_sl.cpp
Codechange: Use ChunkHandlers sub-classes
2021-07-06 22:29:08 +02:00
strings_sl.cpp
Codechange: Use ChunkHandlers sub-classes
2021-07-06 22:29:08 +02:00
subsidy_sl.cpp
Merge branch 'master' into jgrpp-beta
2021-10-25 18:10:15 +01:00
tbtr_template_replacement_sl.cpp
Merge branch 'master' into jgrpp-beta
2021-10-25 18:10:15 +01:00
tbtr_template_veh_sl.cpp
TBTR: Refactor template replacement code
2023-03-22 22:19:01 +00:00
town_sl.cpp
Saveload: Skip VENC/TNNC chunks entirely on non network server saves
2023-03-21 19:18:10 +00:00
tracerestrict_sl.cpp
Tracerestrict: Improve program validator
2023-03-09 03:01:20 +00:00
train_speed_adaptation.cpp
Implement train speed adaptation on signalled tunnels/bridges
2022-02-21 18:57:50 +00:00
tunnel_sl.cpp
Initial implementation of NewGRF custom signal styles
2022-06-19 02:08:38 +01:00
vehicle_sl.cpp
Saveload: Skip VENC/TNNC chunks entirely on non network server saves
2023-03-21 19:18:10 +00:00
waypoint_sl.cpp
Codechange: make use of Tile in for all direct map accesses
2023-02-28 07:11:48 +01:00