dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
f8d6e781bae9d64c5cc76451abc88feca7697e7b
openttd/src/saveload
History
Jonathan G Rennison f8d6e781ba Merge branch 'master' into jgrpp 
# Conflicts:
#	projects/openttd_vs140.vcxproj.filters
#	projects/openttd_vs141.vcxproj.filters
#	projects/openttd_vs142.vcxproj.filters
#	src/base_consist.h
#	src/company_base.h
#	src/newgrf_config.cpp
#	src/newgrf_config.h
#	src/openttd.cpp
#	src/saveload/saveload.cpp
#	src/saveload/saveload.h
#	src/saveload/station_sl.cpp
#	src/settings.cpp
#	src/signs_base.h
#	src/string.cpp
#	src/string_func.h
#	src/table/misc_settings.ini
#	src/table/settings.h.preamble
#	src/town_cmd.cpp
#	src/vehicle.cpp
#	src/vehicle_cmd.cpp
#	src/video/cocoa/cocoa_v.mm
#	src/video/null_v.cpp
2020-05-21 22:24:01 +01:00
..
afterload.cpp
Merge branch 'master' into jgrpp
2020-05-21 22:24:01 +01:00
ai_sl.cpp
Cleanup: Removed SVN headers
2019-11-10 17:59:20 +00:00
airport_sl.cpp
Cleanup: Removed SVN headers
2019-11-10 17:59:20 +00:00
animated_tile_sl.cpp
Cleanup: Removed SVN headers
2019-11-10 17:59:20 +00:00
autoreplace_sl.cpp
Codechange: Replace FOR_ALL_ENGINE_RENEWS with range-based for loops
2019-12-21 20:13:03 +01:00
bridge_signal_sl.cpp
Merge branch 'master' into jgrpp
2019-11-12 18:43:10 +00:00
cargomonitor_sl.cpp
Cleanup: Removed SVN headers
2019-11-10 17:59:20 +00:00
cargopacket_sl.cpp
Merge branch 'master' into jgrpp
2020-01-06 18:45:51 +00:00
cheat_sl.cpp
Cheat: Add cheats to set inflation income and cost factors
2020-04-18 10:53:49 +01:00
company_sl.cpp
Merge branch 'master' into jgrpp
2020-05-21 22:24:01 +01:00
debug_sl.cpp
Crash log: Save config file in new crash save chunk
2020-04-21 18:17:13 +01:00
depot_sl.cpp
Merge branch 'master' into jgrpp
2020-05-21 22:24:01 +01:00
economy_sl.cpp
Merge branch 'master' into jgrpp
2020-01-06 18:45:51 +00:00
engine_sl.cpp
Codechange: Use std::string for most of the user-settable custom names.
2020-05-21 20:02:34 +02:00
extended_ver_sl.cpp
Add rail ground type support for rail custom bridge heads
2020-05-19 00:41:35 +01:00
extended_ver_sl.h
Save/load: Add extra cheats savegame chunk
2020-04-18 10:51:02 +01:00
game_sl.cpp
Codechange: Store GS lang texts in std::strings.
2020-05-21 20:02:34 +02:00
gamelog_sl.cpp
Merge branch 'master' into jgrpp
2019-11-12 18:43:10 +00:00
goal_sl.cpp
Codechange: Replace FOR_ALL_GOALS with range-based for loops
2019-12-21 20:13:03 +01:00
group_sl.cpp
Codechange: Use std::string for most of the user-settable custom names.
2020-05-21 20:02:34 +02:00
industry_sl.cpp
Codechange: Replace FOR_ALL_INDUSTRIES with range-based for loops
2019-12-21 20:13:03 +01:00
labelmaps_sl.cpp
Merge branch 'master' into jgrpp
2020-01-20 18:36:55 +00:00
linkgraph_sl.cpp
Merge branch 'master' into jgrpp
2020-01-06 18:45:51 +00:00
map_sl.cpp
Add support for loading ChillPP v8 savegames
2020-01-03 00:08:33 +00:00
misc_sl.cpp
Merge branch 'master' into jgrpp
2019-11-12 18:43:10 +00:00
newgrf_sl.cpp
Merge branch 'master' into jgrpp
2019-11-12 18:43:10 +00:00
newgrf_sl.h
Cleanup: Removed SVN headers
2019-11-10 17:59:20 +00:00
object_sl.cpp
Codechange: Replace FOR_ALL_OBJECTS with range-based for loops
2019-12-21 20:13:03 +01:00
oldloader_sl.cpp
Merge branch 'master' into jgrpp
2020-02-21 21:18:01 +00:00
oldloader.cpp
Merge branch 'master' into jgrpp
2019-11-12 18:43:10 +00:00
oldloader.h
Cleanup: Removed SVN headers
2019-11-10 17:59:20 +00:00
order_sl.cpp
Merge branch 'master' into jgrpp
2020-01-06 18:45:51 +00:00
plans_sl.cpp
Merge branch 'master' into jgrpp
2020-05-21 22:24:01 +01:00
saveload_buffer.h
Merge branch 'master' into jgrpp
2019-11-12 18:43:10 +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
2020-05-21 22:24:01 +01:00
saveload.cpp
Merge branch 'master' into jgrpp
2020-05-21 22:24:01 +01:00
saveload.h
Merge branch 'master' into jgrpp
2020-05-21 22:24:01 +01:00
signal_sl.cpp
Rename programmable signals to programmable pre-signals
2019-12-05 18:13:35 +00:00
signs_sl.cpp
Merge branch 'master' into jgrpp
2020-05-21 22:24:01 +01:00
station_sl.cpp
Merge branch 'master' into jgrpp
2020-05-21 22:24:01 +01:00
storage_sl.cpp
Codechange: Replace FOR_ALL_STORAGES with range-based for loops
2019-12-21 20:13:03 +01:00
story_sl.cpp
Codechange: Replace story related FOR_ALL with range-based for loops
2019-12-21 20:13:03 +01:00
strings_sl.cpp
Codechange: Use std::string for most of the user-settable custom names.
2020-05-21 20:02:34 +02:00
subsidy_sl.cpp
Codechange: Replace FOR_ALL_SUBSIDIES with range-based for loops
2019-12-21 20:13:03 +01:00
tbtr_template_replacement_sl.cpp
TBTR: Avoid unnecessary iterations of template replacement pool
2020-01-16 01:16:08 +00:00
tbtr_template_veh_sl.cpp
Merge branch 'master' into jgrpp
2020-01-06 18:45:51 +00:00
town_sl.cpp
Merge branch 'master' into jgrpp
2020-05-21 22:24:01 +01:00
tracerestrict_sl.cpp
Merge branch 'master' into jgrpp
2020-05-21 22:24:01 +01:00
tunnel_sl.cpp
Merge branch 'master' into jgrpp
2020-01-06 18:45:51 +00:00
vehicle_sl.cpp
Merge branch 'master' into jgrpp
2020-05-21 22:24:01 +01:00
waypoint_sl.cpp
Codechange: Use std::string for most of the user-settable custom names.
2020-05-21 20:02:34 +02:00