Commit graph

15720 commits

Author SHA1 Message Date
Brad Hefta-Gaub
d77d102384 add support for persisting the mono preview mode option 2016-02-10 22:01:17 -08:00
Stephen Birarda
97cd65cf80 don't use usecTimestampNow for per second actions 2016-02-10 15:07:58 -08:00
Andrew Meadows
d121dab937 Merge pull request #7057 from sethalves/grab-then-equip
Grab then equip
2016-02-10 14:16:31 -08:00
Seth Alves
3b1db7a522 Merge pull request #7061 from AndrewMeadows/crash-fix
Fix crash when deleting many moving dynamic objects.
2016-02-10 13:58:03 -08:00
Seth Alves
49f2724608 don't return void 2016-02-10 13:49:03 -08:00
Andrew Meadows
8ddbce1ee2 Merge pull request #7059 from sethalves/clamp-ik-dt
avoid crazy ik-induced shaking / orbits
2016-02-10 13:32:53 -08:00
James B. Pollack
b07c32e116 Merge pull request #7062 from jherico/webentitiies
Ensure the QML content gets destroyed on deletion of a QML surface
2016-02-10 13:27:59 -08:00
Seth Alves
af6bb50f74 fix warning 2016-02-10 12:09:28 -08:00
Seth Alves
9d21c3d549 Merge branch 'master' of github.com:highfidelity/hifi into grab-then-equip 2016-02-10 11:35:25 -08:00
Chris Collins
db06674f7e Merge pull request #7058 from hyperlogic/tony/moving-platform-bugfixes
SpatiallyNestable: bug fixes for kinematic entities
2016-02-10 11:34:32 -08:00
Brad Davis
a4f2fc58fd Ensure the QML content gets destroyed on deletion of a QML surface 2016-02-10 11:27:18 -08:00
Seth Alves
6fea0b9396 also make sure tau is >= 1.0 2016-02-10 11:20:56 -08:00
Andrew Meadows
84fb983da7 don't forget to remove from _outgoingChanges 2016-02-10 10:36:35 -08:00
Andrew Meadows
4bcb7b1ba9 more correct profiling 2016-02-10 10:36:34 -08:00
Andrew Meadows
9b467e94da constify and explicit override 2016-02-10 10:36:34 -08:00
Seth Alves
b3b053ce18 if delta-time is more than 1/30th of a second, clamp it to avoid crazy ik induced orbits when main thread is blocked 2016-02-10 09:52:29 -08:00
Ken Cooke
a875542142 Merge pull request #7053 from birarda/integrate-new-hrtf
Integrate the new audio HRTF in AudioMixer
2016-02-10 07:34:50 -08:00
Anthony J. Thibault
727e289ecd SpatiallyNestable: bug fixes for kinematic entities
* Kinematic entities were being simulated with position in the local frame but velocity in the global frame.
* Also, because getVelocity() was returning non-zero values when the parent was moving, kinematic objects were being simulated even if they should have been at rest.
* Bug fix for calculating velocity direction was incorrect, if the parent frame was rotated.
2016-02-09 17:58:54 -08:00
Stephen Birarda
ac0db04892 repair to wrapped memcpy from AudioRingBuffer 2016-02-09 16:39:22 -08:00
Stephen Birarda
cafcb6b109 remove degree conversion that is not used 2016-02-09 15:25:10 -08:00
Stephen Birarda
5c9f673e38 fix for missing M_PI 2016-02-09 15:05:19 -08:00
Seth Alves
251810edc5 only suppress location edits when they arrive over the network -- script can still update 2016-02-09 15:03:36 -08:00
Stephen Birarda
7b2726f89b ensure that injectors are cleaned up once inactive 2016-02-09 14:30:59 -08:00
Stephen Birarda
1773233af4 cleanup management of HRTF objects across connected Nodes 2016-02-09 14:30:44 -08:00
Seth Alves
43592fd699 Merge pull request #7048 from hyperlogic/tony/avatar-on-moving-platform
Better avatar animation when attached to a moving entity
2016-02-09 14:30:02 -08:00
Anthony J. Thibault
2b10fea006 SpatiallyNestable: warn on failure. 2016-02-09 14:03:39 -08:00
Brad Hefta-Gaub
a8ec4bb844 Merge pull request #7049 from jherico/antistutter
Anti-stutter work
2016-02-09 12:16:15 -08:00
Stephen Birarda
a6a694c704 fix mixing bugs post HRTF integration 2016-02-09 11:58:55 -08:00
Chris Collins
cc576dd5e3 Merge pull request #7045 from sethalves/fix-query-cube
fix queryAACube lastEdited bug
2016-02-09 11:23:56 -08:00
Brad Davis
7d99f9e72f PR comments 2016-02-09 10:16:44 -08:00
Brad Davis
839b8d432e Don't burn CPU cycles calculating an average color we don't use 2016-02-09 09:39:34 -08:00
Brad Davis
2b127720f8 Run the present thread at highest priority 2016-02-09 09:39:33 -08:00
Chris Collins
e61636e8a7 Merge pull request #7028 from zzmp/fix/overlay
Add transparency and layering for overlays
sam is doing it
2016-02-09 09:18:32 -08:00
Brad Davis
421160eeb6 Make the file parsing threads run at lower priority 2016-02-08 23:55:02 -08:00
Anthony J. Thibault
6a82594a4f SpatiallyNestable: more locks, less contention 2016-02-08 20:09:32 -08:00
Anthony J. Thibault
9a0e206843 SpatiallyNestable: made getParentPointer protected again. 2016-02-08 20:04:45 -08:00
Anthony J. Thibault
072172b1a2 SpatiallyNestable: now with velocity support!
Moved velocity and angularVelocity into the SpatiallyNestable base class.

Entity velocity and angularVelocity properties are now relative to their parent, similar to the way position and orientation work for entities.

MyAvatar rig animations now use SpatiallyNestable to convert velocity into local frame to drive the animation state machine.
2016-02-08 19:43:23 -08:00
Stephen Birarda
fd96f0d960 leverage new HRTF in audio-mixer mix preparation 2016-02-08 18:12:25 -08:00
samcake
07759bb5db Merge pull request #7034 from zzmp/feat/render-to-json
Add toJson methods to render config objects in JS
2016-02-08 18:00:25 -08:00
James B. Pollack
ad36e84e24 Merge pull request #7023 from ericrius1/acSoundSearcher
AC Sound Searcher
2016-02-08 17:54:15 -08:00
Brad Hefta-Gaub
89648f3c2e Merge pull request #7044 from jherico/optional_threaded_present
Make threaded present optional
2016-02-08 17:17:31 -08:00
Zach Pomerantz
63d87550b1 Guard batchSetter invocation for ShapePipelines 2016-02-08 17:06:43 -08:00
Seth Alves
d5f3447fbc when updating queryAACubes for children, use the lastEdited from the parent's properties 2016-02-08 16:22:41 -08:00
ericrius1
b60ba0c5a7 can now change loop 2016-02-08 16:22:05 -08:00
Zach Pomerantz
281ba3c3ea Fix ShapeKey::withoutCullFace to set, not reset 2016-02-08 16:14:03 -08:00
Anthony J. Thibault
97bcc54360 CharacterController: separate target velocity from parent velocity.
Also, disable damping on the rigidBody used by the CharacterController.
2016-02-08 16:01:36 -08:00
Stephen Birarda
445662f5ae clean sweep of old now unused audio files 2016-02-08 15:38:12 -08:00
Stephen Birarda
7dee3c61f3 Merge pull request #7038 from kencooke/master
HRTF-based audio spatialization engine
2016-02-08 15:37:09 -08:00
Seth Alves
4f8a7a080f remove debugging print 2016-02-08 15:33:03 -08:00
Seth Alves
82fcfc1d64 don't apply clock-skew to a lastEdited of 0 2016-02-08 15:31:32 -08:00