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.

Jonathan G Rennison 55d78a23be Merge branch 'master' into jgrpp ... # Conflicts: # src/3rdparty/squirrel/include/squirrel.h # src/blitter/32bpp_sse_func.hpp # src/bridge_map.h # src/clear_map.h # src/company_manager_face.h # src/console_func.h # src/core/bitmath_func.hpp # src/core/endian_func.hpp # src/core/random_func.hpp # src/depot_map.h # src/elrail_func.h # src/fontcache.h # src/industry_map.h # src/map_func.h # src/newgrf_spritegroup.h # src/object_map.h # src/rail.h # src/rail_map.h # src/road_func.h # src/road_map.h # src/saveload/saveload.h # src/saveload/saveload_error.hpp # src/settings_gui.cpp # src/sl/oldloader.h # src/sprite.h # src/spritecache.h # src/station_func.h # src/station_map.h # src/story_base.h # src/strings_func.h # src/tile_cmd.h # src/tile_map.h # src/tile_type.h # src/town.h # src/town_map.h # src/tree_map.h # src/tunnel_map.h # src/tunnelbridge_map.h # src/vehicle_func.h # src/viewport_func.h # src/void_map.h # src/water.h # src/water_map.h # src/widget_type.h		5 months ago
..
compat	Fix b0e73277: save/load next_station for CargoPacket again	8 months ago
CMakeLists.txt	Move upstream saveload to src/saveload/, move jgrpp saveload to src/sl/	12 months ago
afterload.cpp	Merge branch 'master' into jgrpp	5 months ago
ai_sl.cpp	Merge branch 'master' into jgrpp	11 months ago
airport_sl.cpp	Move upstream saveload to src/saveload/, move jgrpp saveload to src/sl/	12 months ago
animated_tile_sl.cpp	Merge branch 'master' into jgrpp	11 months ago
autoreplace_sl.cpp	Move upstream saveload to src/saveload/, move jgrpp saveload to src/sl/	12 months ago
cargomonitor_sl.cpp	Codechange: automatic adding of _t to (u)int types, and WChar to char32_t	11 months ago
cargopacket_sl.cpp	Codechange: Use iterators and/or range-for on cargo related loops.	8 months ago
cheat_sl.cpp	Merge branch 'master' into jgrpp	6 months ago
company_sl.cpp	Codechange: automatic adding of _t to (u)int types, and WChar to char32_t	11 months ago
depot_sl.cpp	Move upstream saveload to src/saveload/, move jgrpp saveload to src/sl/	12 months ago
economy_sl.cpp	Codechange: automatic adding of _t to (u)int types, and WChar to char32_t	11 months ago
engine_sl.cpp	Codechange: coding style fixes	5 months ago
game_sl.cpp	Merge branch 'master' into jgrpp	6 months ago
gamelog_sl.cpp	Codechange: do not make a string valid in place, to then copy it	11 months ago
goal_sl.cpp	Move upstream saveload to src/saveload/, move jgrpp saveload to src/sl/	12 months ago
group_sl.cpp	Move upstream saveload to src/saveload/, move jgrpp saveload to src/sl/	12 months ago
industry_sl.cpp	Merge branch 'master' into jgrpp	7 months ago
labelmaps_sl.cpp	Codechange: Rename *Railtype* to *RailType* for consistency. (#11287)	9 months ago
league_sl.cpp	Move upstream saveload to src/saveload/, move jgrpp saveload to src/sl/	12 months ago
linkgraph_sl.cpp	Link graph: Fix incorrect job start/join dates when loading upstream saves	6 months ago
map_sl.cpp	Codechange: make explicit when a TileIndex is cast to its basetype (#11190)	10 months ago
misc_sl.cpp	Strong typedef: Use strong typedefs for date, date tick, minutes types	6 months ago
newgrf_sl.cpp	Change gamelog to use std::vector	11 months ago
newgrf_sl.h	Codechange: automatic adding of _t to (u)int types, and WChar to char32_t	11 months ago
object_sl.cpp	Move upstream saveload to src/saveload/, move jgrpp saveload to src/sl/	12 months ago
order_sl.cpp	Merge branch 'master' into jgrpp	5 months ago
saveload.cpp	Merge branch 'master' into jgrpp	5 months ago
saveload.h	Merge branch 'master' into jgrpp	5 months ago
settings_sl.cpp	Split save/load settings into separate INI files	7 months ago
signs_sl.cpp	Move upstream saveload to src/saveload/, move jgrpp saveload to src/sl/	12 months ago
station_sl.cpp	Merge branch 'master' into jgrpp	6 months ago
storage_sl.cpp	Move upstream saveload to src/saveload/, move jgrpp saveload to src/sl/	12 months ago
story_sl.cpp	Codechange: automatic adding of _t to (u)int types, and WChar to char32_t	11 months ago
subsidy_sl.cpp	Move upstream saveload to src/saveload/, move jgrpp saveload to src/sl/	12 months ago
town_sl.cpp	Merge branch 'master' into jgrpp	6 months ago
vehicle_sl.cpp	Merge branch 'master' into jgrpp	6 months ago