Commit Graph

13 Commits (55d78a23be3a64d53cf9519e6a1dad702e484da9)

Author SHA1 Message Date
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
Jonathan G Rennison f034714559 Use StringBuilder for GetString/GetStringWithArgs, as per upstream
Update dependent code as required
5 months ago
Jonathan G Rennison 03e0ec8276 Strong typedef: Use strong typedefs for date, date tick, minutes types
Add delta types
Adjust/add type conversion functions
Add various utility methods on types
Remove the various minute macros
Fix some minute conversion inconsistencies
6 months ago
Jonathan G Rennison fa29a3d606 Saveload: Increase compile-time checks for saveload arrays/primitive types 6 months ago
Jonathan G Rennison 3996161737 Saveload: Use static_assert to check size and general types of variables 6 months ago
Jonathan G Rennison 9197cf6be1 Add saveload helper for conditionally upstream chunks 7 months ago
Jonathan G Rennison 181eb6b6fe Saveload: Adjust flags for saving using upstream chunks 7 months ago
Jonathan G Rennison 23ad010d70 Replace remaining uses of std::deque with ring buffers
Cargo packet lists and associated save/load
10 months ago
Jonathan G Rennison e3021de408 Saveload: Add helper to conditionally save template functor 10 months ago
Jonathan G Rennison f378167951 Saveload: Change SlSaveToVector to be templated, add SlSaveToTempBuffer 10 months ago
Jonathan G Rennison c6c69fa3da Add setting for long-term autosaves
A second set of autosaves for whenever the main set wraps around to 0
11 months ago
Jonathan G Rennison d75c489466 Add various missing includes 11 months ago
Jonathan G Rennison ac2f9a21e8 Move upstream saveload to src/saveload/, move jgrpp saveload to src/sl/
Leave afterload in src/saveload/
1 year ago