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		2024-02-15 23:49:11 +00:00
..
codeql	Codechange: [CodeQL] Disable CodeQL check on trivial switch statements (#10537)	2023-03-26 09:35:44 +02:00
ISSUE_TEMPLATE	Merge branch 'master' into jgrpp-beta	2021-11-01 18:54:43 +00:00
workflows	Merge branch 'master' into jgrpp	2024-02-15 23:49:11 +00:00
changelog.sh	Fix: [Actions] changelog assumed major.minor.patch versioning (#9482)	2021-08-15 14:14:13 +02:00
FUNDING.yml
PULL_REQUEST_TEMPLATE.md	Doc: 'game_changelog.hpp' not 'gs_changelog.hpp' in GitHub PR template (#11147)	2023-07-19 11:43:24 +02:00
script-missing-mode-enforcement.py	Change: Allow GS access to ScriptGroup functions	2023-04-17 17:59:16 +02:00
unused-strings.py	Add: workflow and script for checking missing mode enforcements	2023-03-08 22:33:47 +01:00