dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
ae9b41668426a711354502de09c9fa4c81e8b395
openttd/src/saveload
History
Jonathan G Rennison ae9b416684 Merge branch 'master' into jgrpp 
# Conflicts:
#	src/ai/ai_core.cpp
#	src/ai/ai_gui.cpp
#	src/ai/ai_instance.cpp
#	src/console_cmds.cpp
#	src/engine_type.h
#	src/game/game_gui.cpp
#	src/game/game_instance.cpp
#	src/goal.cpp
#	src/goal_cmd.h
#	src/lang/english.txt
#	src/lang/estonian.txt
#	src/network/network_client.cpp
#	src/newgrf.cpp
#	src/newgrf_generic.h
#	src/openttd.cpp
#	src/saveload/saveload.h
#	src/script/api/script_log.cpp
#	src/script/api/script_town.cpp
#	src/settings_table.cpp
#	src/station_cmd.cpp
#	src/station_cmd.h
#	src/station_map.h
#	src/strings.cpp
#	src/table/settings/difficulty_settings.ini
#	src/table/settings/gui_settings.ini
#	src/tbtr_template_gui_main.h
#	src/timetable_cmd.cpp
#	src/timetable_cmd.h
#	src/timetable_gui.cpp
#	src/town_gui.cpp
#	src/train_gui.cpp
#	src/water_cmd.cpp
2023-02-11 23:05:22 +00:00
..
upstream
GRF: Extend EntityIDMapping/OverrideManagerBase to 16 bit entity IDs
2023-02-11 00:30:40 +00:00
afterload.cpp
Merge branch 'master' into jgrpp
2023-02-11 23:05:22 +00:00
ai_sl.cpp
Merge branch 'master' into jgrpp
2022-12-31 18:17:24 +00:00
airport_sl.cpp
Codechange: Use a common sub-class for NewGRFMapping chunks
2021-07-06 22:29:08 +02:00
animated_tile_sl.cpp
Merge branch 'master' into jgrpp-beta
2021-10-25 18:10:15 +01:00
autoreplace_sl.cpp
Cleanup: Remove now unneeded ChunkHandler members
2021-07-06 22:29:08 +02:00
bridge_signal_sl.cpp
Initial implementation of NewGRF custom signal styles
2022-06-19 02:08:38 +01:00
cargomonitor_sl.cpp
Codechange: Use ChunkHandlers sub-classes
2021-07-06 22:29:08 +02:00
cargopacket_sl.cpp
Merge branch 'master' into jgrpp-beta
2021-10-25 18:10:15 +01:00
cheat_sl.cpp
Merge branch 'master' into jgrpp-beta
2021-10-28 01:07:51 +01:00
CMakeLists.txt
Feature: [GS] Scriptable league tables (#10001)
2022-12-03 22:28:49 +00:00
company_sl.cpp
Codechange: migrate size related functions to Map structure
2023-01-21 17:11:40 +01:00
debug_sl.cpp
Merge branch 'master' into jgrpp-beta
2021-10-25 18:10:15 +01:00
depot_sl.cpp
Merge branch 'master' into jgrpp-beta
2021-10-25 18:10:15 +01:00
economy_sl.cpp
Merge branch 'master' into jgrpp-beta
2021-10-25 18:10:15 +01:00
engine_sl.cpp
Merge branch 'master' into jgrpp-beta
2021-10-25 18:10:15 +01:00
extended_ver_sl.cpp
GRF: Extend EntityIDMapping/OverrideManagerBase to 16 bit entity IDs
2023-02-11 00:30:40 +00:00
extended_ver_sl.h
GRF: Extend EntityIDMapping/OverrideManagerBase to 16 bit entity IDs
2023-02-11 00:30:40 +00:00
game_sl.cpp
Merge branch 'master' into jgrpp
2022-12-31 18:17:24 +00:00
gamelog_sl.cpp
Merge branch 'master' into jgrpp (SLV_U64_TICK_COUNTER)
2022-10-03 19:58:31 +01:00
goal_sl.cpp
Codechange: Use ChunkHandlers sub-classes
2021-07-06 22:29:08 +02:00
group_sl.cpp
Codechange: Use ChunkHandlers sub-classes
2021-07-06 22:29:08 +02:00
industry_sl.cpp
Codechange: Use a common sub-class for NewGRFMapping chunks
2021-07-06 22:29:08 +02:00
labelmaps_sl.cpp
Codechange: migrate size related functions to Map structure
2023-01-21 17:11:40 +01:00
league_sl.cpp
Fix #10214: Header and footer missing from league table saveload
2022-12-16 21:07:36 +01:00
linkgraph_sl.cpp
Change LinkGraph::EdgeMatrix to a sparse storage format
2022-12-05 18:17:25 +00:00
map_sl.cpp
Codechange: hide the map's size related fields in the Map structure
2023-01-21 17:11:40 +01:00
misc_sl.cpp
Fix 05ec32f5: Savegame load check of DATE chunk
2023-02-10 18:16:00 +00:00
newgrf_sl.cpp
GRF: Extend EntityIDMapping/OverrideManagerBase to 16 bit entity IDs
2023-02-11 00:30:40 +00:00
newgrf_sl.h
Codechange: Use a common sub-class for NewGRFMapping chunks
2021-07-06 22:29:08 +02:00
newsignals_sl.cpp
Store signal style GRF to local map in savegame
2022-06-25 14:33:47 +01:00
object_sl.cpp
Codechange: Use a common sub-class for NewGRFMapping chunks
2021-07-06 22:29:08 +02:00
oldloader_sl.cpp
Merge branch 'master' into jgrpp
2023-02-10 17:19:35 +00:00
oldloader.cpp
Merge branch 'master' into jgrpp-beta
2021-10-18 18:01:27 +01:00
oldloader.h
…
order_sl.cpp
Add slot support to road vehicles, ships and aircraft
2022-01-19 00:10:49 +00:00
plans_sl.cpp
Merge branch 'master' into jgrpp-beta
2021-10-25 18:10:15 +01:00
saveload_buffer.h
…
saveload_common.h
Merge branch 'master' into jgrpp
2023-01-02 01:23:36 +00:00
saveload_filter.h
…
saveload_internal.h
Remove road vehicles during load which are uncorrectably invalid
2022-08-07 20:00:40 +01:00
saveload_types.h
Add support for loading trunk savegames versions 293 - 299 (12.0)
2021-11-01 18:33:39 +00:00
saveload.cpp
Codechange: do not declare functions in blocks
2023-01-29 20:28:45 +01:00
saveload.h
Codechange: do not declare functions in blocks
2023-01-29 20:28:45 +01:00
signal_sl.cpp
Merge branch 'master' into jgrpp-beta
2021-10-25 18:10:15 +01:00
signs_sl.cpp
Merge branch 'master' into jgrpp-beta
2021-10-25 18:10:15 +01:00
station_sl.cpp
Fix: comparison of narrow type with wide type in loop condition
2023-01-06 19:34:35 +01:00
storage_sl.cpp
Codechange: Use ChunkHandlers sub-classes
2021-07-06 22:29:08 +02:00
story_sl.cpp
Codechange: Use ChunkHandlers sub-classes
2021-07-06 22:29:08 +02:00
strings_sl.cpp
Codechange: Use ChunkHandlers sub-classes
2021-07-06 22:29:08 +02:00
subsidy_sl.cpp
Merge branch 'master' into jgrpp-beta
2021-10-25 18:10:15 +01:00
tbtr_template_replacement_sl.cpp
Merge branch 'master' into jgrpp-beta
2021-10-25 18:10:15 +01:00
tbtr_template_veh_sl.cpp
Template replacement: Allow naming templates
2023-02-06 23:48:46 +00:00
town_sl.cpp
Codechange: migrate size related functions to Map structure
2023-01-21 17:11:40 +01:00
tracerestrict_sl.cpp
Tracerestrict: Programs maintain a list of signals referencing them
2022-06-11 22:15:19 +01:00
train_speed_adaptation.cpp
Implement train speed adaptation on signalled tunnels/bridges
2022-02-21 18:57:50 +00:00
tunnel_sl.cpp
Initial implementation of NewGRF custom signal styles
2022-06-19 02:08:38 +01:00
vehicle_sl.cpp
Merge branch 'master' into jgrpp
2023-01-15 19:28:37 +00:00
waypoint_sl.cpp
Codechange: migrate size related functions to Map structure
2023-01-21 17:11:40 +01:00