Alexander Bock 1e9df1cb4b Merge branch 'master' into feature/profiles ...

# Conflicts:
#	include/openspace/scene/assetloader.h
#	src/scene/assetloader.cpp

2020-06-14 17:54:25 +02:00

..

ext/imgui

Update the copyright header to 2020

2020-02-10 21:51:01 +01:00

include

Made imgui handle touch input as the webgui does

2020-03-11 13:23:46 +01:00

shaders

Update the copyright header to 2020

2020-02-10 21:51:01 +01:00

src

Merge branch 'master' into feature/profiles

2020-06-14 17:54:25 +02:00

CMakeLists.txt

Update the copyright header to 2020

2020-02-10 21:51:01 +01:00

imguimodule.cpp

Cleaning up window delegate

2020-05-10 15:17:51 +02:00

imguimodule.h

Cleaning up window delegate

2020-05-10 15:17:51 +02:00

include.cmake

Feature/cmake cleanup (#381)

2017-08-14 09:38:32 -04:00