Commit Graph

23 Commits (838b166726dc7f41f4c6fadfe3726716c1d409b1)

Author SHA1 Message Date
Jonathan G Rennison 838b166726 Merge branch 'master' into jgrpp
# Conflicts:
#	src/cheat_gui.cpp
#	src/command.cpp
#	src/command_func.h
#	src/company_base.h
#	src/debug.cpp
#	src/debug.h
#	src/economy.cpp
#	src/engine_type.h
#	src/graph_gui.cpp
#	src/misc_cmd.cpp
#	src/misc_cmd.h
#	src/network/core/os_abstraction.cpp
#	src/openttd.cpp
#	src/saveload/saveload.cpp
#	src/saveload/saveload.h
#	src/settings_type.h
#	src/ship_cmd.cpp
#	src/stdafx.h
#	src/tests/bitmath_func.cpp
#	src/town_cmd.cpp
#	src/town_gui.cpp
4 months ago
Jonathan G Rennison 7ce06e22b8 Split date types into calendar and economy dates
See: 735abfe1
4 months ago
Jonathan G Rennison b05738284b Windows: Avoid destruction of unjoined std::thread on ExitProcess
See: #649
4 months ago
Jonathan G Rennison 195b3b6d1d Saveload: Add initial table chunk support to non-upstream save backend 4 months ago
Jonathan G Rennison 936d636cdd No longer save/load water region invalidation states
Move InitializeWaterRegions to AllocateMap
No longer ForceUpdate in InitializeWaterRegions
5 months ago
Jonathan G Rennison 914b92b21f Merge branch 'master' into jgrpp
Bump savegame for water regions for ship pathfinder
Use ring_buffer for ShipPathCache
5 months ago
Jonathan G Rennison 97e6f3062e Adding of _t to (u)int types, and WChar to char32_t
See: eaae0bb5e
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 2e9cb16254 Saveload: Simplify list handling in SlRefList
Use reserve on load if suitable
6 months ago
Jonathan G Rennison 378a545dd4 Add setting for map edge behaviour, and how to display area outside map 6 months ago
Jonathan G Rennison 4689113553 Debug: De-duplicate formatting of hex dates for desync/random logging 6 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 5f08bde936 Saveload: Remove runtime IsVariableSizeRight check 6 months ago
Jonathan G Rennison ea3b991f72 MinGW: Remove direct mingw-std-threads includes 6 months ago
Jonathan G Rennison 9c29950956 Show savegame version/info in load window if sl debug enabled 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 f6e8ea059d Create fio wrapper for rename file 11 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 0bf41dc1ff Change gamelog to use std::vector
Move LoadCheckData to its own header
12 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