Emil Axelsson 7da999c332 Merge branch 'develop' of github.com:OpenSpace/OpenSpace into pr/scenegraph-refactor ...

Conflicts:
	include/openspace/engine/openspaceengine.h
	src/engine/openspaceengine.cpp
	src/engine/settingsengine.cpp
	src/engine/syncengine.cpp
	src/interaction/interactionhandler.cpp
	src/rendering/renderengine.cpp
	src/scene/scene.cpp
	src/scene/scenegraph.cpp
	src/scene/scenegraphnode.cpp
	tests/test_scenegraphloader.inl

2017-03-07 10:57:50 +01:00

..

documentation

Update Ghoul repository

2017-03-03 10:55:20 -05:00

engine

Merge branch 'develop' of github.com:OpenSpace/OpenSpace into pr/scenegraph-refactor

2017-03-07 10:57:50 +01:00

interaction

- Some cleanup of LuaConsole

2017-03-02 14:27:18 -05:00

mission

- Remove documentation.h include and replace with forward declaration

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

network

Updated check_style_guide to test for include guards and copyright

2017-02-09 23:55:39 -05:00

performance

Update copyright header to 2017

2017-02-06 18:02:01 -05:00

properties

Various cleanup

2017-03-02 19:50:05 -05:00

query

Update copyright header to 2017

2017-02-06 18:02:01 -05:00

rendering

Merge branch 'develop' of github.com:OpenSpace/OpenSpace into pr/scenegraph-refactor

2017-03-07 10:57:50 +01:00

scene

Merge branch 'develop' of github.com:OpenSpace/OpenSpace into pr/scenegraph-refactor

2017-03-07 10:57:50 +01:00

scripting

- Add check in style guide that prevents ‘using namespace’ in header files

2017-03-01 21:02:33 -05:00

util

Merge branch 'develop' of github.com:OpenSpace/OpenSpace into pr/scenegraph-refactor

2017-03-07 10:57:50 +01:00

openspace.h

Updated version number to 0.7.0 (prerelease-12 NAOJ)

2017-02-19 04:12:19 +01:00