You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
OpenTTD-patches/src/saveload
Jonathan G Rennison 9e946d4c5d Merge branch 'master' into jgrpp-beta
# Conflicts:
#	src/command.cpp
#	src/console_cmds.cpp
#	src/group_gui.cpp
#	src/lang/catalan.txt
#	src/lang/czech.txt
#	src/lang/danish.txt
#	src/lang/greek.txt
#	src/lang/hungarian.txt
#	src/lang/irish.txt
#	src/lang/japanese.txt
#	src/lang/luxembourgish.txt
#	src/lang/norwegian_bokmal.txt
#	src/lang/romanian.txt
#	src/lang/russian.txt
#	src/lang/serbian.txt
#	src/lang/simplified_chinese.txt
#	src/lang/slovak.txt
#	src/lang/spanish_MX.txt
#	src/lang/swedish.txt
#	src/lang/tamil.txt
#	src/lang/traditional_chinese.txt
#	src/lang/turkish.txt
#	src/lang/ukrainian.txt
#	src/lang/vietnamese.txt
#	src/network/network.cpp
#	src/network/network_client.cpp
#	src/network/network_func.h
#	src/network/network_internal.h
#	src/network/network_server.cpp
#	src/network/network_server.h
#	src/saveload/afterload.cpp
#	src/saveload/newgrf_sl.cpp
#	src/saveload/saveload.h
#	src/script/script_instance.cpp
#	src/toolbar_gui.cpp
#	src/toolbar_gui.h
#	src/vehicle_gui.cpp
#	src/widgets/rail_widget.h
#	src/widgets/vehicle_widget.h
#	src/window.cpp
3 years ago
..
upstream Merge tag '12.0-beta1' into jgrpp-beta 3 years ago
CMakeLists.txt Add support for loading trunk savegames versions 293 - 299 (12.0) 3 years ago
afterload.cpp Merge branch 'master' into jgrpp-beta 3 years ago
ai_sl.cpp Merge branch 'master' into jgrpp-beta 3 years ago
airport_sl.cpp Codechange: Use a common sub-class for NewGRFMapping chunks 3 years ago
animated_tile_sl.cpp Merge branch 'master' into jgrpp-beta 3 years ago
autoreplace_sl.cpp Cleanup: Remove now unneeded ChunkHandler members 3 years ago
bridge_signal_sl.cpp Merge branch 'master' into jgrpp-beta 3 years ago
cargomonitor_sl.cpp Codechange: Use ChunkHandlers sub-classes 3 years ago
cargopacket_sl.cpp Merge branch 'master' into jgrpp-beta 3 years ago
cheat_sl.cpp Merge branch 'master' into jgrpp-beta 3 years ago
company_sl.cpp Merge branch 'jgrpp' into jgrpp-beta 3 years ago
debug_sl.cpp Merge branch 'master' into jgrpp-beta 3 years ago
depot_sl.cpp Merge branch 'master' into jgrpp-beta 3 years ago
economy_sl.cpp Merge branch 'master' into jgrpp-beta 3 years ago
engine_sl.cpp Merge branch 'master' into jgrpp-beta 3 years ago
extended_ver_sl.cpp Add support for loading trunk savegames versions 293 - 299 (12.0) 3 years ago
extended_ver_sl.h Add support for loading trunk savegames versions 293 - 299 (12.0) 3 years ago
game_sl.cpp Codechange: Use ChunkHandlers sub-classes 3 years ago
gamelog_sl.cpp Merge branch 'master' into jgrpp-beta 3 years ago
goal_sl.cpp Codechange: Use ChunkHandlers sub-classes 3 years ago
group_sl.cpp Codechange: Use ChunkHandlers sub-classes 3 years ago
industry_sl.cpp Codechange: Use a common sub-class for NewGRFMapping chunks 3 years ago
labelmaps_sl.cpp Add support for loading trunk savegames versions 293 - 299 (12.0) 3 years ago
linkgraph_sl.cpp Add support for loading trunk savegames versions 293 - 299 (12.0) 3 years ago
map_sl.cpp Merge branch 'master' into jgrpp-beta 3 years ago
misc_sl.cpp Merge branch 'master' into jgrpp-beta 3 years ago
newgrf_sl.cpp Merge branch 'master' into jgrpp-beta 3 years ago
newgrf_sl.h Codechange: Use a common sub-class for NewGRFMapping chunks 3 years ago
object_sl.cpp Codechange: Use a common sub-class for NewGRFMapping chunks 3 years ago
oldloader.cpp Merge branch 'master' into jgrpp-beta 3 years ago
oldloader.h Codechange: Don't use cpp_offsetof in the TTO/TTD savegame loader. 3 years ago
oldloader_sl.cpp Codechange: convert printf DEBUG statements to fmt Debug statements 3 years ago
order_sl.cpp Merge branch 'master' into jgrpp-beta 3 years ago
plans_sl.cpp Merge branch 'master' into jgrpp-beta 3 years ago
saveload.cpp Merge tag '12.0-beta1' into jgrpp-beta 3 years ago
saveload.h Merge tag '12.0-beta1' into jgrpp-beta 3 years ago
saveload_buffer.h Merge branch 'master' into jgrpp 3 years ago
saveload_common.h Add support for loading trunk savegames versions 293 - 299 (12.0) 3 years ago
saveload_filter.h
saveload_internal.h Merge branch 'master' into jgrpp-beta 3 years ago
saveload_types.h Add support for loading trunk savegames versions 293 - 299 (12.0) 3 years ago
signal_sl.cpp Merge branch 'master' into jgrpp-beta 3 years ago
signs_sl.cpp Merge branch 'master' into jgrpp-beta 3 years ago
station_sl.cpp Merge branch 'master' into jgrpp-beta 3 years ago
storage_sl.cpp Codechange: Use ChunkHandlers sub-classes 3 years ago
story_sl.cpp Codechange: Use ChunkHandlers sub-classes 3 years ago
strings_sl.cpp Codechange: Use ChunkHandlers sub-classes 3 years ago
subsidy_sl.cpp Merge branch 'master' into jgrpp-beta 3 years ago
tbtr_template_replacement_sl.cpp Merge branch 'master' into jgrpp-beta 3 years ago
tbtr_template_veh_sl.cpp Merge branch 'master' into jgrpp-beta 3 years ago
town_sl.cpp Merge branch 'master' into jgrpp-beta 3 years ago
tracerestrict_sl.cpp Merge branch 'master' into jgrpp-beta 3 years ago
train_speed_adaptation.cpp Merge branch 'master' into jgrpp-beta 3 years ago
tunnel_sl.cpp Merge branch 'master' into jgrpp-beta 3 years ago
vehicle_sl.cpp Add train cached_curve_speed_mod to VENC, cache checks and debug window 3 years ago
waypoint_sl.cpp Merge branch 'master' into jgrpp-beta 3 years ago