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 Davis
570b4a32da
Merge pull request #6206 from samcake/controllers
...
Controllers : Add a new kind onf controller to expose ReadOnly state from the application
2015-10-28 13:42:15 -07:00
Brad Davis
3c1a0930da
Merge remote-tracking branch 'upstream/master' into HEAD
...
Conflicts:
interface/src/avatar/MyAvatar.h
libraries/script-engine/src/ScriptEngine.cpp
libraries/script-engine/src/ScriptEngine.h
2015-10-28 13:38:22 -07:00
ericrius1
ac2effb33c
Not erasing board, models hosted on s3
2015-10-28 13:32:10 -07:00
samcake
b90af1a1ce
Fixing typo and review comments
2015-10-28 13:21:45 -07:00
ericrius1
4027782335
Fixed issue with overlays disapearing on release grab
2015-10-28 13:18:57 -07:00
samcake
07c13f4d66
Merge branch 'controllers' of https://github.com/highfidelity/hifi into controllers
2015-10-28 12:54:46 -07:00
samcake
bbc6d9f5e7
Fixing typo and review comments
2015-10-28 12:52:21 -07:00
samcake
b37a6f689a
Fixing typo and review comments
2015-10-28 12:51:22 -07:00
Clément Brisset
3be06a576a
Merge pull request #6204 from ZappoMan/hardwareChanged
...
emit hardwareChanged signal to scripts
2015-10-28 12:26:09 -07:00
samcake
fc15c7cd98
Adding the ApplicationStateDevice to the APplication class and add one entry ythere
2015-10-28 12:15:14 -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
Brad Hefta-Gaub
457ec76d3d
CR feedback
2015-10-28 11:21:53 -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
Brad Hefta-Gaub
30f7c44f61
emit hardwareChanged signal to scripts
2015-10-28 09:34:18 -07:00
samcake
57aa89d14f
Merge branch 'controllers' of https://github.com/highfidelity/hifi into controllers
2015-10-28 09:24:24 -07:00
samcake
37f967bc33
And adding the StateCOntroller class
2015-10-28 09:23:57 -07:00
samcake
92ca658aae
Trying to get a state controller to work
2015-10-28 09:23:20 -07:00
Seth Alves
f91dc93620
adjust locking in EntityItem::getActionDataInternal
2015-10-28 08:40:38 -07:00
Stephen Birarda
06897aa474
don't force parenting of AssetRequest/AssetUpload
2015-10-27 19:29:54 -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
45ba0645d0
Merge pull request #6199 from ZappoMan/myAvatarPalmTweaks
...
thread safety clean up of use of PalmData
2015-10-27 17:20:00 -07:00
ericrius1
2f835b19fa
surface is now a model
2015-10-27 17:17:19 -07:00
Brad Hefta-Gaub
65eae35433
a little more cleanup
2015-10-27 17:09:43 -07:00
samcake
b2a5452f87
Merge branch 'controllers' of https://github.com/highfidelity/hifi into controllers
2015-10-27 16:57:22 -07:00
samcake
6ec87086bc
Adding the state controller
2015-10-27 16:57:06 -07:00
Brad Hefta-Gaub
7f313e7f86
Merge branch 'controllers' of https://github.com/highfidelity/hifi into myAvatarPalmTweaks
2015-10-27 16:47:36 -07:00
Brad Hefta-Gaub
8461e48e83
Merge pull request #6201 from jherico/hydraFix
...
Fixing hydras
2015-10-27 16:47:14 -07:00
Brad Hefta-Gaub
d86f1b50a7
more cleanup
2015-10-27 16:37:43 -07:00
Brad Davis
b8f189dea7
Fixing hydras
2015-10-27 16:37:16 -07:00
Brad Hefta-Gaub
19743c1f39
gak, build busters and more CR feedback
2015-10-27 16:16:03 -07:00
Brad Hefta-Gaub
eb19364129
CR feedback
2015-10-27 15:56:27 -07:00
Brad Hefta-Gaub
133d48ebee
CR feedback
2015-10-27 15:53:48 -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
Brad Hefta-Gaub
7000350317
Merge branch 'controllers' of https://github.com/highfidelity/hifi into myAvatarPalmTweaks
2015-10-27 14:57:35 -07:00
Andrew Meadows
e35596428c
cleanup comment
2015-10-27 14:43:18 -07:00
