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 ba79f7b2ba Merge branch 'master' into jgrpp
# Conflicts:
#	src/base_station_base.h
#	src/newgrf_roadstop.cpp
#	src/newgrf_station.cpp
#	src/object_gui.cpp
#	src/saveload/settings_sl.cpp
#	src/saveload/station_sl.cpp
#	src/settings.cpp
#	src/settings_internal.h
#	src/timer/timer_game_calendar.cpp
3 months ago
..
compat Revert #11993: new number format system does not and cannot work for CJK languages 3 months ago
CMakeLists.txt Merge branch 'master' into jgrpp 3 months ago
afterload.cpp Fix desync after joining a server with flood_from_edges setting enabled 3 months ago
ai_sl.cpp Merge branch 'master' into jgrpp 3 months ago
airport_sl.cpp
animated_tile_sl.cpp Adding of _t to (u)int types, and WChar to char32_t 5 months ago
autoreplace_sl.cpp
cargomonitor_sl.cpp Adding of _t to (u)int types, and WChar to char32_t 5 months ago
cargopacket_sl.cpp
cheat_sl.cpp
company_sl.cpp Merge branch 'master' into jgrpp 4 months ago
depot_sl.cpp
economy_sl.cpp
engine_sl.cpp Codechange: coding style fixes 5 months ago
game_sl.cpp Merge branch 'master' into jgrpp 3 months ago
gamelog_sl.cpp Use upstream/table format for game log chunk 4 months ago
goal_sl.cpp
group_sl.cpp
industry_sl.cpp Split date types into calendar and economy dates 4 months ago
labelmaps_sl.cpp Adding of _t to (u)int types, and WChar to char32_t 5 months ago
league_sl.cpp
linkgraph_sl.cpp Change link graph join and compression times to use scaled tick counter 4 months ago
map_sl.cpp Adding of _t to (u)int types, and WChar to char32_t 5 months ago
misc_sl.cpp Split date types into calendar and economy dates 4 months ago
newgrf_sl.cpp
newgrf_sl.h Adding of _t to (u)int types, and WChar to char32_t 5 months ago
object_sl.cpp
order_sl.cpp Adding of _t to (u)int types, and WChar to char32_t 5 months ago
randomizer_sl.cpp Merge branch 'master' into jgrpp 3 months ago
saveload.cpp Merge branch 'master' into jgrpp 3 months ago
saveload.h Merge branch 'master' into jgrpp 3 months ago
settings_sl.cpp Merge branch 'master' into jgrpp 3 months ago
signs_sl.cpp
station_sl.cpp Merge branch 'master' into jgrpp 3 months ago
storage_sl.cpp
story_sl.cpp Use upstream save/load for various unchanged chunks 3 months ago
subsidy_sl.cpp
town_sl.cpp Merge tag '14.0-beta2' into jgrpp 3 months ago
vehicle_sl.cpp Change: Use bitmap for free unit ID generation. (#12165) 3 months ago
water_regions_sl.cpp Merge branch 'master' into jgrpp 4 months ago