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 0d4d4a9cac Merge branch 'master' into jgrpp
# Conflicts:
#	cmake/CompileFlags.cmake
#	src/3rdparty/squirrel/squirrel/sqclosure.h
#	src/3rdparty/squirrel/squirrel/sqobject.h
#	src/3rdparty/squirrel/squirrel/sqvm.h
#	src/aircraft.h
#	src/airport_gui.cpp
#	src/blitter/32bpp_sse_func.hpp
#	src/blitter/null.hpp
#	src/bridge_gui.cpp
#	src/build_vehicle_gui.cpp
#	src/cargotype.h
#	src/cheat_gui.cpp
#	src/command.cpp
#	src/command_func.h
#	src/company_gui.cpp
#	src/console_gui.cpp
#	src/date_gui.cpp
#	src/depot_gui.cpp
#	src/dock_gui.cpp
#	src/economy.cpp
#	src/error_gui.cpp
#	src/fileio.cpp
#	src/fios.cpp
#	src/fios_gui.cpp
#	src/fontcache/spritefontcache.h
#	src/framerate_gui.cpp
#	src/game/game_text.cpp
#	src/gamelog.cpp
#	src/genworld_gui.cpp
#	src/gfx_layout_fallback.cpp
#	src/group_gui.cpp
#	src/highscore_gui.cpp
#	src/hotkeys.cpp
#	src/industry_cmd.cpp
#	src/industry_gui.cpp
#	src/landscape.cpp
#	src/main_gui.cpp
#	src/misc_cmd.cpp
#	src/misc_gui.cpp
#	src/network/core/tcp_game.cpp
#	src/network/core/udp.cpp
#	src/network/network_chat_gui.cpp
#	src/network/network_content_gui.cpp
#	src/network/network_gui.cpp
#	src/network/network_server.cpp
#	src/network/network_server.h
#	src/newgrf_airport.cpp
#	src/newgrf_airport.h
#	src/newgrf_airporttiles.cpp
#	src/newgrf_airporttiles.h
#	src/newgrf_animation_base.h
#	src/newgrf_canal.cpp
#	src/newgrf_commons.h
#	src/newgrf_config.cpp
#	src/newgrf_debug_gui.cpp
#	src/newgrf_engine.cpp
#	src/newgrf_engine.h
#	src/newgrf_generic.cpp
#	src/newgrf_gui.cpp
#	src/newgrf_house.cpp
#	src/newgrf_house.h
#	src/newgrf_industries.cpp
#	src/newgrf_industries.h
#	src/newgrf_industrytiles.cpp
#	src/newgrf_industrytiles.h
#	src/newgrf_object.cpp
#	src/newgrf_object.h
#	src/newgrf_railtype.cpp
#	src/newgrf_railtype.h
#	src/newgrf_roadstop.cpp
#	src/newgrf_roadstop.h
#	src/newgrf_roadtype.cpp
#	src/newgrf_roadtype.h
#	src/newgrf_spritegroup.cpp
#	src/newgrf_spritegroup.h
#	src/newgrf_station.cpp
#	src/newgrf_station.h
#	src/newgrf_town.cpp
#	src/newgrf_town.h
#	src/news_gui.cpp
#	src/object_gui.cpp
#	src/order_gui.cpp
#	src/os/macosx/crashlog_osx.cpp
#	src/os/unix/crashlog_unix.cpp
#	src/os/windows/crashlog_win.cpp
#	src/os/windows/win32.cpp
#	src/os/windows/win32_main.cpp
#	src/pathfinder/npf/npf.cpp
#	src/pathfinder/npf/queue.cpp
#	src/rail_cmd.cpp
#	src/rail_gui.cpp
#	src/road_gui.cpp
#	src/roadveh.h
#	src/saveload/saveload.cpp
#	src/screenshot.cpp
#	src/script/api/script_text.hpp
#	src/settings.cpp
#	src/settings_gui.cpp
#	src/settings_internal.h
#	src/settings_table.cpp
#	src/signs_cmd.cpp
#	src/signs_gui.cpp
#	src/smallmap_gui.cpp
#	src/smallmap_gui.h
#	src/spriteloader/grf.hpp
#	src/station_cmd.cpp
#	src/station_gui.cpp
#	src/station_map.h
#	src/statusbar_gui.cpp
#	src/stdafx.h
#	src/strgen/strgen.cpp
#	src/table/newgrf_debug_data.h
#	src/terraform_gui.cpp
#	src/timer/timer_game_calendar.cpp
#	src/timer/timer_window.cpp
#	src/town.h
#	src/town_cmd.cpp
#	src/town_gui.cpp
#	src/train_gui.cpp
#	src/transparency_gui.cpp
#	src/vehicle_gui.cpp
#	src/water_cmd.cpp
#	src/waypoint_cmd.cpp
#	src/widget.cpp
#	src/widget_type.h
#	src/widgets/dropdown.cpp
#	src/widgets/rail_widget.h
#	src/widgets/terraform_widget.h
#	src/window.cpp
#	src/window_gui.h
8 months ago
..
compat Fix b0e73277: save/load next_station for CargoPacket again 9 months ago
CMakeLists.txt
afterload.cpp Merge branch 'master' into jgrpp 8 months ago
ai_sl.cpp
airport_sl.cpp
animated_tile_sl.cpp
autoreplace_sl.cpp
cargomonitor_sl.cpp Codechange: automatic adding of _t to (u)int types, and WChar to char32_t 12 months ago
cargopacket_sl.cpp Fix: only count distance traveled in vehicles for cargo payment (#11283) 9 months ago
cheat_sl.cpp
company_sl.cpp Codechange: automatic adding of _t to (u)int types, and WChar to char32_t 12 months ago
depot_sl.cpp
economy_sl.cpp Codechange: automatic adding of _t to (u)int types, and WChar to char32_t 12 months ago
engine_sl.cpp Codechange: automatic adding of _t to (u)int types, and WChar to char32_t 12 months ago
game_sl.cpp Merge branch 'master' into jgrpp 8 months ago
gamelog_sl.cpp
goal_sl.cpp
group_sl.cpp
industry_sl.cpp Merge branch 'master' into jgrpp 8 months ago
labelmaps_sl.cpp Codechange: Rename *Railtype* to *RailType* for consistency. (#11287) 10 months ago
league_sl.cpp
linkgraph_sl.cpp Codechange: automatic adding of _t to (u)int types, and WChar to char32_t 12 months ago
map_sl.cpp Codechange: make explicit when a TileIndex is cast to its basetype (#11190) 11 months ago
misc_sl.cpp Codechange: Delete date_type.h 10 months ago
newgrf_sl.cpp
newgrf_sl.h Codechange: automatic adding of _t to (u)int types, and WChar to char32_t 12 months ago
object_sl.cpp
order_sl.cpp Merge branch 'master' into jgrpp 10 months ago
saveload.cpp Merge branch 'master' into jgrpp 8 months ago
saveload.h Merge branch 'master' into jgrpp 8 months ago
settings_sl.cpp Split save/load settings into separate INI files 8 months ago
signs_sl.cpp
station_sl.cpp Merge branch 'master' into jgrpp 8 months ago
storage_sl.cpp
story_sl.cpp Codechange: automatic adding of _t to (u)int types, and WChar to char32_t 12 months ago
subsidy_sl.cpp
town_sl.cpp Merge branch 'master' into jgrpp 8 months ago
vehicle_sl.cpp Codechange: simplify splitting of CargoPacket (#11286) 9 months ago