dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
7f6b1d6b944244f07ae07f4883e71e5f33ea82c1
openttd/src/saveload
History
Jonathan G Rennison 7f6b1d6b94 Merge branch 'master' into jgrpp 
# Conflicts:
#	src/company_cmd.cpp
#	src/company_func.h
#	src/core/overflowsafe_type.hpp
#	src/engine.cpp
#	src/music/midifile.cpp
#	src/network/network_command.cpp
#	src/newgrf_debug_gui.cpp
#	src/newgrf_roadstop.h
#	src/newgrf_spritegroup.cpp
#	src/os/macosx/crashlog_osx.cpp
#	src/os/unix/crashlog_unix.cpp
#	src/pathfinder/yapf/yapf_common.hpp
#	src/road_gui.cpp
#	src/saveload/engine_sl.cpp
#	src/script/api/script_depotlist.cpp
#	src/script/api/script_roadtypelist.cpp
#	src/settings_gui.cpp
#	src/settings_type.h
#	src/strings.cpp
#	src/table/settings/game_settings.ini
2024-01-05 13:37:52 +00:00
..
compat
Fix b0e73277: save/load next_station for CargoPacket again
2023-10-01 23:50:23 +01:00
afterload.cpp
Merge branch 'master' into jgrpp
2024-01-05 13:37:52 +00:00
ai_sl.cpp
Merge branch 'master' into jgrpp
2023-07-01 02:42:51 +01:00
airport_sl.cpp
Move upstream saveload to src/saveload/, move jgrpp saveload to src/sl/
2023-06-08 00:01:40 +01:00
animated_tile_sl.cpp
Merge branch 'master' into jgrpp
2023-07-02 12:02:36 +01:00
autoreplace_sl.cpp
Move upstream saveload to src/saveload/, move jgrpp saveload to src/sl/
2023-06-08 00:01:40 +01:00
cargomonitor_sl.cpp
Codechange: automatic adding of _t to (u)int types, and WChar to char32_t
2023-07-19 19:30:14 +02:00
cargopacket_sl.cpp
Codechange: Use iterators and/or range-for on cargo related loops.
2023-10-19 17:03:25 +01:00
cheat_sl.cpp
Merge branch 'master' into jgrpp
2023-11-25 14:14:00 +00:00
CMakeLists.txt
Move upstream saveload to src/saveload/, move jgrpp saveload to src/sl/
2023-06-08 00:01:40 +01:00
company_sl.cpp
Codechange: automatic adding of _t to (u)int types, and WChar to char32_t
2023-07-19 19:30:14 +02:00
depot_sl.cpp
Move upstream saveload to src/saveload/, move jgrpp saveload to src/sl/
2023-06-08 00:01:40 +01:00
economy_sl.cpp
Codechange: automatic adding of _t to (u)int types, and WChar to char32_t
2023-07-19 19:30:14 +02:00
engine_sl.cpp
Codechange: coding style fixes
2024-01-04 16:23:54 +01:00
game_sl.cpp
Merge branch 'master' into jgrpp
2023-11-25 13:30:06 +00:00
gamelog_sl.cpp
Codechange: do not make a string valid in place, to then copy it
2023-07-06 19:59:50 +02:00
goal_sl.cpp
Move upstream saveload to src/saveload/, move jgrpp saveload to src/sl/
2023-06-08 00:01:40 +01:00
group_sl.cpp
Move upstream saveload to src/saveload/, move jgrpp saveload to src/sl/
2023-06-08 00:01:40 +01:00
industry_sl.cpp
Merge branch 'master' into jgrpp
2023-11-19 13:00:21 +00:00
labelmaps_sl.cpp
Codechange: Rename *Railtype* to *RailType* for consistency. (#11287)
2023-09-11 08:55:12 +00:00
league_sl.cpp
Move upstream saveload to src/saveload/, move jgrpp saveload to src/sl/
2023-06-08 00:01:40 +01:00
linkgraph_sl.cpp
Link graph: Fix incorrect job start/join dates when loading upstream saves
2023-11-25 16:32:21 +00:00
map_sl.cpp
Codechange: make explicit when a TileIndex is cast to its basetype (#11190)
2023-08-15 18:12:05 +02:00
misc_sl.cpp
Strong typedef: Use strong typedefs for date, date tick, minutes types
2023-12-19 02:39:54 +00:00
newgrf_sl.cpp
Change gamelog to use std::vector
2023-07-03 22:42:59 +01:00
newgrf_sl.h
Codechange: automatic adding of _t to (u)int types, and WChar to char32_t
2023-07-19 19:30:14 +02:00
object_sl.cpp
Move upstream saveload to src/saveload/, move jgrpp saveload to src/sl/
2023-06-08 00:01:40 +01:00
order_sl.cpp
Merge branch 'master' into jgrpp
2023-12-23 13:26:55 +00:00
saveload.cpp
Merge branch 'master' into jgrpp
2023-12-23 13:26:55 +00:00
saveload.h
Merge branch 'master' into jgrpp
2023-12-23 13:26:55 +00:00
settings_sl.cpp
Split save/load settings into separate INI files
2023-11-18 20:00:55 +00:00
signs_sl.cpp
Move upstream saveload to src/saveload/, move jgrpp saveload to src/sl/
2023-06-08 00:01:40 +01:00
station_sl.cpp
Merge branch 'master' into jgrpp
2023-11-25 13:30:06 +00:00
storage_sl.cpp
Move upstream saveload to src/saveload/, move jgrpp saveload to src/sl/
2023-06-08 00:01:40 +01:00
story_sl.cpp
Codechange: automatic adding of _t to (u)int types, and WChar to char32_t
2023-07-19 19:30:14 +02:00
subsidy_sl.cpp
Move upstream saveload to src/saveload/, move jgrpp saveload to src/sl/
2023-06-08 00:01:40 +01:00
town_sl.cpp
Merge branch 'master' into jgrpp
2023-11-25 13:30:06 +00:00
vehicle_sl.cpp
Merge branch 'master' into jgrpp
2023-12-17 23:00:46 +00:00