Alexander Bock 2152c3ee88 Merge remote-tracking branch 'origin/master' into feature/NewAtmosphere ...

# Conflicts:
#	modules/imgui/src/renderproperties.cpp

2017-12-11 09:12:13 -05:00

..

atmosphere

Commented testing line.

2017-11-30 12:43:23 -05:00

base

Merged master into NewAtmosphere.

2017-12-04 12:19:40 -05:00

debugging

Remove GCC warnings

2017-11-13 16:22:07 -05:00

digitaluniverse

Changed names in DU following Carter's asking. Fixed bug in min plane size clipping procedure.

2017-12-08 16:11:58 -05:00

fieldlines

Merge remote-tracking branch 'origin/master' into feature/loadingscreen-refactor

2017-11-12 10:50:11 -05:00

fieldlinessequence

Jenkinswarnings (#419)

2017-11-16 21:19:28 -05:00

galaxy

Jenkinswarnings (#419)

2017-11-16 21:19:28 -05:00

globebrowsing

Fixed bug in local normals.

2017-12-06 12:40:33 -05:00

imgui

Merge remote-tracking branch 'origin/master' into feature/NewAtmosphere

2017-12-11 09:12:13 -05:00

iswa

Cleanup ScreenSpaceFramebuffer (fix orientation issue)

2017-11-26 14:46:54 -05:00

kameleon

Added missing include and merged master into NewAtmosphere.

2017-11-25 22:39:18 -05:00

kameleonvolume

Jenkinswarnings (#419)

2017-11-16 21:19:28 -05:00

multiresvolume

Jenkinswarnings (#419)

2017-11-16 21:19:28 -05:00

space

Merged master into NewAtmosphere.

2017-11-15 18:12:58 -05:00

spacecraftinstruments

Strict coding style adherence

2017-11-26 14:57:26 -05:00

touch

Strict coding style adherence

2017-11-26 14:57:26 -05:00

toyvolume

Merge remote-tracking branch 'origin/master' into feature/loadingscreen-refactor

2017-11-12 10:50:11 -05:00

volume

Volume rendeirng fixes: Premultiply alpha in transfer function.Update transfer function on propery change. More reasonable opacity multiplier range.

2017-11-22 19:04:19 +01:00