Commit graph

33582 commits

Author SHA1 Message Date
Anthony J. Thibault
f7b6fab0c3 Merge branch 'master' into tony/anim-sync-blend 2015-10-29 11:35:48 -07:00
Brad Hefta-Gaub
3bbba99e2b Merge pull request #6178 from samcake/color
Refactor the KeyLIght properties in their own group
2015-10-29 10:44:44 -07:00
samcake
517387621a Fixing the keyLIght Direction ui for edit.js and fix the case for D to d 2015-10-29 10:40:28 -07:00
Eric Levin
42fb683085 Merge pull request #6184 from imgntn/toybox_sounds
Add Arcade Game Sound To Toybox
2015-10-29 10:24:23 -07:00
Eric Levin
53f588ddc1 Merge pull request #6188 from imgntn/toybox_reset_buttons
Add Reset Buttons for Basketballs and Targets to Toybox
2015-10-29 10:24:12 -07:00
Seth Alves
ac1055c3e0 Merge pull request #6214 from howard-stearns/goToPosition
Don't go to wrong position on startup/teleport.
2015-10-29 10:15:26 -07:00
samcake
025422792d Fixing the keyLIght Direction ui for edit.js 2015-10-29 10:13:28 -07:00
Seth Alves
10717dc364 Merge pull request #6154 from howard-stearns/safe-avatar-list-access
Safe avatar list access
2015-10-29 10:12:34 -07:00
Andrew Meadows
d33530f5d0 Merge pull request #6209 from howard-stearns/guard-rendering-of-avatar-collision-hull
Don't render avatar's renderBoundingCollisionShapes before data is there
2015-10-29 09:34:26 -07:00
Andrew Meadows
f9012d5051 Merge pull request #6187 from sethalves/fix-actions-ttl
fix actions bug
2015-10-29 09:30:21 -07:00
Brad Hefta-Gaub
21decaaf8e Merge pull request #6218 from ctrlaltdavid/20719
20719 Fix audio stats dialog box not being sized properly
2015-10-29 08:16:56 -07:00
Brad Hefta-Gaub
d324771f6b Merge pull request #6219 from howard-stearns/fix-avatar-draw-mesh-toggle
Fix Developer->Avatar->Draw Mesh
2015-10-28 23:16:51 -07:00
Howard Stearns
697b9fb60b Merge pull request #6205 from hyperlogic/tony/eye-lookat-fix
Fixes locally rendered eye gaze
2015-10-28 21:39:54 -07:00
Howard Stearns
5b6a8eddf9 Merge pull request #6216 from hyperlogic/tony/bug-eyed-mery-fix
FBXReader: More deterministic loading behavior
2015-10-28 21:31:57 -07:00
Howard Stearns
8c395209e8 Fix Developer->Avatar->Draw Mesh
MyAvatar::setEnableMeshVisible -> Model::setVisibleInScene sets a flag that no one was looking at any more.
2015-10-28 21:23:35 -07:00
Anthony J. Thibault
5e73af9272 Rig: Removed dt from updateFromEyeParameters() 2015-10-28 18:10:41 -07:00
samcake
fd7582ad31 Merge branch 'master' of https://github.com/highfidelity/hifi into color 2015-10-28 17:58:04 -07:00
Anthony J. Thibault
7367f2a28c FBXReader: remove debugging logs 2015-10-28 17:55:06 -07:00
Brad Hefta-Gaub
db3d8c4956 Merge pull request #6213 from Atlante45/master
Fix ScriptEngine crash
2015-10-28 17:40:05 -07:00
samcake
630cdb8a9d Modify the html presentiong the zone enity properties to match the internal new representation 2015-10-28 17:29:06 -07:00
David Rowe
568e5536b8 Control bandwidth stats dialog sizing similarly 2015-10-29 13:18:43 +13:00
David Rowe
4cb5ccab90 Fix audio stats dialog not being sized properly 2015-10-29 13:18:27 +13:00
Atlante45
136747929e Fix typo 2015-10-28 17:11:46 -07:00
Howard Stearns
ba7d46b556 Merge branch 'master' of https://github.com/highfidelity/hifi into guard-rendering-of-avatar-collision-hull 2015-10-28 16:58:56 -07:00
Anthony J. Thibault
5acb088c46 FBXReader: More deterministic loading behavior
This makes iteration over meshes and connections between them deterministic.
[QHash](http://doc.qt.io/qt-5/qhash.html#details) and QMultiHash do not guarantee consistent iteration order.
This is problematic for the FBXReader because it could result in different behavior each time a model was loaded.

Specifically, This was causing a bug with some avatars that contained multiple-bind poses.
The bind pose returned to the application from the FBXReader would be different on different runs.
This PR doesn't add support for multiple-bind poses, but it does make the choice of which
bind pose is chosen deterministic.

This non-determinism was the cause of the Mery avatar having "bug-eyes" 1/12 times.
2015-10-28 16:57:27 -07:00
samcake
a5b95d7307 Fixing the entity properties view with the new properties group 2015-10-28 16:46:56 -07:00
howard-stearns
62e56d3f13 Don't go to wrong position on startup/teleport.
This fixes one cause of being in the wrong place.
https://app.asana.com/0/32622044445063/61787931469907
2015-10-28 16:44:53 -07:00
Atlante45
7695afec0a Fix ScriptEngine crash 2015-10-28 16:43:41 -07:00
samcake
e4aab4bd97 Merge branch 'master' of https://github.com/highfidelity/hifi into color 2015-10-28 15:32:13 -07:00
Seth Alves
170725418b Merge pull request #6210 from birarda/editors-casing
use a case insensitive search for allowed editors list
2015-10-28 14:53:56 -07:00
Stephen Birarda
6d99a822a3 use a case-insensitive search in allowed editors QStringList 2015-10-28 14:33:50 -07:00
Brad Hefta-Gaub
61e35d7ada Merge pull request #6203 from sethalves/fix-action-crash
adjust locking in EntityItem::getActionDataInternal
2015-10-28 14:02:28 -07:00
Howard Stearns
bc0e14cb71 Don't render avatar's renderBoundingCollisionShapes before the data is there.
(Found while trying to repro "Deadlock in AvatarData::nextAttitude() on main thread" https://app.asana.com/0/32622044445063/61023569045356)
2015-10-28 13:58:44 -07:00
Seth Alves
22d6b6df34 make withWriteLock and withTryWriteLock const 2015-10-28 13:49:52 -07:00
Brad Hefta-Gaub
731fab6ffc Merge pull request #6196 from jherico/gl
Move GL utilities to their own library
2015-10-28 12:10:52 -07:00
Brad Hefta-Gaub
c5e22a62e8 Merge pull request #6182 from Atlante45/script-engine
Improved ScriptEngine debug messages
2015-10-28 11:27:30 -07:00
Howard Stearns
21afcf48ae Merge pull request #6200 from AndrewMeadows/character-controller
Move DynamicCharacterController to MyAvatarController
2015-10-28 11:24:03 -07:00
Anthony J. Thibault
6ae5c540fd SkeletonModel: coding standard fix
Replaced glm::vec3(0) with glm::vec3().
2015-10-28 11:09:24 -07:00
Seth Alves
a1096510e8 put some useless consts back 2015-10-28 10:52:01 -07:00
Howard Stearns
367175b8a6 Reduce lock time. 2015-10-28 10:49:19 -07:00
Anthony J. Thibault
b3734b5ddb Rig: removed redundant method updateEyeJoints()
Instead we call updateEyeJoint() twice, once for each eye.
2015-10-28 10:46:09 -07:00
Seth Alves
f6a0004f26 get rid of some useless consts 2015-10-28 10:45:24 -07:00
Seth Alves
08a0bf33a4 avoid unneeded read-lock if action-data was dirty 2015-10-28 09:55:55 -07:00
Seth Alves
d504f449e4 undo last commit -- avoid unneeded read-lock if action-data was dirty 2015-10-28 09:55:11 -07:00
Seth Alves
2b5b4f1118 avoid unneeded read-lock if action-data was dirty 2015-10-28 09:54:16 -07:00
Andrew Meadows
afec2a9771 fix whitespace 2015-10-28 09:42:55 -07:00
Seth Alves
f91dc93620 adjust locking in EntityItem::getActionDataInternal 2015-10-28 08:40:38 -07:00
Anthony J. Thibault
f9dc05c989 Rig::computeMotionAnimationState better filtering of small dt velocities.
Only update _lastVelocity when dt is sufficiently large.
2015-10-27 18:59:02 -07:00
Anthony J. Thibault
ae8938cadc Fix for local eye tracking in AnimGraph
Also moved Rig::updateAnimations() now occurs after
Rig::updateFromHeadParameters() and Rig::updateFromHandParameters().
This should remove a frame of lag for head and hand IK targets.

Rig::updateFromEyeParameters() occurs after Rig::updateAnimations().
But now the eye JointStates are re-computed, this is the actual
fix for the local eye tracking issue.
2015-10-27 18:30:35 -07:00
Brad Davis
5cbb2562cd Move GL utilities out to their own library 2015-10-27 15:53:42 -07:00