Michael Nilsson 5ff67104de Merge branch 'feature/iSWA' of github.com:OpenSpace/OpenSpace-Development into feature/iSWA

2016-05-17 13:04:11 -04:00

..

base

solve merge conflict

2016-05-17 12:53:29 -04:00

debugging

Add debugging module with RenderableDebugPlane, closing #56

2016-05-16 14:50:48 +02:00

fieldlines

fix fieldlines modules shaders

2016-04-27 14:47:06 -04:00

iswa

Removed a function

2016-05-17 10:19:05 -04:00

kameleon

Colormaps and read image format from string

2016-04-27 14:44:07 -04:00

multiresvolume

moved histogram class to core

2016-05-17 12:49:16 -04:00

newhorizons

solve merge conflict

2016-05-17 12:53:29 -04:00

onscreengui

Set scale and position for ScreenSpaceCygnets at start up

2016-05-13 09:45:37 -04:00

toyvolume

untabify to make merge easier

2016-04-20 15:21:30 -04:00

volume

untabify to make merge easier

2016-04-20 15:21:30 -04:00