Commit graph

20972 commits

Author SHA1 Message Date
David Kelly
c08adc9faa and the new filter class 2017-02-08 10:51:28 -07:00
David Kelly
4821180dd3 Just add a pointer to the filter class
but do nothing with it
2017-02-08 10:48:26 -07:00
David Kelly
61e558e568 Entity Edit Filters for zones
Part 1 - just put them in the zones entities.  Next I'll hook them
up and actually filter...
2017-02-08 09:53:25 -07:00
Seth Alves
e1a3b0c551 Merge pull request #9629 from hyperlogic/feature/tablet-2d-window-pos
In desktop mode create tablet near mouse click location.
2017-02-07 19:51:05 -08:00
samcake
24a3a514a4 Merge pull request #9594 from AndrewMeadows/cap-fbx-texture-size
Cap fbx texture size
2017-02-07 12:46:22 -08:00
Anthony J. Thibault
7d630f6c9a Added Mat4.createFromColumns 2017-02-07 12:03:28 -08:00
Anthony J. Thibault
2952be5fc8 Added MouseX and MouseY axes to Keyboard device. 2017-02-07 12:02:41 -08:00
Zach Pomerantz
ff56eb24c8 Merge pull request #9537 from zzmp/audio/throttle-filter
Add injector/avatar attenuation to audio-mixer throttling
2017-02-07 20:57:43 +01:00
David Kelly
9788b4bdaf Merge pull request #9601 from davidkelly/dk/deadlockPrevention
Minor cleanup
2017-02-07 12:56:03 -07:00
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
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
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
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
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
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
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
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
Ken Cooke
49605d52e0 Remove debug code 2017-02-06 10:42:32 -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
81bf5ee655 another AVATAR_SELF_ID adjustment 2017-02-03 16:47:03 -08:00
Seth Alves
ad83f20199 make findAncestorOfType understand AVATAR_SELF_ID 2017-02-03 16:43:36 -08:00
Seth Alves
22f9fc7061 don't call stepKinematicMotion on kinematic entities when they are children of avatars 2017-02-03 16:36:06 -08:00
Seth Alves
c7200d2d3a make hasAncestorOfType understand AVATAR_SELF_ID 2017-02-03 16:14:15 -08:00
Seth Alves
174c674fd3 don't call stepKinematicMotion on kinematic entities 2017-02-03 15:50:59 -08:00
Seth Alves
9edaef82aa Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-fix-equipping 2017-02-03 15:42:26 -08:00
Seth Alves
9f04a72a38 Merge pull request #9599 from hyperlogic/feature/tablet-ui-button-sort-order
tablet-ui: Added sortOrder property to buttons
2017-02-03 15:20:53 -08:00
Seth Alves
37de4aefa6 don't send AVATAR_SELF_ID over wire 2017-02-03 14:05:23 -08:00
Ryan Huffman
1ddafa3cee Merge pull request #9584 from birarda/bug/freeze-dont-move
don't auto-bid for sim ownership on entity creation in ESI
2017-02-03 10:08:48 -08:00
David Kelly
8612302f07 Revert "I like this better"
This reverts commit 069c85c7c2.
2017-02-03 10:08:46 -07:00
David Kelly
069c85c7c2 I like this better 2017-02-03 08:52:33 -07:00
David Kelly
93fee0cf83 Merge branch 'master' of https://github.com/highfidelity/hifi into dk/deadlockPrevention 2017-02-03 08:29:28 -07:00
samcake
87e2936a05 Merge pull request #9592 from samcake/blue
Adding instrumentation for traces regarding Image and texture loading and preparation
2017-02-02 22:16:07 -08:00
sam
c4ec0cc069 fixing a bad cDebug 2017-02-02 22:09:52 -08:00
Anthony J. Thibault
6bef9e888b Merge branch 'master' into bug-fix/tablet-ui-no-domain 2017-02-02 17:21:20 -08:00
Anthony J. Thibault
85e01e3922 tablet-ui: Added sortOrder property to buttons
By default user created buttons will appear after system buttons.
2017-02-02 17:18:22 -08:00
Seth Alves
998fbfb909 Merge pull request #9596 from sethalves/fix-equip-from-other-pov
fix -- don't honor gravity in simple extrapolation on entities equipped by others
2017-02-02 15:49:10 -08:00
Seth Alves
6b44f62982 don't honor gravity in simple extrapolation on entities equipped by others 2017-02-02 14:20:21 -08:00