Erik Broberg d6aa4216cc Merge branch 'feature/osirisrex' of github.com:OpenSpace/OpenSpace into feature/osirisrex

2016-08-02 19:25:39 -04:00

..

base

Merge branch 'feature/osirisrex' of github.com:OpenSpace/OpenSpace into feature/osirisrex

2016-08-02 19:25:39 -04:00

debugging

Solve merge conflicts: develop --> globebrowsing

2016-08-02 18:50:10 -04:00

fieldlines

Update other modules to work with the new interaction mode and camera class.

2016-06-07 19:51:37 -04:00

galaxy

Disable default module setting for galaxy, globebrowsing, and multiresvolume

2016-06-24 10:55:49 +02:00

globebrowsing

Merge from feature/globebrowsing

2016-08-02 19:25:23 -04:00

iswa

Move the LuaLibrary definition into its own file

2016-07-18 12:40:29 +02:00

kameleon

only get selected datavalues from file

2016-06-13 17:59:36 -04:00

multiresvolume

Disable default module setting for galaxy, globebrowsing, and multiresvolume

2016-06-24 10:55:49 +02:00

newhorizons

Merge branch 'feature/osirisrex' of github.com:OpenSpace/OpenSpace into feature/osirisrex

2016-08-02 19:25:39 -04:00

onscreengui

Solve merge conflicts: develop --> globebrowsing

2016-08-02 18:50:10 -04:00

toyvolume

untabify to make merge easier

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

volume

fix compile errors for osx

2016-05-20 00:39:29 +02:00