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
samcake
3d57a3a86a
Merge pull request #8267 from samcake/skin
...
Better depth filter
2016-07-18 12:56:08 -07:00
samcake
80587ca8a3
using the textureGather lookup
2016-07-18 12:52:21 -07:00
Zander Otavka
492f7e0c29
Add gravity to dynamic model entities
2016-07-18 12:43:14 -07:00
samcake
be4839d46c
a better depth filter
2016-07-18 12:26:04 -07:00
Zander Otavka
06985f9278
Make combo box go by index, add default values
2016-07-18 12:06:11 -07:00
Anthony J. Thibault
5a01bf406e
remove obsolete handControllerMouse.js to avoid confusion
2016-07-18 11:29:41 -07:00
Brad Davis
0f240d39b6
Actually delete textures we're not using
2016-07-18 11:21:09 -07:00
samcake
49785de315
Merge pull request #8265 from samcake/skin
...
Fixing build warnings
2016-07-18 11:18:22 -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
Zander Otavka
6bd7034c1a
Improve scaling of components in dialog
...
CustomQueryDialog now better handles the absence of one or more input
fields and scales appropriately.
2016-07-18 11:14:45 -07:00
Seth Alves
180cc90197
Merge branch 'master' of github.com:highfidelity/hifi into groups
2016-07-18 10:54:01 -07:00
samcake
3ed886b046
Merge pull request #8263 from samcake/skin
...
FOcusing on the performances of the CUrvature and diffusion of curvature pass
2016-07-18 10:52:16 -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
