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
Brad Hefta-Gaub
d7db08d150
Merge pull request #7042 from howard-stearns/virtualBaton
...
Virtual baton
2016-02-10 13:48:34 -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
Howard Stearns
989192e9fd
Make randomize clearer.
2016-02-10 12:53:05 -08:00
Howard Stearns
31d72ffb8d
2 is magic.
2016-02-10 12:17:58 -08:00
Seth Alves
af6bb50f74
fix warning
2016-02-10 12:09:28 -08:00
Howard Stearns
4241f4b305
Convert all simple one-liners containing ') { ' to instead take up three lines.
2016-02-10 12:03:07 -08:00
Brad Hefta-Gaub
5120076add
Merge pull request #7060 from jherico/qml
...
Small QML fixes
2016-02-10 11:39:45 -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
132169395c
use const reference for std:vector
2016-02-10 10:36:34 -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
Brad Davis
4d1c24abb7
Fix OverlayWindow loading issues
2016-02-10 10:02:20 -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
Brad Hefta-Gaub
9e3a13795a
Merge pull request #7054 from howard-stearns/editjs-ToolWindow-initial-position
...
Fix ToolWindow's initial position (e.g., as used by edit.js).
2016-02-10 09:30:06 -08:00
Brad Hefta-Gaub
c1f2f8fca8
Merge pull request #7055 from huffman/fix-console-logs
...
Make console log more robust
2016-02-10 09:29:54 -08:00
Ryan Huffman
ef95fafabe
Update console log to include some previous history
2016-02-10 08:42:28 -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
26fd0c305a
push the length threshold to 1e-30
2016-02-09 17:14:23 -08:00
Stephen Birarda
a8841b475f
specify float instead of implicitly converted double
2016-02-09 17:05:16 -08:00
Stephen Birarda
1a7738353a
use a length check against source listener distance
2016-02-09 17:01:18 -08:00
Seth Alves
c2cbca88cb
allow grabbing with one hand and then equipping with other
2016-02-09 16:54:32 -08:00
Stephen Birarda
e0cb8db914
handle zero distance from listener to source
2016-02-09 16:51:23 -08:00
Stephen Birarda
87b85d6951
more useful stats for new HRTF mixer
2016-02-09 16:39:45 -08:00
Stephen Birarda
ac0db04892
repair to wrapped memcpy from AudioRingBuffer
2016-02-09 16:39:22 -08:00
Stephen Birarda
87d1d0a49c
call renderSilent when audio-mixer is struggling
2016-02-09 15:30:51 -08:00
Stephen Birarda
cafcb6b109
remove degree conversion that is not used
2016-02-09 15:25:10 -08:00
Stephen Birarda
95d0734d7f
fix for windows size_t warning
2016-02-09 15:20:34 -08:00
Stephen Birarda
5c9f673e38
fix for missing M_PI
2016-02-09 15:05:19 -08:00
Stephen Birarda
2cecfc499b
correct azimuth for HRTF
2016-02-09 15:03:55 -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
Ryan Huffman
5f1a159e1d
Fix ac monitor status checking in server console
2016-02-09 15:01:24 -08:00
howard-stearns
e2ac48fac0
Fix ToolWindow's initial position (e.g., as used by edit.js).
2016-02-09 14:49:50 -08:00
Ryan Huffman
9e9c124d0b
Fix console log not starting near the end of a file
2016-02-09 14:46:27 -08:00
Ryan Huffman
16cf86ba6b
Update styling of console log
2016-02-09 14:41:12 -08:00
Stephen Birarda
84b87b6f38
remove the unused AUDIO_MIXER_DEBUG define
2016-02-09 14:34:02 -08:00
Stephen Birarda
04dc55686b
remove some comments for HRTF cleanup tests
2016-02-09 14:31:31 -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