Alexander Bock d628c1a667 Merge branch 'master' into feature/DU ...

# Conflicts:
#	data/scene/grids/grids.mod
#	ext/sgct

2017-10-17 17:09:37 -04:00

..

documentation

Added colormap range defined. Added VectorListVerifier. Added Text rendering. Added other datavar types for Tully. Added transformantion matrix.

2017-10-04 09:23:49 -04:00

engine

Volume conversion and rendering (#350)

2017-09-22 12:03:23 +02:00

interaction

Fix duplicate property name error

2017-08-14 15:24:41 -04:00

mission

Fix byte order mark commits

2017-07-17 15:54:00 -04:00

network

Feature/cmake cleanup (#381)

2017-08-14 09:38:32 -04:00

performance

Feature/cmake cleanup (#381)

2017-08-14 09:38:32 -04:00

properties

Feature/cmake cleanup (#381)

2017-08-14 09:38:32 -04:00

query

Fix byte order mark commits

2017-07-17 15:54:00 -04:00

rendering

Factor ScreenSpaceImage into separate classes for local loading and online download (closes #296)

2017-10-10 14:16:55 -04:00

scene

Rename GuiGrouping to GuiPath

2017-10-13 13:08:59 -04:00

scripting

Feature/cmake cleanup (#381)

2017-08-14 09:38:32 -04:00

util

Fix error with preInitialization timestep being overwritten

2017-10-10 12:34:11 -04:00