Howard Stearns
f7d558a252
comment
2015-10-29 19:26:54 -07:00
Howard Stearns
dcc173c93a
comment.
2015-10-29 19:21:24 -07:00
Howard Stearns
5d1ba90f1e
More readable code.
2015-10-29 19:18:34 -07:00
Howard Stearns
ada32dd260
typo
2015-10-29 19:17:52 -07:00
Howard Stearns
502cc7f580
Don't copy while converting.
2015-10-29 16:44:01 -07:00
Howard Stearns
303491817b
assert to get hard error in dev, warning and no-op in release.
2015-10-29 16:35:59 -07:00
Howard Stearns
6b4b4440e8
Merge branch 'master' of https://github.com/highfidelity/hifi into expose-anim-vars
2015-10-29 16:06:24 -07:00
Brad Hefta-Gaub
3c11cf2926
Merge pull request #6226 from kencooke/master
...
Workaround for audio having channels swapped under Qt 5.5.1
2015-10-29 13:25:41 -07:00
Ken Cooke
1eabb924f1
Fixed the logic to be correct
2015-10-29 12:53:47 -07:00
Stephen Birarda
fb55f0becb
guard timeElapsed for simulateKinematicMotion to max 1s
2015-10-29 12:50:34 -07:00
Andrew Meadows
0c5b4115ed
Merge pull request #6221 from huffman/physics-substep-fix
...
Physics substep fix
2015-10-29 12:39:15 -07:00
Ken Cooke
4d576d7aaf
Fix typo
2015-10-29 12:23:36 -07:00
Ken Cooke
143b9c663f
Quick fix for audio having channels swapped under Qt 5.5.1.
2015-10-29 12:21:28 -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
Howard Stearns
6e4d0043c9
Merge branch 'master' of https://github.com/highfidelity/hifi into expose-anim-vars
2015-10-29 10:32:12 -07:00
Howard Stearns
4083c5c71b
Handle wrapping of very long-lived sessions.
2015-10-29 10:31:36 -07:00
Ryan Huffman
49877c2dff
Move _hasOutgoingChanges in onSubStep to previous location
2015-10-29 10:19:18 -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
f9012d5051
Merge pull request #6187 from sethalves/fix-actions-ttl
...
fix actions bug
2015-10-29 09:30:21 -07:00
Howard Stearns
d79d0bc5c5
Merge branch 'master' of https://github.com/highfidelity/hifi into expose-anim-vars
2015-10-29 08:25:41 -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
Atlante45
136747929e
Fix typo
2015-10-28 17:11:46 -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
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
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
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
Seth Alves
a1096510e8
put some useless consts back
2015-10-28 10:52:01 -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
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
Andrew Meadows
c9cd336400
fix for bad contacts after changing avatar models
2015-10-27 15:01:48 -07:00
Andrew Meadows
43aac813da
more prep for shifting avatar during HMD motion
2015-10-27 13:15:38 -07:00
Andrew Meadows
a1f1e50431
split CharacterController btw phys and interface
2015-10-27 13:15:38 -07:00
Howard Stearns
9e223a9502
Merge branch 'master' of https://github.com/highfidelity/hifi into safe-avatar-list-access
2015-10-27 12:57:41 -07:00
Atlante45
c0138bd189
Rename check functions and make them static
2015-10-27 12:39:40 -07:00
