samcake
3e7126f5be
Removed reference to LIghtingModel.slh in teh DefereedBufferWrite.slh to avoid side effects
2016-07-19 13:06:26 -07:00
Thijs Wenker
2adff24a05
silly workaround- workaround
2016-07-19 21:34:42 +02: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
Stephen Birarda
f28f3d7fcf
force removal of an old solo node when added new one
2016-07-19 12:02:37 -07:00
Seth Alves
be001a652f
when doing a parenting grab, zero velocity
2016-07-19 11:50:53 -07:00
Seth Alves
5f6e608207
don't overwrite physical properties with those from the entity during editEntity -- only set those that the script didn't.
2016-07-19 11:23:21 -07:00
Anthony Thibault
897627ebd6
Merge pull request #8272 from hyperlogic/bug-fix/mac-os-quality-of-life-fixes
...
Mac OS X fixes
2016-07-19 11:18:46 -07:00
Brad Hefta-Gaub
866ba2f185
Merge pull request #8273 from hyperlogic/bug-fix/far-grab-zoom
...
far-grabbed objects no longer fly away when the avatar body shifts
2016-07-19 10:40:48 -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
Anthony J. Thibault
212175bdaa
bug fix for far-grab pulling the object in the wrong direction
2016-07-19 10:23:00 -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 Hefta-Gaub
1ee5023f6d
fix warnings
2016-07-19 08:33:54 -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
c484fec51d
cleanup
2016-07-18 22:54:57 -07:00
Brad Hefta-Gaub
dbf60a594c
Merge branch 'master' of https://github.com/highfidelity/hifi into addCodecNameToStream
2016-07-18 22:43:16 -07:00
Brad Hefta-Gaub
c6ffd81c4b
some cleanup
2016-07-18 22:42:38 -07:00
Brad Hefta-Gaub
2e63aba8c9
when getting unexpected codec in the mixer, send a message to the client to select a different codec
2016-07-18 22:29:05 -07:00
Brad Hefta-Gaub
20824f038c
include codec in audio stream packets so that each side can discard packets that don't match
2016-07-18 21:59:44 -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
dabb7c0eea
Merge pull request #8274 from samcake/skin
...
Adding the check for Obscurrance
2016-07-18 18:16:16 -07:00
howard-stearns
57955a2b56
Expose protocol version to qml, and use it in query.
2016-07-18 18:12:27 -07:00
samcake
34f2a96888
Adding the check for Obscurrance
2016-07-18 18:11:51 -07:00
howard-stearns
98555be987
Merge branch 'protocol3' of https://github.com/howard-stearns/hifi into suggestions
2016-07-18 18:11:05 -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
Anthony J. Thibault
ad7fa971aa
copy scripts into build directory
2016-07-18 17:09:10 -07:00
Anthony J. Thibault
7fd40a5d10
MacOS: fix crash when touchscreen device is nullptr.
2016-07-18 17:08:17 -07:00
howard-stearns
17e64cf5e6
suggest only unrestricted domains, and also use server to sort
2016-07-18 16:58:29 -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
Thijs Wenker
11b461a730
Fixes duplicate target overlays for teleporter, make sure to delete overlay before creating one
2016-07-19 01:46:29 +02:00
howard-stearns
abb63139f6
Merge branch 'master' of https://github.com/highfidelity/hifi into suggestions
2016-07-18 16:29:49 -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
howard-stearns
98f76924c5
log hearbeat like we do updates
2016-07-18 14:49:56 -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
howard-stearns
1a66574adb
add protocol version signature to metaverse heartbeat
2016-07-18 14:29:49 -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
Zander Otavka
d75c2e2a6f
Merge branch 'master' into edit-model-ui
2016-07-18 13:11:51 -07:00
Anthony J. Thibault
959a2f9915
far-grabbed objects no longer fly away when the avatar body shifts
...
Before this fix, a hand vector was being tracked that was the difference between the avatar's hand in avatar space with the avatar's hand
in avatar space the previous frame. This hand vector was used to move the grabbed object position. However, when the body shifts, objects
in the avatar's space will change rapidly, this would cause this hand vector to be incorrect and cause the object to shoot off in the distance.
Now, we track this hand delta in sensor a.k.a. room space. This is immune to the shifts caused by body shifting.
2016-07-18 13:10:16 -07:00
Zander Otavka
b8398944ac
Fix QML warnings
2016-07-18 13:09:32 -07:00
