Emil Axelsson d7cd3a01a5 Merge branch 'develop' of github.com:OpenSpace/OpenSpace into pr/kameleonvolume ...

Conflicts:
	src/engine/openspaceengine.cpp

2017-03-03 18:08:29 +01:00

..

rendering

Move the PropertyOwner name specification into the constructor and adjust accordingly

2017-03-02 18:25:13 -05:00

rotation

- Remove documentation.h include and replace with forward declaration

2017-03-01 18:13:15 -05:00

scale

- Remove documentation.h include and replace with forward declaration

2017-03-01 18:13:15 -05:00

shaders

Code cleanup

2017-02-27 23:03:07 -05:00

translation

- Remove documentation.h include and replace with forward declaration

2017-03-01 18:13:15 -05:00

basemodule.cpp

- Remove documentation.h include and replace with forward declaration

2017-03-01 18:13:15 -05:00

basemodule.h

Jenkins compilation fix

2017-03-02 18:50:11 +01:00

CMakeLists.txt

Code cleanup

2017-02-27 23:03:07 -05:00

include.cmake

Getting a running version of modularized cmakelists up and running

2015-05-23 02:03:06 +02:00