Alexander Bock a406aaf039 Merge branch 'feature/guisorting' ...

# Conflicts:
#	modules/imgui/include/guipropertycomponent.h
#	modules/imgui/src/guipropertycomponent.cpp

2017-12-07 01:15:52 -05:00

..

base

Strict coding style adherence

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

debugging

Remove GCC warnings

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

digitaluniverse

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

2017-11-12 10:50:11 -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

Strict coding style adherence

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

imgui

Merge branch 'feature/guisorting'

2017-12-07 01:15:52 -05:00

iswa

Cleanup ScreenSpaceFramebuffer (fix orientation issue)

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

kameleon

Jenkinswarnings (#419)

2017-11-16 21:19:28 -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

Merge branch 'master' into feature/loadingscreen-refactor

2017-11-09 22:49:07 -06: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