Malin E e075f8ae82 Merge branch 'master' into feature/multiple-joysticks ...

* Solve conflicts in navigationhandler.cpp

2021-11-12 09:51:05 +01:00

..

cmake

Update CEF download to new Spotify link

2021-01-27 14:06:40 +01:00

include

Feature/keybindings (#1708)

2021-08-18 10:58:20 +02:00

mac

Feature/cef cmake (#873)

2019-05-18 22:50:00 +02:00

shaders

Coding style pass on shader code

2021-01-02 21:11:13 +01:00

src

Split InputState into MouseInputState and KeyboardInputState

2021-11-03 15:28:37 +01:00

.gitignore

…

cef_webgui.rc

…

CMakeLists.txt

Fix issue where the CEF libraries would not be copied to the bin folder

2021-01-12 11:26:00 +01:00

codegentest.exe.manifest

Feature/codegen (#1480)

2021-02-09 09:12:43 +01:00

compatibility.manifest

…

include.cmake

Feature/cef speedup (#806)

2019-04-24 10:53:46 +02:00

openspace Helper.exe.manifest

Feature/cef speedup (#806)

2019-04-24 10:53:46 +02:00

OpenSpace.exe.manifest

…

OpenSpaceTest.exe.manifest

Feature/webgui ops (#723)

2018-11-05 20:45:38 -05:00

resource.h

…

Sync.exe.manifest

Feature/webgui ops (#723)

2018-11-05 20:45:38 -05:00

TaskRunner.exe.manifest

Feature/webgui ops (#723)

2018-11-05 20:45:38 -05:00

Tester.exe.manifest

Remove the user data from the Lua function definition

2021-11-04 16:27:54 +01:00

webbrowsermodule.cpp

Feature/cleanup (#1608)

2021-05-25 14:08:33 +02:00

webbrowsermodule.h

Feature/cleanup (#1608)

2021-05-25 14:08:33 +02:00

Wormhole.exe.manifest

Feature/webgui ops (#723)

2018-11-05 20:45:38 -05:00