Matthew Territo 9022d838f3 Merge remote-tracking branch 'origin/master' into feature/multiresvolume ...

TF selector not working properly.

# Conflicts:
#	modules/multiresvolume/rendering/histogrammanager.cpp
#	modules/multiresvolume/rendering/localtfbrickselector.cpp
#	modules/multiresvolume/rendering/shenbrickselector.cpp
#	modules/multiresvolume/rendering/simpletfbrickselector.cpp
#	modules/multiresvolume/rendering/tfbrickselector.cpp

2018-03-13 17:24:16 -06:00

..

abuffer

Merge branch 'master' into feature/multiresvolume

2018-01-09 12:07:09 -07:00

framebuffer

Set a flat qualifier in nOneStripMSAA vert shader to match frag shader

2018-01-15 11:35:16 +01:00

PowerScaling

Update copyright header

2017-12-29 20:11:22 +01:00

blending.glsl

Update copyright header

2017-12-29 20:11:22 +01:00

floatoperations.glsl

Update copyright header

2017-12-29 20:11:22 +01:00

fragment.glsl

Issue/24 (#549)

2018-03-13 10:35:10 -04:00

hdr.glsl

Update copyright header

2017-12-29 20:11:22 +01:00

loadingscreen.frag

Update copyright header

2017-12-29 20:11:22 +01:00

loadingscreen.vert

Update copyright header

2017-12-29 20:11:22 +01:00

luaconsole.frag

Update copyright header

2017-12-29 20:11:22 +01:00

luaconsole.vert

Update copyright header

2017-12-29 20:11:22 +01:00

rand.glsl

Update copyright header

2017-12-29 20:11:22 +01:00

render.frag

refactor abuffer and add msaa support. volumes temporarily disabled.

2016-02-02 11:30:27 +01:00