Emil Axelsson ebbbbb2dfd Merge branch 'develop' of openspace.itn.liu.se:/openspace into develop ...

Conflicts:
	src/rendering/renderengine.cpp

2016-02-08 15:07:38 +01:00

..

base

Fix more GLM degrees->radians changes

2016-02-05 22:48:49 +01:00

fieldlines

Fixes for Windows

2016-01-02 21:40:15 +01:00

kameleon

Uncomment old Progressbar from Kameleon to make jenkins compile again

2016-02-05 23:00:12 +01:00

newhorizons

Merge branch 'develop' of openspace.itn.liu.se:/openspace into develop

2016-02-08 15:07:38 +01:00

onscreengui

Make onscreen gui not break if resolution is changed

2016-02-07 15:09:25 +01:00

volume

disable volume module to suppress compilation errors

2016-02-04 10:02:16 +01:00