Alexander Bock 72ba616414 Merge branch 'develop' into feature/remote_redesign ...

Conflicts:
	modules/base/shaders/path_fs.glsl

2015-07-07 20:31:01 +02:00

..

ext/imgui

Moving onscreen gui into its own module

2015-05-26 22:52:12 +02:00

include

Moving onscreen gui into its own module

2015-05-26 22:52:12 +02:00

shaders

Remove the unused location declarations in the shader to make OpenSpace compatible with OpenGL 4.0

2015-07-07 11:17:56 +02:00

src

Remove old script messages for changing the origin and the coordinate system

2015-07-07 18:52:09 +02:00

CMakeLists.txt

Moving onscreen gui into its own module

2015-05-26 22:52:12 +02:00

include.cmake

Moving onscreen gui into its own module

2015-05-26 22:52:12 +02:00

onscreenguimodule.cpp

Renamed OpenSpaceModule's initialize method to create

2015-06-22 23:09:19 +02:00

onscreenguimodule.h

Renamed OpenSpaceModule's initialize method to create

2015-06-22 23:09:19 +02:00