dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
81290df94616faecedf5fa685bb10e9c1725376b
openttd/src/saveload
History
Jonathan G Rennison 81290df946 Merge branch 'master' into jgrpp-beta 
# Conflicts:
#	src/lang/spanish.txt
#	src/network/core/tcp_content_type.h
#	src/network/network_content.cpp
#	src/saveload/cheat_sl.cpp
#	src/saveload/saveload.cpp
#	src/saveload/saveload.h
#	src/saveload/station_sl.cpp
#	src/saveload/vehicle_sl.cpp
#	src/settings.cpp
#	src/settings_internal.h
#	src/table/settings.h.preamble
#	src/table/settings/company_settings.ini
#	src/table/settings/currency_settings.ini
#	src/table/settings/gameopt_settings.ini
#	src/table/settings/misc_settings.ini
#	src/table/settings/settings.ini
#	src/table/settings/win32_settings.ini
#	src/table/settings/window_settings.ini
2021-10-28 01:07:51 +01:00
..
afterload.cpp
Merge branch 'jgrpp' into jgrpp-beta
2021-10-08 18:12:04 +01:00
ai_sl.cpp
Codechange: Remove FOR_ALL_CHUNK_HANDLERS
2021-06-06 19:35:06 +02:00
airport_sl.cpp
Codechange: Remove FOR_ALL_CHUNK_HANDLERS
2021-06-06 19:35:06 +02:00
animated_tile_sl.cpp
Merge branch 'master' into jgrpp-beta
2021-10-25 18:10:15 +01:00
autoreplace_sl.cpp
Codechange: Remove FOR_ALL_CHUNK_HANDLERS
2021-06-06 19:35:06 +02:00
bridge_signal_sl.cpp
Merge branch 'master' into jgrpp-beta
2021-10-25 18:10:15 +01:00
cargomonitor_sl.cpp
Codechange: Remove FOR_ALL_CHUNK_HANDLERS
2021-06-06 19:35:06 +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
Add save/load support for train speed adaptation
2021-06-27 04:41:46 +01:00
company_sl.cpp
Merge branch 'master' into jgrpp-beta
2021-10-25 18:10:15 +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-beta
2021-10-25 18:10:15 +01:00
extended_ver_sl.cpp
Merge branch 'master' into jgrpp-beta
2021-10-25 18:10:15 +01:00
extended_ver_sl.h
Add new signal type: no-entry signal
2021-09-04 11:39:54 +01:00
game_sl.cpp
Codechange: Remove FOR_ALL_CHUNK_HANDLERS
2021-06-06 19:35:06 +02:00
gamelog_sl.cpp
Merge branch 'master' into jgrpp-beta
2021-10-25 18:10:15 +01:00
goal_sl.cpp
Codechange: Remove FOR_ALL_CHUNK_HANDLERS
2021-06-06 19:35:06 +02:00
group_sl.cpp
Codechange: Remove FOR_ALL_CHUNK_HANDLERS
2021-06-06 19:35:06 +02:00
industry_sl.cpp
Codechange: Remove FOR_ALL_CHUNK_HANDLERS
2021-06-06 19:35:06 +02:00
labelmaps_sl.cpp
Merge branch 'master' into jgrpp-beta
2021-10-25 18:10:15 +01:00
linkgraph_sl.cpp
Merge branch 'master' into jgrpp-beta
2021-10-28 01:07:51 +01:00
map_sl.cpp
Merge branch 'master' into jgrpp-beta
2021-10-25 18:10:15 +01:00
misc_sl.cpp
Merge branch 'master' into jgrpp-beta
2021-10-25 18:10:15 +01:00
newgrf_sl.cpp
Merge branch 'master' into jgrpp-beta
2021-10-25 18:10:15 +01:00
newgrf_sl.h
Cleanup: Removed SVN headers
2019-11-10 17:59:20 +00:00
object_sl.cpp
Codechange: Remove FOR_ALL_CHUNK_HANDLERS
2021-06-06 19:35:06 +02:00
oldloader_sl.cpp
Add setting for no vehicles introduced after given year
2021-03-17 18:51:19 +00:00
oldloader.cpp
Merge branch 'master' into jgrpp-beta
2021-10-18 18:01:27 +01:00
oldloader.h
Codechange: Don't use cpp_offsetof in the TTO/TTD savegame loader.
2021-02-13 20:08:53 +01:00
order_sl.cpp
Merge branch 'master' into jgrpp-beta
2021-10-25 18:10:15 +01:00
plans_sl.cpp
Merge branch 'master' into jgrpp-beta
2021-10-25 18:10:15 +01:00
saveload_buffer.h
Merge branch 'master' into jgrpp
2021-02-01 17:07:34 +00:00
saveload_filter.h
Cleanup: Removed SVN headers
2019-11-10 17:59:20 +00:00
saveload_internal.h
Merge branch 'master' into jgrpp-beta
2021-10-18 18:01:27 +01:00
saveload.cpp
Merge branch 'master' into jgrpp-beta
2021-10-28 01:07:51 +01:00
saveload.h
Merge branch 'master' into jgrpp-beta
2021-10-28 01:07:51 +01: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
Merge branch 'master' into jgrpp-beta
2021-10-25 18:10:15 +01:00
storage_sl.cpp
Codechange: Remove FOR_ALL_CHUNK_HANDLERS
2021-06-06 19:35:06 +02:00
story_sl.cpp
Codechange: Remove FOR_ALL_CHUNK_HANDLERS
2021-06-06 19:35:06 +02:00
strings_sl.cpp
Codechange: Remove FOR_ALL_CHUNK_HANDLERS
2021-06-06 19:35:06 +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
Merge branch 'master' into jgrpp-beta
2021-10-25 18:10:15 +01:00
town_sl.cpp
Merge branch 'master' into jgrpp-beta
2021-10-28 01:07:51 +01:00
tracerestrict_sl.cpp
Merge branch 'master' into jgrpp-beta
2021-10-25 18:10:15 +01:00
train_speed_adaptation.cpp
Merge branch 'master' into jgrpp-beta
2021-10-25 18:10:15 +01:00
tunnel_sl.cpp
Merge branch 'master' into jgrpp-beta
2021-10-25 18:10:15 +01:00
vehicle_sl.cpp
Merge branch 'master' into jgrpp-beta
2021-10-25 18:10:15 +01:00
waypoint_sl.cpp
Merge branch 'master' into jgrpp-beta
2021-10-25 18:10:15 +01:00