Jonathan G Rennison 32fe84cfdd Merge branch 'master' into jgrpp ...

# Conflicts:
#	src/clear_cmd.cpp
#	src/main_gui.cpp
#	src/saveload/newgrf_sl.cpp
#	src/water_cmd.cpp

2023-01-26 22:32:08 +00: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

2023-01-26 22:32:08 +00:00

cocoa_wnd.h

Revert "Disable OSX touchbar support, fixes #358"

2022-10-27 23:49:12 +01:00

cocoa_wnd.mm

Fix crash when launching game with non-default GUI scale in config

2022-12-06 18:29:55 +00:00