Kalle Bladin 012bcaefaf Solve merge conflicts.

2016-06-07 12:54:52 -04:00

..

base

Solve merge conflicts.

2016-06-07 12:54:52 -04:00

debugging

Update camera to use double precition.

2016-06-05 21:27:20 -04:00

fieldlines

Premultiply fieldline colors and use fully opaque transparency instead

2016-06-02 17:38:33 +02:00

galaxy

Fix GLSL compile error

2016-06-04 19:56:29 +02:00

globebrowsing

Double precition for view frustum culling is not used in camera space.

2016-06-07 12:03:31 -04:00

iswa

Merge commit '4ae4ecca3cc69eba5b59e62e19bd52877602fcdd' into develop

2016-06-04 19:06:54 +02:00

kameleon

Refactor dataprocessor

2016-05-31 16:52:46 -04:00

multiresvolume

improved galaxy rendering

2016-06-03 11:16:57 +02:00

newhorizons

Solve merge conflicts.

2016-06-07 12:54:52 -04:00

onscreengui

Solve merge conflicts.

2016-06-07 12:54:52 -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