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
|
2024-01-25 18:37:23 +00:00 |
|
Patric Stout
|
fd073a2810
|
Remove: replace custom span with std::span
|
2024-01-17 00:25:08 +01:00 |
|
Jonathan G Rennison
|
19a8b7b445
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/os/windows/library_loader_win.cpp
|
2024-01-14 12:53:24 +00:00 |
|
Jonathan G Rennison
|
b3f31a6523
|
Fix #11696: Graphics set parameters missing from survey data (#11764)
|
2024-01-12 21:53:31 +00:00 |
|
Jonathan G Rennison
|
479490d7e8
|
Codechange: Remove unnecessary vector for writing GRF parameter JSON (#11763)
|
2024-01-12 21:38:31 +00:00 |
|
Jonathan G Rennison
|
9718c51ef4
|
Survey: Add clang and zstd
|
2024-01-06 17:37:09 +00:00 |
|
Jonathan G Rennison
|
b23077b08c
|
Survey: Update to match upstream
|
2024-01-05 22:35:20 +00:00 |
|
Peter Nelson
|
33ff64ef74
|
Codechange: Simplify ConvertDateToYMD by returning YearMonthDay instead of outputting to a pointer. (#11637)
|
2023-12-28 21:34:08 +00:00 |
|
Patric Stout
|
37e2f99c09
|
Change: store crash logs in JSON format (#11232)
|
2023-09-14 20:13:27 +02:00 |
|