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
Atlante45
32f88f3fb6
Fix for JSConcole
2015-10-27 14:37:39 -07:00
Brad Hefta-Gaub
5a42991e0c
first pass at cleaning up MyAvatars use of PalmData
2015-10-27 13:51:42 -07:00
Andrew Meadows
8b285fd228
recover follow HMD behavior
2015-10-27 13:51:40 -07:00
ericrius1
d67f4958cd
wait longer for dimensions
2015-10-27 13:44:29 -07:00
ericrius1
ed6a866ff9
ready for demo
2015-10-27 13:43:13 -07:00
Andrew Meadows
43aac813da
more prep for shifting avatar during HMD motion
2015-10-27 13:15:38 -07:00
Andrew Meadows
24c2f538a4
keep MyAvatar RigidBody on shape changes
2015-10-27 13:15:38 -07:00
Andrew Meadows
355ebe923d
cleanup and comments
2015-10-27 13:15:38 -07:00
Andrew Meadows
5e59e9595b
fix typo in comments
2015-10-27 13:15:38 -07:00
Andrew Meadows
5f278f9024
name change
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
ericrius1
0512da0e39
updated url
2015-10-27 13:07:11 -07:00
ericrius1
25ded2bd92
added shapetype
2015-10-27 13:03:44 -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
ericrius1
8fcc071026
only can draw on whiteboard
2015-10-27 12:24:29 -07:00
Brad Hefta-Gaub
00d5c8f682
Merge pull request #6197 from EdgarPironti/controllers
...
Fixed standard.json
2015-10-27 12:23:21 -07:00
Atlante45
ffe73348fb
Move check functions to cpp only
2015-10-27 12:11:27 -07:00
Atlante45
a53a576aa3
checkExceptions after testing entity scripts in the sandbox
2015-10-27 12:11:27 -07:00
Atlante45
ea56f965a4
Lambda conversion fix for windows
2015-10-27 12:11:27 -07:00
Atlante45
1bebdc8e70
Fix scripts syntax errors
2015-10-27 12:11:27 -07:00
Atlante45
3e43a3c345
Some more script checks
2015-10-27 12:11:27 -07:00
Atlante45
13b7fa6b5d
Typo
2015-10-27 12:11:27 -07:00
Atlante45
c8c9118d4d
Improve script engine error logging + some cleanup
2015-10-27 12:11:27 -07:00
Atlante45
3742c169b5
Make handler generators more readable
2015-10-27 12:11:27 -07:00
ericrius1
f0a1335957
fixed paint initially showing up white
2015-10-27 12:09:07 -07:00
ericrius1
fa22249f7a
Improving model
2015-10-27 12:03:30 -07:00
EdgarPironti
596b315286
Fixed standard.json
2015-10-27 11:35:30 -07:00
ericrius1
8a85468254
changing model, repositioning
2015-10-27 10:39:44 -07:00