Jonathan G Rennison
2f8e63e954
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/gfx.cpp
# src/lang/traditional_chinese.txt
# src/station_cmd.cpp
2 years ago
Michael Lutz
57b992717b
Codechange: Extend DrawSpriteToRgbaBuffer to work with 8bpp blitters.
2 years ago
Michael Lutz
69c8ed9965
Codechange: [OSX] Simplify touchbar button data definition.
2 years ago
Michael Lutz
b351cbe490
Fix #9743 : [OSX] Only (re-)create touchbar sprites when requested by the main loop.
2 years ago
Michael Lutz
f40e82a19d
Fix #9743 : [OSX] Don't try to render touchbar sprites with invalid zoom level.
2 years ago
Michael Lutz
80fc5fb46c
Change: [OSX] Allow touchbar usage on all supported OS versions.
...
Touchbar support was introduced in 10.12.2. There's no need to limit
support to 10.15+, as the convenience class NSButtonTouchBarItem is
easily replicated.
2 years ago
Jonathan G Rennison
9e946d4c5d
Merge branch 'master' into jgrpp-beta
...
# Conflicts:
# src/command.cpp
# src/console_cmds.cpp
# src/group_gui.cpp
# src/lang/catalan.txt
# src/lang/czech.txt
# src/lang/danish.txt
# src/lang/greek.txt
# src/lang/hungarian.txt
# src/lang/irish.txt
# src/lang/japanese.txt
# src/lang/luxembourgish.txt
# src/lang/norwegian_bokmal.txt
# src/lang/romanian.txt
# src/lang/russian.txt
# src/lang/serbian.txt
# src/lang/simplified_chinese.txt
# src/lang/slovak.txt
# src/lang/spanish_MX.txt
# src/lang/swedish.txt
# src/lang/tamil.txt
# src/lang/traditional_chinese.txt
# src/lang/turkish.txt
# src/lang/ukrainian.txt
# src/lang/vietnamese.txt
# src/network/network.cpp
# src/network/network_client.cpp
# src/network/network_func.h
# src/network/network_internal.h
# src/network/network_server.cpp
# src/network/network_server.h
# src/saveload/afterload.cpp
# src/saveload/newgrf_sl.cpp
# src/saveload/saveload.h
# src/script/script_instance.cpp
# src/toolbar_gui.cpp
# src/toolbar_gui.h
# src/vehicle_gui.cpp
# src/widgets/rail_widget.h
# src/widgets/vehicle_widget.h
# src/window.cpp
3 years ago
Jonathan G Rennison
62afd94b47
Merge branch 'master' into jgrpp-beta
...
# Conflicts:
# src/company_cmd.cpp
# src/economy.cpp
# src/lang/swedish.txt
# src/network/network_command.cpp
# src/news_gui.cpp
# src/saveload/saveload.h
# src/script/api/script_list.cpp
# src/video/cocoa/cocoa_v.mm
# src/video/sdl2_v.cpp
3 years ago
Danny de Bruijne
753b1d7e15
Feature: Add selected toolbar buttons to MacBook Pro Touch Bar
3 years ago
Michael Lutz
37116a7575
Codechange: [OSX] Remove old code that has no effect on current OSX versions.
3 years ago
Michael Lutz
0d5d3083bd
Codechange: [OSX] Use more exact enum names where introduced with the 10.12 SDK.
...
The enum values still have the exact same numerical values, but the 10.12
SDK introduced more explicit names (e.g. like NSEventTypeApplicationDefined
instead of NSApplicationDefined) for several enum constants.
Use them when available.
3 years ago
rubidium42
55a11710a6
Codechange: convert printf DEBUG statements to fmt Debug statements
3 years ago
Michael Lutz
25656a10cb
Fix #8808 : [OSX, OpenGL] Crash on switching blitters due to double-mapping the video buffer.
3 years ago
Patric Stout
6a8c461e38
Codechange: [OSX] GameLoop is really more like MainLoop
...
MainLoop() is used to bootstrap OSX, where later a callback is
done to GameLoop() to execute OpenTTD. All other video drivers
don't need that, so what is in GameLoop is in MainLoop for all
other drivers. This is rather confusing. So, instead, name
GameLoop MainLoopReal to be more in sync with the other drivers.
3 years ago
milek7
751f595bb6
Fix: VkMapping declarations violated C++ ODR rule.
3 years ago
Michael Lutz
f5555a6d26
Fix 9c872192: [OSX] Clear mouse button emulation flag.
3 years ago
Michael Lutz
e5c3253642
Add: [OSX] Setting to disable HiDPI graphics rendering.
3 years ago
Michael Lutz
0fc763bc55
Change: [OSX] Render screen in full native resolution on HiDPI displays.
3 years ago
Michael Lutz
acca56b6a5
Cleanup: [OSX] Improve some comments.
3 years ago
Michael Lutz
c78e559e88
Codechange: [OSX] Remove unused 'app active' flag.
3 years ago
Michael Lutz
9c8721922b
Fix: [OSX] An emulated right mouse down event has to be followed by right mouse up.
3 years ago
Michael Lutz
649ff5f9f9
Codechange: [OSX] Use relative mouse handling during scrolling.
3 years ago
Michael Lutz
063b90b97d
Codechange: [OSX] Move key event handling to our view.
3 years ago
Michael Lutz
f4bd54fedd
Codechange: [OSX] Move mouse event handling to our NSView.
3 years ago
Michael Lutz
bd42fc94cc
Codechange: [OSX] Move some things from video driver to our NSView.
3 years ago
Michael Lutz
965ce12947
Codechange: [OSX] Use newer mouse tracking API.
3 years ago
Michael Lutz
42af13c141
Codechange: [OSX] Split drawing into its own subview.
...
This allows the drawing backend code to be independent
of any event or command handling.
3 years ago
Michael Lutz
60f30036f1
Codechange: [OSX] Drain autoreleased objects in each game loop cycle.
3 years ago
Michael Lutz
8aaf4ea098
Codechange: [OSX] Split Window and back buffer creation in Cocoa video driver.
3 years ago
Michael Lutz
88f6c7a9f3
Codechange: [OSX] Fold remaining Cocoa video subdriver into the main driver.
3 years ago
Michael Lutz
4db7837d06
Codechange: [OSX] There is only one subdriver left, remove virtual dispatch.
3 years ago
Michael Lutz
4ce53cb851
Fix: [OSX] Quitting in fullscreen mode would loose the original window size.
...
This replicates the behaviour on e.g. Windows, which saves the original window size.
3 years ago
Michael Lutz
c860a247d3
Change: [OSX] Hide Dock and menu during fullscreen mode.
3 years ago
Michael Lutz
7bdaabf5f1
Cleanup: [OSX] Remove cargo cult back-buffer alpha setting on show/hide and instead simply initialise the buffer on allocation.
3 years ago
Michael Lutz
9ccef816f9
Codechange: [OSX] Re-arrange the OSX video driver code by combining all drawing code and moving the window/event handling to a different file.
...
This is just a code move/rename, not a functionality change.
3 years ago