Commit graph

50958 commits

Author SHA1 Message Date
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
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
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
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
Seth Alves
68de18a3bb Merge pull request #9610 from sethalves/tablet-ui-use-models-from-s3-again
use tablet models from s3 until relative model urls work
2017-02-03 18:34:28 -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
Dante Ruiz
dd8f095bd8 minimize diff 2017-02-04 00:36:41 +00: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
Dante Ruiz
0c28776ea2 some tweaks to users and menus got tablet 2017-02-04 00:13:39 +00: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
f635cd8a07 use tablet models from s3 until relative model urls work 2017-02-03 15:17:33 -08:00
Seth Alves
37de4aefa6 don't send AVATAR_SELF_ID over wire 2017-02-03 14:05:23 -08:00
Anthony J. Thibault
6738c0eade More consistent haptics on web overlays and entities 2017-02-03 12:05:30 -08:00
Dante Ruiz
2a3d0b6b17 enforce more button clicking logic 2017-02-03 19:13:57 +00:00
Anthony J. Thibault
f8e6bd8c6b Allow multiple instances to run if environment variable is set
If the environment variable HIFI_ALLOW_MULTIPLE_INSTANCES is present, the value is ignored,
then you can have multiple copies of interface running on the same machine.
2017-02-03 10:53:26 -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
Chris Collins
bac5bd5c0e Merge pull request #9595 from hyperlogic/bug-fix/tablet-ui-bugfixes
tablet-ui: Bug fixes
2017-02-02 17:53:47 -08:00
Anthony Thibault
3a36410f7c Merge pull request #9571 from hyperlogic/bug-fix/tablet-ui-no-domain
Tablet should work even when not connected to any domain.
2017-02-02 17:49:40 -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
f40285c688 Merge pull request #9597 from druiz17/tabletStylus
better scrolling and fixed button touching
2017-02-02 16:56:13 -08:00
Anthony Thibault
be4fbb63cf Merge pull request #9583 from sethalves/fix-post-tablet-edit-buttons
fix the edit.js toolbar buttons so they don't vanish when moused-over or clicked
2017-02-02 16:01:56 -08:00
Anthony Thibault
59b33bbc53 Merge pull request #9585 from sethalves/use-local-tablet-model
use tablet model from distribution rather than from s3
2017-02-02 16:01:15 -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