Alexander Bock d628c1a667 Merge branch 'master' into feature/DU ...

# Conflicts:
#	data/scene/grids/grids.mod
#	ext/sgct

2017-10-17 17:09:37 -04:00

..

rendering

Merge branch 'master' into feature/DU

2017-10-17 17:09:37 -04:00

rotation

Remove Exhaustive parameter for documentation

2017-07-27 14:46:46 -04:00

scale

Feature/cmake cleanup (#381)

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

shaders

Factor ScreenSpaceImage into separate classes for local loading and online download (closes #296)

2017-10-10 14:16:55 -04:00

translation

Feature/cmake cleanup (#381)

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

basemodule.cpp

Factor ScreenSpaceImage into separate classes for local loading and online download (closes #296)

2017-10-10 14:16:55 -04:00

basemodule.h

Provide a static member variable Name for all OpenSpaceModules

2017-07-12 13:59:16 -04:00

CMakeLists.txt

Factor ScreenSpaceImage into separate classes for local loading and online download (closes #296)

2017-10-10 14:16:55 -04:00

include.cmake

…