Alexander Bock 50fd9309ba Merge branch 'master' into feature/NewAtmosphere ...

# Conflicts:
#	src/rendering/renderengine.cpp

2017-10-24 15:30:22 -04:00

..

ext/imgui

Feature/cmake cleanup (#381)

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

include

Various cleanup

2017-10-16 17:11:28 -04:00

shaders

Feature/cmake cleanup (#381)

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

src

Merge branch 'master' into feature/NewAtmosphere

2017-10-24 15:30:22 -04:00

CMakeLists.txt

Added first version of mission visualization

2017-10-16 10:23:00 -04:00

imguimodule.cpp

Add window to show featured scenegraph nodes

2017-10-12 12:13:55 -04:00

imguimodule.h

Fix coding style issues

2017-08-14 13:49:13 -04:00

include.cmake

Feature/cmake cleanup (#381)

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