Commit graph

51434 commits

Author SHA1 Message Date
Chris Collins
d2feb4202b Merge pull request #9621 from sethalves/tablet-ui-track-opens-and-closes
send UserActivityLogger events when tablet is opened or closed
2017-02-07 08:23:09 -08:00
Anthony Thibault
2f09be5ead Merge pull request #9605 from druiz17/tabletClicking
enforce more button clicking logic
2017-02-06 20:23:16 -08:00
Anthony Thibault
caefb6c711 Merge pull request #9620 from hyperlogic/bug-fix/find-entity-bug
Fix for findEntities not returning some entities that are within range.
2017-02-06 20:22:34 -08:00
Seth Alves
40730c1d19 avoid bootstrapping self with something that has someone else as simulation owner 2017-02-06 17:05:16 -08:00
Seth Alves
f68fcbb9cd when the parentID is changed by a network update, set physics flags 2017-02-06 17:05:07 -08:00
Seth Alves
0dc7152dcc if an entity has an avatar parent but ends up in EntityMotionState::setWorldTransform, ignore the update from bullet 2017-02-06 17:04:58 -08:00
Seth Alves
b90d7e2689 another AVATAR_SELF_ID adjustment 2017-02-06 17:04:27 -08:00
Seth Alves
f13fdf2a4c make findAncestorOfType understand AVATAR_SELF_ID 2017-02-06 17:04:14 -08:00
Seth Alves
933aed4719 don't call stepKinematicMotion on kinematic entities when they are children of avatars 2017-02-06 17:04:04 -08:00
Seth Alves
c0e313830c make hasAncestorOfType understand AVATAR_SELF_ID 2017-02-06 17:03:53 -08:00
Seth Alves
6b4c800c2e don't call stepKinematicMotion on kinematic entities 2017-02-06 17:03:42 -08:00
Seth Alves
ec93a663e7 don't send AVATAR_SELF_ID over wire 2017-02-06 17:01:45 -08:00
Chris Collins
194fd925cf Merge pull request #9609 from sethalves/tablet-ui-fix-equipping
don't send AVATAR_SELF_ID over wire
2017-02-06 16:56:11 -08:00
Seth Alves
e3af5032c0 send UserActivityLogger events when tablet is opened or closed 2017-02-06 16:49:26 -08:00
Howard Stearns
1c7c0f7a76 Merge pull request #9617 from howard-stearns/physics-packets
Physics packets
2017-02-06 16:41:08 -08:00
Anthony J. Thibault
a14dcbd513 Fix for findEntities not returning some entities that are within range.
This bug has been around a long time... introduced by commit 39ed7f7b in 2014.
This became apparent to me when testing the tablet-ui, there was a case where the
hand styluses were not appearing when close to a web entity.  Because findEntities
is such a fundamental feature used by handControllerGrab, this fix should make all
grabbing feel more consistent and predictable.

I added a unit test that reproduces the issue.
2017-02-06 15:13:25 -08:00
Stephen Birarda
5c46cecf6a handle empty initial groups when comparing 2017-02-06 14:32:02 -08:00
Stephen Birarda
3311df5e1f fix default value in new row 2017-02-06 14:23:37 -08:00
Seth Alves
aaefc550f0 avoid bootstrapping self with something that has someone else as simulation owner 2017-02-06 14:16:47 -08:00
howard-stearns
12720cac32 Pass filter type as an int, with constants to compare against. 2017-02-06 13:36:45 -08:00
Brad Hefta-Gaub
edf4cfa377 Merge pull request #9615 from kencooke/audio-packetloss-fix
Reduce audio clicks/pops caused by packet loss
2017-02-06 13:12:08 -08:00
Stephen Birarda
f013ca4a95 Merge pull request #9616 from birarda/bug/remove-domain-open-hours
remove open hours and timezone from domain settings
2017-02-06 13:02:17 -08:00
Ken Cooke
63c2aa1dfc Remove obsoleted code 2017-02-06 12:55:03 -08:00
Ken Cooke
a77e4262e3 Remove obsoleted code 2017-02-06 12:47:28 -08:00
Zach Pomerantz
9b0190f1cf add ns/throttle to audio mixer debug stats 2017-02-06 20:31:19 +00:00
Andrew Meadows
8b1f569132 tweak max texture resolution thresholds 2017-02-06 12:13:31 -08:00
Seth Alves
2ea07390c8 when the parentID is changed by a network update, set physics flags 2017-02-06 12:10:26 -08:00
samcake
feb36b8dbf Merge branch 'purple' of https://github.com/samcake/hifi into blue 2017-02-06 11:56:45 -08:00
samcake
af5593c7c6 Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2017-02-06 11:55:11 -08:00
Andrew Meadows
8b2c720e29 sliding texture caps for models 2017-02-06 11:53:37 -08:00
Andrew Meadows
d65cbbb455 name change: maxSize to maxNumPixels 2017-02-06 11:53:37 -08:00
Andrew Meadows
b3ae6f9aec cap size of textures from FBX files 2017-02-06 11:53:37 -08:00
Andrew Meadows
24b1f3ddbc cleanup whitespace 2017-02-06 11:53:37 -08:00
Andrew Meadows
45c73439eb use type definition 2017-02-06 11:53:37 -08:00
Dante Ruiz
27e1bd50d0 reworded text 2017-02-06 19:52:51 +00:00
Dante Ruiz
5ff91c018b snapshot fix 2017-02-06 19:39:57 +00:00
howard-stearns
dacaa3df1d Send new entity physics packet from physics simulation, accept in server,
and make it go through filter (when supplied) regardless of lock rights.
2017-02-06 11:12:18 -08:00
howard-stearns
8b44e83d9e Add new EntityPhysics packet type. 2017-02-06 11:11:18 -08:00
Stephen Birarda
4bbd823a5a remove open hours from domain settings 2017-02-06 10:50:59 -08:00
Ken Cooke
49605d52e0 Remove debug code 2017-02-06 10:42:32 -08:00
samcake
9fd1d5114c Merge branch 'master' of https://github.com/highfidelity/hifi into purple 2017-02-06 10:16:41 -08:00
Ken Cooke
8033f932a6 Simulate 1% random packet-loss, for debug/test 2017-02-06 10:16:25 -08:00
Seth Alves
ab954412c1 if an entity has an avatar parent but ends up in EntityMotionState::setWorldTransform, ignore the update from bullet 2017-02-06 09:50:48 -08:00
Ken Cooke
4acb99cd4f Use interpolated audio (codec packet-loss concealment) or zero samples (if no codec) when audio packets are lost. This audio is still processed by the audio pipeline to avoid clicks/pops. 2017-02-06 09:29:39 -08:00
Seth Alves
e3817230f1 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-fix-equipping 2017-02-06 08:57:00 -08:00
samcake
c864e57855 first pass on a working image class and the mip generation 2017-02-06 08:51:04 -08:00
Ryan Huffman
f0238ec4d7 Merge pull request #9538 from huffman/feat/stopwatch
Add stopwatch example script
2017-02-06 08:32:19 -08:00
Brad Hefta-Gaub
be5698dce1 Merge pull request #9613 from ZappoMan/fixXboxWithDisabledKinect
fix kinect plugin claiming to have hands when not enabled
2017-02-06 07:57:05 -08:00
Brad Hefta-Gaub
2a20ce6062 fix kinect plugin claiming to have hands when not enabled 2017-02-04 10:38:46 -08:00
samcake
e8cdee71ed avoid assertion on mac 2017-02-03 22:49:41 -08:00