samcake
8f663f20e0
FIx warnings
2016-07-19 13:24:03 -07:00
samcake
7f169b8e4f
Adjust qml positions and fix one shader bug
2016-07-19 13:20:19 -07:00
samcake
3e7126f5be
Removed reference to LIghtingModel.slh in teh DefereedBufferWrite.slh to avoid side effects
2016-07-19 13:06:26 -07:00
samcake
4742f40128
Separating the normal packing into it s own file and make sure to sclae the filter radius correctly dpeending on the resolution of diffusion
2016-07-19 12:23:57 -07:00
samcake
36d58a2b82
Finish the integration of the diffusion pass in the SurfaceGeometryPass job, clean up ui
2016-07-19 10:34:06 -07:00
samcake
18ec4aa4e2
Merge branch 'master' of https://github.com/highfidelity/hifi into skin
2016-07-19 09:27:33 -07:00
Brad Hefta-Gaub
48705d33c5
Merge pull request #8277 from jherico/pause_lighting
...
Ensure the pause overlay is unlit (emissive)
2016-07-19 08:34:15 -07:00
Brad Davis
d98ae1ba9c
Ensure the pause overlay is unlit (emissive)
2016-07-19 07:10:34 -07:00
samcake
ff132fa712
Gathering the diffusion passes in the SUrfaceGEometryPAss job
2016-07-19 02:11:22 -07:00
samcake
3638a3b9c3
Merge branch 'master' of https://github.com/highfidelity/hifi into skin
2016-07-18 23:15:21 -07:00
Brad Hefta-Gaub
2e491e0afb
Merge pull request #8275 from jherico/web_entity_leak
...
Cleanup resources used by offscreen GL surfaces
2016-07-18 21:46:18 -07:00
Brad Hefta-Gaub
0a6aee1707
Merge pull request #8254 from murillodigital/master
...
Changes for hifiCodec plugin building on Linux
2016-07-18 21:14:46 -07:00
Brad Hefta-Gaub
90c8abb4e9
Merge pull request #8268 from sethalves/fix-throwing-some-more
...
improve throwing release velocity
2016-07-18 21:13:35 -07:00
Brad Davis
cbbb2a7975
Properly delete GL context and offscreen surfaces
2016-07-18 19:47:23 -07:00
Brad Davis
455d890358
Merge pull request #8266 from jherico/texture_free_fix
...
Actually delete textures we're not using
2016-07-18 19:41:35 -07:00
samcake
a8dd06ad38
Better groupint of the diffuseion of the curvature for easier fix for mini mirror
2016-07-18 19:24:43 -07:00
samcake
34f2a96888
Adding the check for Obscurrance
2016-07-18 18:11:51 -07:00
Brad Hefta-Gaub
171b9d8ecc
Merge pull request #8270 from davidkelly/dk/audioPlayingFix
...
NotFinished never should have had its own bit
2016-07-18 18:05:55 -07:00
Ryan Downe Karpf
6e71e369a4
Merge pull request #8261 from hyperlogic/feature/grab-script-improvements-iii
...
grab script improvements
2016-07-18 16:46:38 -07:00
David Kelly
2a89fa25bb
Removing comments
...
Since I looked into it, seems ok
2016-07-18 16:22:12 -07:00
David Kelly
df615b1503
NotFinished never should have had its own bit
...
Since there is a Finished flag too. So now, it is just 0, used as
a starting point, and we check for !hasState(Finished). <sigh>
2016-07-18 16:02:02 -07:00
Chris Collins
dc6ab167e4
Merge pull request #8253 from davidkelly/dk/localNoEcho
...
Injectors now always play locally, and send to server without echo
2016-07-18 15:02:29 -07:00
Seth Alves
2d73b23c56
when deciding on the release velocity of something thrown, don't include a zero velocity caused by seeing the same controller data as last frame
2016-07-18 14:44:41 -07:00
Anthony J. Thibault
69500643f3
bugfix for saving attach points
...
The feature to add transition from equip -> near-grab, in inadvertently broke attach point saving.
2016-07-18 14:17:32 -07:00
Anthony J. Thibault
659e1ff984
remove debug prints
2016-07-18 14:17:06 -07:00
David Kelly
3df373252f
Several minor things
...
We could only partially fill the _scratchBuffer - .wav files may not
be exactly N frames long. Doh.
While at it, I needed to call finishLocalInjection() after local
injectors are done, and the access to the injector vector needs to
be locked, given that we do a QtDirectConnection with the networking
and thus the outputLocalInjectors is on a different thread.
The clicking was just 0-ing out the _scratchBuffer.
2016-07-18 14:00:41 -07:00
samcake
80587ca8a3
using the textureGather lookup
2016-07-18 12:52:21 -07:00
samcake
be4839d46c
a better depth filter
2016-07-18 12:26:04 -07:00
Brad Davis
0f240d39b6
Actually delete textures we're not using
2016-07-18 11:21:09 -07:00
samcake
a4ad4659c4
Fixing build warnings
2016-07-18 11:17:06 -07:00
David Kelly
a30b631a0a
Merge branch 'master' of github.com:highfidelity/hifi into dk/localNoEcho
2016-07-18 11:15:58 -07:00
samcake
a44aee84ce
Merge branch 'master' of https://github.com/highfidelity/hifi into skin
2016-07-18 10:16:55 -07:00
Brad Hefta-Gaub
2cd38064a5
Merge pull request #8235 from jherico/more_shapes
...
Support triangle and hexagon shapes, add shape support to overlays.
2016-07-18 09:05:24 -07:00
samcake
86d9ee56d2
Downsampling shader pass
2016-07-18 03:56:11 -07:00
samcake
5a0ce81516
Performing the curvature generation and diffusion at half the resolution
2016-07-18 03:54:05 -07:00
samcake
378f4576fa
a bit better making the curvature and diffusion passes
2016-07-17 20:18:06 -07:00
samcake
cfa51ae1f5
REmoving problematic timers for mac
2016-07-17 18:32:43 -07:00
samcake
9332f82d54
Carrefully improving the curvature generation performances
2016-07-17 17:13:07 -07:00
samcake
744474982d
Merge branch 'master' of https://github.com/highfidelity/hifi into skin
2016-07-17 13:28:03 -07:00
Anthony Thibault
c7c8046231
De-equip goes into a near grab instead of dropping the object.
2016-07-16 14:58:21 -07:00
Anthony Thibault
4b2fb546eb
Re-enable storing of attach points in user settings
...
* bug fix, use localOffset property of grabbed entity, which is dynamically updated as
the near grab action moves the entity.
2016-07-16 12:21:08 -07:00
Brad Hefta-Gaub
dc2741950a
Merge pull request #8259 from kencooke/improved-hrtf
...
Fix the AudioMixer distance attenuation.
2016-07-15 22:36:51 -07:00
Ken Cooke
b03686c37f
Change the default domain attenuation level to 0.5
2016-07-15 22:02:56 -07:00
Brad Davis
03cb6175ab
Support triangle and hexagon shapes, add shape support to overlays.
2016-07-15 22:02:17 -07:00
David Kelly
8c0eb1e4d2
Fixed some bad logic
...
When I "fixed" my or instead of and issue, I did it in the wrong
direction. But it looked right :) Now it is. Sigh. Long story
how it got there, but it seems good now.
2016-07-15 19:48:15 -07:00
Ken Cooke
1ee608ad2c
Cleanup
2016-07-15 18:23:12 -07:00
Ken Cooke
59ac2a789f
Fix the AudioMixer distance attenuation.
...
The zone settings are still used, and still match the documentation where 0 = no attenuation and 1 = max attenuation. The default is now 0.5 which corresponds to -6dB per doubling of distance. This is the attenuation for a spherical wave in the free field.
2016-07-15 18:07:19 -07:00
Brad Davis
cf1c954edc
Merge pull request #8257 from jherico/toolbar_hover
...
Fix hover states for toolbar buttons
2016-07-15 18:02:58 -07:00
Philip Rosedale
4925980cbb
Merge pull request #8255 from jherico/search_circle
...
Make search line termination a circle, like 2D UI
2016-07-15 17:51:50 -07:00
samcake
076b8cd297
Instrumenting the GPU git status
2016-07-15 17:47:54 -07:00
