You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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		4 months ago
..
scripts	Merge branch 'master' into jgrpp	5 months ago
AddCustomXXXTimestamp.cmake	Codechange: Make codestyle for CMake files consistent for 'control' statements	4 years ago
Catch.cmake	Add: catch2 v2.13.10	10 months ago
CatchAddTests.cmake	Add: catch2 v2.13.10	10 months ago
CheckAtomic.cmake	CMake: Use openttd_lib split build from upstream	6 months ago
CompileFlags.cmake	Merge branch 'master' into jgrpp	5 months ago
CreateGrfCommand.cmake	Change: [CMake] Use explicit list for grf source files (#11539)	7 months ago
CreateRegression.cmake	Change: [CMake] Use explicit list for regression (#11541)	7 months ago
Endian.cmake	Codechange: Make codestyle for CMake files consistent for 'control' statements	4 years ago
FindAllegro.cmake	Fix: [CMake] our allegro drivers use v4, so skip v5 if found (#8653)	3 years ago
FindBFD.cmake	cmake: Add options to disable setting -g1 when using unix or libbfd	5 months ago
FindBuiltins.cmake	CMake: Add builtins	4 years ago
FindDL.cmake	Crashlog: Unix: Use dladdr1 for symbol offset for addr2line	1 year ago
FindDbgHelp.cmake	CMake: Add DbgHelp define for MinGW	4 years ago
FindDemangle.cmake	CMake: Add libdl and demangle support	4 years ago
FindEditbin.cmake	Codechange: Make codestyle for CMake files consistent for 'control' statements	4 years ago
FindFluidsynth.cmake	Codechange: Make codestyle for CMake files consistent for 'control' statements	4 years ago
FindFontconfig.cmake	Codechange: Make codestyle for CMake files consistent for 'control' statements	4 years ago
FindGrfcodec.cmake	Change: When building NewGRFs, use grfid (from grfcodec) to calculate NewGRF MD5 hash. (#11492)	7 months ago
FindHarfbuzz.cmake	Feature: drop ICU-lx in favour of directly interfacing with harfbuzz	1 year ago
FindICU.cmake	Feature: drop ICU-lx in favour of directly interfacing with harfbuzz	1 year ago
FindIconv.cmake	Fix: remove remainining usages of FALSE in CMake files	4 years ago
FindLZO.cmake	Add: use breakpad to create crash.dmp on MacOS / Linux too (#11202)	10 months ago
FindMacUcontext.cmake	CMake: Add ucontext on Mac/OSX	4 years ago
FindPandoc.cmake	Change: Convert .md to .rtf for Windows/Mac packages	3 years ago
FindSSE.cmake	Codechange: Make codestyle for CMake files consistent for 'control' statements	4 years ago
FindSelfDbg.cmake	CMake: Add sigaction, sigaltstack, self dbg	4 years ago
FindSigaction.cmake	CMake: Add sigaction, sigaltstack, self dbg	4 years ago
FindSigaltstack.cmake	Unix: Fix CMake detection and setup of sigaltstack	10 months ago
FindUcontext.cmake	CMake: Add ucontext	4 years ago
FindXaudio2.cmake	Fix: [CMake] Don't detect XAudio2 if defines are missing	4 years ago
FindZSTD.cmake	Add: Support Zstandard(zstd) savegame compression	3 years ago
InstallAndPackage.cmake	Merge branch 'master' into jgrpp	6 months ago
LinkPackage.cmake	CMake: Use openttd_lib split build from upstream	6 months ago
MSVCFilters.cmake	Merge branch 'master' into jgrpp	2 years ago
Options.cmake	Feature: Plugin framework for Social Integration with Steam, Discord, GOG, etc (#11628)	5 months ago
PackageBundle.cmake	Fix: [bundle] custom launch.sh is no longer required for Mac OS	4 years ago
PackageDeb.cmake	CPack: Change debian package name, mark as conflicting with openttd	3 years ago
PackageNSIS.cmake	Add: create bundles via CPack	4 years ago
PackageRPM.cmake	Add: [CMake] support rpm for fedora and rhel (#9861)	2 years ago
SourceList.cmake	CMake: Use openttd_lib split build from upstream	6 months ago
Static.cmake	Codechange: Make codestyle for CMake files consistent for 'control' statements	4 years ago