Alexander Bock a2cad36772 Merge remote-tracking branch 'origin/feature/iSWA' into develop ...

Conflicts:
	data/scene/default.scene
	scripts/bind_keys.lua

2016-06-01 19:46:23 +02:00

..

base

RenderableTrail bug fix #88

2016-05-26 10:40:21 -04:00

debugging

Add debugging module with RenderableDebugPlane, closing #56

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

fieldlines

Fieldline bugfix

2016-05-25 17:33:46 -04:00

iswa

Windows compile fix

2016-05-31 18:51:57 +02:00

kameleon

Read cdf list

2016-05-23 17:24:46 -04:00

multiresvolume

moved histogram class to core

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

newhorizons

Merge remote-tracking branch 'origin/feature/iSWA' into develop

2016-06-01 19:46:23 +02:00

onscreengui

Gui with smaller labels (closing #89)

2016-05-26 10:38:19 -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