Jonathan G Rennison 5b7db9d849 Merge branch 'master' into jgrpp ...

# Conflicts:
#	.github/workflows/ci-build.yml
#	.github/workflows/commit-checker.yml
#	src/command.cpp
#	src/company_cmd.cpp
#	src/company_gui.cpp
#	src/crashlog.cpp
#	src/economy.cpp
#	src/lang/english.txt
#	src/lang/german.txt
#	src/lang/korean.txt
#	src/misc_gui.cpp
#	src/newgrf_config.cpp
#	src/openttd.cpp
#	src/settings_gui.cpp
#	src/ship_cmd.cpp
#	src/table/settings/gui_settings.ini

2022-05-15 13:54:13 +01:00

..

CMakeLists.txt

Add: [OSX] OpenGL video driver.

2021-02-22 22:16:07 +01:00

cocoa_keys.h

Fix: VkMapping declarations violated C++ ODR rule.

2021-02-14 23:19:50 +01:00

cocoa_ogl.h

Add: Show current video driver info in Options window

2022-05-03 21:03:30 +02:00

cocoa_ogl.mm

Merge branch 'master' into jgrpp

2022-05-15 13:54:13 +01:00

cocoa_v.h

Fix #9743: [OSX] Only (re-)create touchbar sprites when requested by the main loop.

2022-01-01 12:19:30 +01:00

cocoa_v.mm

Merge branch 'master' into jgrpp

2022-01-04 17:42:36 +00:00

cocoa_wnd.h

Disable OSX touchbar support, fixes #358

2022-01-15 18:56:59 +00:00

cocoa_wnd.mm

Fix #365: Unused function warning on Mac OSX

2022-01-31 02:22:09 +00:00