dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
544da99102f9a46fc807a092b2135ec4cf44778d
openttd/src/saveload
History
Jonathan G Rennison 544da99102 Merge branch 'master' into jgrpp-beta 
# Conflicts:
#	src/cargopacket.h
#	src/lang/korean.txt
#	src/linkgraph/linkgraph.h
#	src/linkgraph/linkgraphjob.h
#	src/linkgraph/linkgraphschedule.h
#	src/network/network_admin.h
#	src/network/network_func.h
#	src/network/network_server.cpp
#	src/network/network_server.h
#	src/order_base.h
#	src/rail_cmd.cpp
#	src/saveload/company_sl.cpp
#	src/saveload/depot_sl.cpp
#	src/saveload/economy_sl.cpp
#	src/saveload/linkgraph_sl.cpp
#	src/saveload/map_sl.cpp
#	src/saveload/newgrf_sl.cpp
#	src/saveload/order_sl.cpp
#	src/saveload/saveload.cpp
#	src/saveload/saveload.h
#	src/saveload/signs_sl.cpp
#	src/saveload/station_sl.cpp
#	src/saveload/subsidy_sl.cpp
#	src/saveload/town_sl.cpp
#	src/saveload/vehicle_sl.cpp
#	src/script/api/script_object.cpp
#	src/settings.cpp
#	src/string.cpp
#	src/string_func.h
#	src/table/CMakeLists.txt
#	src/table/settings/settings.ini
#	src/viewport_sprite_sorter_sse4.cpp
2021-10-18 18:01:27 +01:00
..
afterload.cpp
Merge branch 'jgrpp' into jgrpp-beta
2021-10-08 18:12:04 +01:00
ai_sl.cpp
Codechange: C++-ify lists for SaveLoad (#9323)
2021-05-31 22:26:44 +02:00
airport_sl.cpp
Cleanup: Removed SVN headers
2019-11-10 17:59:20 +00:00
animated_tile_sl.cpp
Cache animated tile speed, use btree map for animated tiles
2020-11-26 00:19:51 +00:00
autoreplace_sl.cpp
Codechange: C++-ify lists for SaveLoad (#9323)
2021-05-31 22:26:44 +02:00
bridge_signal_sl.cpp
Merge branch 'master' into jgrpp-beta
2021-10-18 18:01:27 +01:00
cargomonitor_sl.cpp
Codechange: C++-ify lists for SaveLoad (#9323)
2021-05-31 22:26:44 +02:00
cargopacket_sl.cpp
Merge branch 'master' into jgrpp-beta
2021-10-18 18:01:27 +01:00
cheat_sl.cpp
Merge branch 'master' into jgrpp-beta
2021-10-18 18:01:27 +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-18 18:01:27 +01:00
debug_sl.cpp
Avoid undefined behaviour const_casting std::string c_str()
2021-03-11 01:33:06 +00:00
depot_sl.cpp
Merge branch 'master' into jgrpp-beta
2021-10-18 18:01:27 +01:00
economy_sl.cpp
Merge branch 'master' into jgrpp-beta
2021-10-18 18:01:27 +01:00
engine_sl.cpp
Merge branch 'master' into jgrpp-beta
2021-10-18 18:01:27 +01:00
extended_ver_sl.cpp
Merge branch 'master' into jgrpp-beta
2021-10-18 18:01:27 +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: C++-ify lists for SaveLoad (#9323)
2021-05-31 22:26:44 +02:00
gamelog_sl.cpp
Merge branch 'master' into jgrpp-beta
2021-10-18 18:01:27 +01:00
goal_sl.cpp
Codechange: C++-ify lists for SaveLoad (#9323)
2021-05-31 22:26:44 +02:00
group_sl.cpp
Codechange: C++-ify lists for SaveLoad (#9323)
2021-05-31 22:26:44 +02:00
industry_sl.cpp
Codechange: C++-ify lists for SaveLoad (#9323)
2021-05-31 22:26:44 +02:00
labelmaps_sl.cpp
Merge branch 'master' into jgrpp-beta
2021-10-18 18:01:27 +01:00
linkgraph_sl.cpp
Merge branch 'master' into jgrpp-beta
2021-10-18 18:01:27 +01:00
map_sl.cpp
Merge branch 'master' into jgrpp-beta
2021-10-18 18:01:27 +01:00
misc_sl.cpp
Merge branch 'master' into jgrpp-beta
2021-10-18 18:01:27 +01:00
newgrf_sl.cpp
Merge branch 'master' into jgrpp-beta
2021-10-18 18:01:27 +01:00
newgrf_sl.h
Cleanup: Removed SVN headers
2019-11-10 17:59:20 +00:00
object_sl.cpp
Codechange: C++-ify lists for SaveLoad (#9323)
2021-05-31 22:26:44 +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-18 18:01:27 +01:00
plans_sl.cpp
Merge branch 'master' into jgrpp-beta
2021-10-18 18:01:27 +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-18 18:01:27 +01:00
saveload.h
Merge branch 'master' into jgrpp-beta
2021-10-18 18:01:27 +01:00
signal_sl.cpp
Fix saving one byte at a time in Save_SPRG
2021-06-27 04:12:27 +01:00
signs_sl.cpp
Merge branch 'master' into jgrpp-beta
2021-10-18 18:01:27 +01:00
station_sl.cpp
Merge branch 'master' into jgrpp-beta
2021-10-18 18:01:27 +01:00
storage_sl.cpp
Codechange: C++-ify lists for SaveLoad (#9323)
2021-05-31 22:26:44 +02:00
story_sl.cpp
Codechange: C++-ify lists for SaveLoad (#9323)
2021-05-31 22:26:44 +02: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
Merge branch 'master' into jgrpp-beta
2021-10-18 18:01:27 +01:00
tbtr_template_replacement_sl.cpp
Merge branch 'master' into jgrpp-beta
2021-10-18 18:01:27 +01:00
tbtr_template_veh_sl.cpp
Merge branch 'master' into jgrpp-beta
2021-10-18 18:01:27 +01:00
town_sl.cpp
Merge branch 'master' into jgrpp-beta
2021-10-18 18:01:27 +01:00
tracerestrict_sl.cpp
Merge branch 'master' into jgrpp-beta
2021-10-18 18:01:27 +01:00
train_speed_adaptation.cpp
Merge branch 'master' into jgrpp-beta
2021-10-18 18:01:27 +01:00
tunnel_sl.cpp
Merge branch 'master' into jgrpp-beta
2021-10-18 18:01:27 +01:00
vehicle_sl.cpp
Merge branch 'master' into jgrpp-beta
2021-10-18 18:01:27 +01:00
waypoint_sl.cpp
Merge branch 'master' into jgrpp-beta
2021-10-18 18:01:27 +01:00