Jonathan G Rennison
|
041e71ec05
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/crashlog.cpp
# src/gfx.cpp
# src/network/network_client.cpp
# src/openttd.cpp
# src/openttd.h
# src/saveload/saveload.cpp
# src/survey.cpp
|
2 months ago |
Patric Stout
|
3e625b5b1a
|
Add: track savegame size to report with survey (#12304)
|
2 months ago |
|
Jonathan G Rennison
|
1ba9806002
|
Add case parameter to FormatArrayAsHex
Use upper case where needed for vanilla compatibility
|
3 months ago |
|
Jonathan G Rennison
|
86a6f63e2f
|
Merge branch 'master' into jgrpp
# Conflicts:
# .github/workflows/ci-build.yml
# .github/workflows/codeql.yml
# .github/workflows/commit-checker.yml
# .github/workflows/release-linux-legacy.yml
# .github/workflows/release-linux.yml
# .github/workflows/release-macos.yml
# .github/workflows/release-windows-store.yml
# .github/workflows/release-windows.yml
# .github/workflows/upload-cdn.yml
# .github/workflows/upload-gog.yml
# .github/workflows/upload-steam.yml
# src/console_cmds.cpp
# src/core/math_func.hpp
# src/fios.cpp
# src/fios.h
# src/intro_gui.cpp
# src/network/network_server.cpp
# src/openttd.cpp
# src/settings.cpp
# src/settings_gui.cpp
# src/settings_internal.h
# src/settings_table.cpp
# src/settings_type.h
# src/table/settings.h.preamble
# src/table/settings/company_settings.ini
# src/table/settings/currency_settings.ini
# src/table/settings/difficulty_settings.ini
# src/table/settings/economy_settings.ini
# src/table/settings/game_settings.ini
# src/table/settings/gui_settings.ini
# src/table/settings/linkgraph_settings.ini
# src/table/settings/locale_settings.ini
# src/table/settings/misc_settings.ini
# src/table/settings/multimedia_settings.ini
# src/table/settings/network_private_settings.ini
# src/table/settings/network_settings.ini
# src/table/settings/news_display_settings.ini
# src/table/settings/old_gameopt_settings.ini
# src/table/settings/pathfinding_settings.ini
# src/table/settings/script_settings.ini
# src/table/settings/win32_settings.ini
# src/table/settings/window_settings.ini
# src/table/settings/world_settings.ini
# src/viewport.cpp
# src/viewport_func.h
# src/window.cpp
|
3 months ago |
|
Jonathan G Rennison
|
7ce06e22b8
|
Split date types into calendar and economy dates
See: 735abfe1
|
3 months ago |
|
Jonathan G Rennison
|
2f1d2a9f4b
|
Survey: Don't transmit invalid realtime duration
|
3 months ago |
|
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
|
4 months ago |
|
Patric Stout
|
d3b2a576de
|
Feature: Plugin framework for Social Integration with Steam, Discord, GOG, etc (#11628)
|
4 months ago |
Tyler Trahan
|
735abfe111
|
Codechange: Split dates and timers into Economy and Calendar time (#10700)
|
4 months ago |
|
Patric Stout
|
fd073a2810
|
Remove: replace custom span with std::span
|
4 months ago |
|
Jonathan G Rennison
|
19a8b7b445
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/os/windows/library_loader_win.cpp
|
4 months ago |
|
Jonathan G Rennison
|
b3f31a6523
|
Fix #11696: Graphics set parameters missing from survey data (#11764)
|
4 months ago |
|
Jonathan G Rennison
|
479490d7e8
|
Codechange: Remove unnecessary vector for writing GRF parameter JSON (#11763)
|
4 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)
|
5 months ago |
|
Patric Stout
|
37e2f99c09
|
Change: store crash logs in JSON format (#11232)
|
8 months ago |