Commit Graph

9 Commits (822ecae85da730908f40b7ef31bead16ccae9a5b)

Author SHA1 Message Date
Jonathan G Rennison 822ecae85d Merge branch 'master' into jgrpp
# Conflicts:
#	src/cargotype.h
#	src/core/CMakeLists.txt
#	src/core/span_type.hpp
#	src/fileio.cpp
#	src/fios.cpp
#	src/misc/endian_buffer.hpp
#	src/misc_gui.cpp
#	src/saveload/saveload.h
#	src/saveload/vehicle_sl.cpp
#	src/screenshot.cpp
#	src/settings.cpp
#	src/settings_internal.h
#	src/stdafx.h
#	src/string_func.h
#	src/strings.cpp
#	src/strings_func.h
#	src/strings_internal.h
5 months ago
Patric Stout fd073a2810 Remove: replace custom span with std::span 5 months ago
Jonathan G Rennison 19a8b7b445 Merge branch 'master' into jgrpp
# Conflicts:
#	src/os/windows/library_loader_win.cpp
5 months ago
Jonathan G Rennison b3f31a6523
Fix #11696: Graphics set parameters missing from survey data (#11764) 5 months ago
Jonathan G Rennison 479490d7e8
Codechange: Remove unnecessary vector for writing GRF parameter JSON (#11763) 5 months ago
Jonathan G Rennison 9718c51ef4 Survey: Add clang and zstd 5 months ago
Jonathan G Rennison b23077b08c Survey: Update to match upstream 5 months ago
Peter Nelson 33ff64ef74
Codechange: Simplify ConvertDateToYMD by returning YearMonthDay instead of outputting to a pointer. (#11637) 6 months ago
Patric Stout 37e2f99c09
Change: store crash logs in JSON format (#11232) 9 months ago