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

..

ephemeris

Sorting more classes into the correct modules

2015-05-20 21:40:52 +02:00

rendering

Removed while loops from path_vs that caused driver issues with big w values

2015-07-04 15:41:43 +02:00

shaders

Merge branch 'develop' into feature/remote_redesign

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

basemodule.cpp

Renamed OpenSpaceModule's initialize method to create

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

basemodule.h

Renamed OpenSpaceModule's initialize method to create

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

CMakeLists.txt

Moving Kameleon into its own module

2015-05-26 23:51:15 +02:00

include.cmake

Getting a running version of modularized cmakelists up and running

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