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

..

scripts

Merge branch 'master' into jgrpp

2024-01-12 18:57:14 +00:00

AddCustomXXXTimestamp.cmake

Codechange: Make codestyle for CMake files consistent for 'control' statements

2020-09-25 14:43:13 +01:00

Catch.cmake

Add: catch2 v2.13.10

2023-08-19 10:18:31 +01:00

CatchAddTests.cmake

Add: catch2 v2.13.10

2023-08-19 10:18:31 +01:00

CheckAtomic.cmake

CMake: Use openttd_lib split build from upstream

2023-12-13 18:01:54 +00:00

CompileFlags.cmake

Merge branch 'master' into jgrpp

2024-01-21 23:03:08 +00:00

CreateGrfCommand.cmake

Change: [CMake] Use explicit list for grf source files (#11539)

2023-12-04 16:41:02 +00:00

CreateRegression.cmake

Change: [CMake] Use explicit list for regression (#11541)

2023-12-05 15:37:53 +01:00

Endian.cmake

Codechange: Make codestyle for CMake files consistent for 'control' statements

2020-09-25 14:43:13 +01:00

FindAllegro.cmake

Fix: [CMake] our allegro drivers use v4, so skip v5 if found (#8653)

2021-02-07 12:54:02 +01:00

FindBFD.cmake

cmake: Add options to disable setting -g1 when using unix or libbfd

2024-01-24 23:17:53 +00:00

FindBuiltins.cmake

CMake: Add builtins

2020-06-28 21:57:02 +01:00

FindDbgHelp.cmake

CMake: Add DbgHelp define for MinGW

2020-07-01 00:25:50 +01:00

FindDemangle.cmake

CMake: Add libdl and demangle support

2020-06-28 21:57:02 +01:00

FindDL.cmake

Crashlog: Unix: Use dladdr1 for symbol offset for addr2line

2023-02-20 23:42:55 +00:00

FindEditbin.cmake

Codechange: Make codestyle for CMake files consistent for 'control' statements

2020-09-25 14:43:13 +01:00

FindFluidsynth.cmake

Codechange: Make codestyle for CMake files consistent for 'control' statements

2020-09-25 14:43:13 +01:00

FindFontconfig.cmake

Codechange: Make codestyle for CMake files consistent for 'control' statements

2020-09-25 14:43:13 +01:00

FindGrfcodec.cmake

Change: When building NewGRFs, use grfid (from grfcodec) to calculate NewGRF MD5 hash. (#11492)

2023-11-26 15:59:41 +00:00

FindHarfbuzz.cmake

Feature: drop ICU-lx in favour of directly interfacing with harfbuzz

2023-05-01 22:17:56 +02:00

FindIconv.cmake

Fix: remove remainining usages of FALSE in CMake files

2020-06-30 09:43:00 +01:00

FindICU.cmake

Feature: drop ICU-lx in favour of directly interfacing with harfbuzz

2023-05-01 22:17:56 +02:00

FindLZO.cmake

Add: use breakpad to create crash.dmp on MacOS / Linux too (#11202)

2023-08-20 17:16:08 +02:00

FindMacUcontext.cmake

CMake: Add ucontext on Mac/OSX

2020-06-28 21:57:02 +01:00

FindPandoc.cmake

Change: Convert .md to .rtf for Windows/Mac packages

2021-02-08 23:23:24 +00:00

FindSelfDbg.cmake

CMake: Add sigaction, sigaltstack, self dbg

2020-06-28 21:57:02 +01:00

FindSigaction.cmake

CMake: Add sigaction, sigaltstack, self dbg

2020-06-28 21:57:02 +01:00

FindSigaltstack.cmake

Unix: Fix CMake detection and setup of sigaltstack

2023-08-14 00:20:04 +01:00

FindSSE.cmake

Codechange: Make codestyle for CMake files consistent for 'control' statements

2020-09-25 14:43:13 +01:00

FindUcontext.cmake

CMake: Add ucontext

2020-06-28 21:57:02 +01:00

FindXaudio2.cmake

Fix: [CMake] Don't detect XAudio2 if defines are missing

2020-11-26 19:06:03 +00:00

FindZSTD.cmake

Add: Support Zstandard(zstd) savegame compression

2021-03-01 18:08:28 +00:00

InstallAndPackage.cmake

Merge branch 'master' into jgrpp

2023-12-17 00:37:16 +00:00

LinkPackage.cmake

CMake: Use openttd_lib split build from upstream

2023-12-13 18:01:54 +00:00

MSVCFilters.cmake

Merge branch 'master' into jgrpp

2022-10-03 20:32:26 +01:00

Options.cmake

Feature: Plugin framework for Social Integration with Steam, Discord, GOG, etc (#11628)

2024-01-22 19:22:45 +00:00

PackageBundle.cmake

Fix: [bundle] custom launch.sh is no longer required for Mac OS

2020-12-19 18:26:29 +01:00

PackageDeb.cmake

CPack: Change debian package name, mark as conflicting with openttd

2021-03-13 12:00:40 +00:00

PackageNSIS.cmake

Add: create bundles via CPack

2020-06-05 19:36:05 +02:00

PackageRPM.cmake

Add: [CMake] support rpm for fedora and rhel (#9861)

2022-04-19 02:11:42 +02:00

SourceList.cmake

CMake: Use openttd_lib split build from upstream

2023-12-13 18:01:54 +00:00

Static.cmake

Codechange: Make codestyle for CMake files consistent for 'control' statements

2020-09-25 14:43:13 +01:00