Ylva Selling f6763eeeeb Merge branch 'master' into thesis/2021/skybrowser ...

# Conflicts:
#	modules/webbrowser/CMakeLists.txt

2022-04-04 16:14:50 -04:00

..

cmake

update cef and a few calls for it (#1916)

2022-03-29 13:09:13 -04:00

include

update cef and a few calls for it (#1916)

2022-03-29 13:09:13 -04:00

mac

Feature/cef cmake (#873)

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

shaders

Happy new year

2022-01-01 12:32:55 +01:00

src

update cef and a few calls for it (#1916)

2022-03-29 13:09:13 -04:00

.gitignore

Feature/thesis work merge (#566)

2018-03-20 09:30:59 +01:00

cef_webgui.rc

Feature/thesis work merge (#566)

2018-03-20 09:30:59 +01:00

CMakeLists.txt

update cef and a few calls for it (#1916)

2022-03-29 13:09:13 -04:00

codegentest.exe.manifest

Feature/codegen (#1480)

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

compatibility.manifest

Feature/thesis work merge (#566)

2018-03-20 09:30:59 +01:00

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

Feature/thesis work merge (#566)

2018-03-20 09:30:59 +01:00

OpenSpaceTest.exe.manifest

Feature/webgui ops (#723)

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

resource.h

Feature/thesis work merge (#566)

2018-03-20 09:30:59 +01:00

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

Adapt to new auto coding style

2022-02-10 15:20:21 +01:00

webbrowsermodule.h

Happy new year

2022-01-01 12:32:55 +01:00

Wormhole.exe.manifest

Feature/webgui ops (#723)

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