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 c8817d7f4e Merge branch 'master' into jgrpp
# Conflicts:
#	os/macosx/notarize.sh
#	src/3rdparty/CMakeLists.txt
#	src/3rdparty/squirrel/squirrel/sqcompiler.cpp
#	src/3rdparty/squirrel/squirrel/sqdebug.cpp
#	src/3rdparty/squirrel/squirrel/sqvm.cpp
#	src/console_cmds.cpp
#	src/core/span_type.hpp
#	src/crashlog.cpp
#	src/currency.h
#	src/date_gui.cpp
#	src/driver.cpp
#	src/fios.cpp
#	src/genworld_gui.cpp
#	src/hotkeys.cpp
#	src/misc_gui.cpp
#	src/music/os2_m.cpp
#	src/network/core/os_abstraction.h
#	src/network/network_server.cpp
#	src/newgrf.cpp
#	src/newgrf_config.h
#	src/newgrf_text.cpp
#	src/openttd.cpp
#	src/os/macosx/font_osx.cpp
#	src/os/macosx/misc_osx.cpp
#	src/os/os2/CMakeLists.txt
#	src/os/os2/os2.cpp
#	src/os/unix/CMakeLists.txt
#	src/os/windows/font_win32.cpp
#	src/os/windows/win32_main.cpp
#	src/saveload/saveload.cpp
#	src/script/api/script_text.cpp
#	src/settings.cpp
#	src/settings_gui.cpp
#	src/stdafx.h
#	src/strings.cpp
#	src/timetable_gui.cpp
#	src/town_gui.cpp
#	src/train_cmd.cpp
#	src/video/dedicated_v.cpp
#	src/video/video_driver.cpp
#	src/video/win32_v.cpp
#	src/viewport.cpp
#	src/waypoint_gui.cpp
#	src/widgets/dropdown_type.h
#	src/window.cpp
#	src/window_gui.h
9 months ago
..
compat Move upstream saveload to src/saveload/, move jgrpp saveload to src/sl/ 12 months ago
CMakeLists.txt Move upstream saveload to src/saveload/, move jgrpp saveload to src/sl/ 12 months ago
afterload.cpp Add road vehicle flags for whether any part is on level crossing 9 months ago
ai_sl.cpp Merge branch 'master' into jgrpp 11 months ago
airport_sl.cpp Move upstream saveload to src/saveload/, move jgrpp saveload to src/sl/ 12 months ago
animated_tile_sl.cpp Merge branch 'master' into jgrpp 11 months ago
autoreplace_sl.cpp Move upstream saveload to src/saveload/, move jgrpp saveload to src/sl/ 12 months ago
cargomonitor_sl.cpp Move upstream saveload to src/saveload/, move jgrpp saveload to src/sl/ 12 months ago
cargopacket_sl.cpp Saveload: Add support for upstream savegame version 316 10 months ago
cheat_sl.cpp Move upstream saveload to src/saveload/, move jgrpp saveload to src/sl/ 12 months ago
company_sl.cpp Change gamelog to use std::vector 11 months ago
depot_sl.cpp Move upstream saveload to src/saveload/, move jgrpp saveload to src/sl/ 12 months ago
economy_sl.cpp Move upstream saveload to src/saveload/, move jgrpp saveload to src/sl/ 12 months ago
engine_sl.cpp Move upstream saveload to src/saveload/, move jgrpp saveload to src/sl/ 12 months ago
game_sl.cpp Merge branch 'master' into jgrpp 11 months ago
gamelog_sl.cpp Change gamelog to use std::vector 11 months ago
goal_sl.cpp Move upstream saveload to src/saveload/, move jgrpp saveload to src/sl/ 12 months ago
group_sl.cpp Move upstream saveload to src/saveload/, move jgrpp saveload to src/sl/ 12 months ago
industry_sl.cpp Move upstream saveload to src/saveload/, move jgrpp saveload to src/sl/ 12 months ago
labelmaps_sl.cpp Move upstream saveload to src/saveload/, move jgrpp saveload to src/sl/ 12 months ago
league_sl.cpp Move upstream saveload to src/saveload/, move jgrpp saveload to src/sl/ 12 months ago
linkgraph_sl.cpp Link graph: Store last compression in scaled date ticks 11 months ago
map_sl.cpp Change gamelog to use std::vector 11 months ago
misc_sl.cpp Change gamelog to use std::vector 11 months ago
newgrf_sl.cpp Change gamelog to use std::vector 11 months ago
newgrf_sl.h Move upstream saveload to src/saveload/, move jgrpp saveload to src/sl/ 12 months ago
object_sl.cpp Move upstream saveload to src/saveload/, move jgrpp saveload to src/sl/ 12 months ago
order_sl.cpp Merge branch 'master' into jgrpp 9 months ago
saveload.cpp Merge branch 'master' into jgrpp 9 months ago
saveload.h Replace remaining uses of std::deque with ring buffers 10 months ago
settings_sl.cpp Change gamelog to use std::vector 11 months ago
signs_sl.cpp Move upstream saveload to src/saveload/, move jgrpp saveload to src/sl/ 12 months ago
station_sl.cpp Move StationCargoList and FlowStatMap out of GoodsEntry struct 10 months ago
storage_sl.cpp Move upstream saveload to src/saveload/, move jgrpp saveload to src/sl/ 12 months ago
story_sl.cpp Move upstream saveload to src/saveload/, move jgrpp saveload to src/sl/ 12 months ago
subsidy_sl.cpp Move upstream saveload to src/saveload/, move jgrpp saveload to src/sl/ 12 months ago
town_sl.cpp Move upstream saveload to src/saveload/, move jgrpp saveload to src/sl/ 12 months ago
vehicle_sl.cpp Fix 2ae4e5bd: Wrong upstream save/load version for RV path cache 9 months ago