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
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
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
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
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
Seth Alves
4c64da9ce5
try to avoid negative roll-over when moving to or from server time
2015-10-27 10:27:32 -07:00
black plastick
d34fc35544
added AvatarList.avatarSessionChanged(sessionUUID, oldUUID) for AC scripts.
2015-10-27 08:11:20 -04:00
howard-stearns
cbade6a095
Do not shut down hydra when it says there are no devices. Count to
...
allowedHydraFailures in settings.
2015-10-26 19:27:22 -07:00
Anthony J. Thibault
485e36d824
Bug fix for hand IK when using the Owen avatar.
...
The IK was assiming that the "Hips" bone index was always 0.
This was not the case for Owen. Now we lookup the Hips index
and cache it for use during the hipsOffset computation.
2015-10-26 17:17:46 -07:00
black plastick
f5d12ee2c6
Added AvatarList script events for assigment client scripts:
...
AvatarList.avatarAddedEvent(sessionUUID);
AvatarList.avatarRemovedEvent(sessionUUID);
2015-10-26 17:46:08 -04:00
Seth Alves
0dff037f56
fuck you, const!
2015-10-26 13:55:07 -07:00
Seth Alves
8d0aaed41a
fix bug that was deleting actions with 0 ttl. in js interface, action parameter 'lifetime' is now called 'ttl'
2015-10-26 13:50:21 -07:00
Ryan Huffman
913026280c
Fix EntityTreeRenderer dropping contact end events
2015-10-26 13:02:39 -07:00
Ryan Huffman
837430329b
Fix collision start/end in single physics simulation to be lost
2015-10-26 13:02:17 -07:00
samcake
8e2c269cc0
doing the correct conversion for byte to normalize float...
2015-10-26 12:24:20 -07:00
samcake
ff57b73bd6
Creating the COlorUTils in shared to deal with all the standard color conversions
2015-10-26 10:53:21 -07:00
samcake
ca30ce1ff0
Move the keyLIght properties in their own group and add the ambientURL in
2015-10-26 10:08:16 -07:00
Howard Stearns
4b4907c9ef
Allow multiple scripts to register, and allow them to specify the specific anim vars they are interested in.
2015-10-26 10:04:55 -07:00
samcake
bc7ad9d3f7
Move the keyLIght properties in their own group and add the ambientURL in
2015-10-26 09:27:06 -07:00
Howard Stearns
e11b0add9a
Update safety trampoline with correct arguments.
2015-10-24 15:29:49 -07:00
samcake
42ac8c5769
Stariting to reorganize the keyLight porperties of the Zone Entity
2015-10-23 18:15:19 -07:00
Howard Stearns
7b0b77f4d1
getAvatarHash => withAvatarHash
2015-10-23 16:57:27 -07:00
Howard Stearns
c2a4aab7c3
Merge branch 'master' of https://github.com/highfidelity/hifi into safe-avatar-list-access
2015-10-23 16:52:42 -07:00
Howard Stearns
84cfeaec13
Linux QT wants .h-less headers.
2015-10-22 17:01:06 -07:00
howard-stearns
92ddedd44b
Make msvc happy.
2015-10-22 16:44:15 -07:00
Howard Stearns
773e4014ca
Merge branch 'master' of https://github.com/highfidelity/hifi into expose-anim-vars
2015-10-22 16:26:59 -07:00
Howard Stearns
2b7ceffd64
Get rid of globalObject().property("MyAvatar").property("animationStateHandlerResult").
2015-10-22 16:23:09 -07:00
Howard Stearns
913842ac30
Thread check, for consistency.
2015-10-22 15:31:17 -07:00
Howard Stearns
ecc920199d
Return id suitable for use with remover, per comments.
2015-10-22 15:24:24 -07:00
Howard Stearns
1d0464ede5
Name change and thread checks per comments.
2015-10-22 15:15:10 -07:00
Howard Stearns
759e652506
Thread test per comments.
2015-10-22 15:13:14 -07:00
Howard Stearns
dbf5072814
Merge branch 'master' of https://github.com/highfidelity/hifi into expose-anim-vars
2015-10-22 13:35:30 -07:00
Howard Stearns
624ed7c711
fix comment
2015-10-22 13:14:38 -07:00
Howard Stearns
0d514ad645
Thread-safe avatar list access
2015-10-22 13:02:08 -07:00
Brad Hefta-Gaub
ea917f85f4
added ability to set keyhole radius on EntityViewer
2015-10-22 12:56:45 -07:00
samcake
b2461a8e4e
Merge branch 'master' of https://github.com/highfidelity/hifi into color
2015-10-22 12:06:20 -07:00
Howard Stearns
30429e8138
Don't use late-breaking results that got reported after the handler was removed.
2015-10-22 11:43:22 -07:00
Howard Stearns
b5ccd49959
Make ubuntu happy.
2015-10-22 11:42:50 -07:00
samcake
a44ac4cbfd
Fiing the dark colors for surfaces without texture
2015-10-22 11:40:56 -07:00
Stephen Birarda
a8d591166e
Merge branch 'master' of https://github.com/highfidelity/hifi into qt-5.5
2015-10-22 11:13:28 -07:00
Stephen Birarda
695f0a75b0
fixes for builds with qt 5.5
2015-10-22 11:12:51 -07:00
Howard Stearns
a58539be82
Merge branch 'master' of https://github.com/highfidelity/hifi into expose-anim-vars
2015-10-22 10:39:54 -07:00
Howard Stearns
9fd61907f5
Call back to Javascript asynchronously, so that we don't block and the script's engine doesn't have thread conflicts.
2015-10-21 20:50:07 -07:00
Brad Hefta-Gaub
856af8c764
fix EntityItemID dependency
2015-10-21 14:33:12 -07:00
Brad Hefta-Gaub
246e46b69a
implement improvement in sphere test
2015-10-21 10:46:50 -07:00
Brad Hefta-Gaub
954afe45d3
Merge pull request #6112 from ericrius1/rayPickAdditions
...
Moved whitelist and raypicking code out of octree, fixed small bug with polylines
2015-10-21 09:08:56 -07:00
Brad Hefta-Gaub
d34ad2af42
improved findEntities(sphere) to check against Non-AABBox of entities
2015-10-20 21:01:20 -07:00
Howard Stearns
3d2f00c609
Cleaner intgerface, including cleanup.
2015-10-20 17:01:45 -07:00
Stephen Birarda
14aab4871d
Merge pull request #6119 from Atlante45/baseball
...
Fix autoresizing log spam
2015-10-20 13:45:50 -07:00
Howard Stearns
4c6867bb9c
Merge branch 'master' of https://github.com/highfidelity/hifi into expose-anim-vars
2015-10-20 12:17:00 -07:00
Andrew Meadows
7fa069cf30
fix line endings grumble gruble
2015-10-20 09:38:25 -07:00
ericrius1
0373a481f8
Using EntityItemIDs instead of QUuids
2015-10-20 09:22:16 -07:00
Andrew Meadows
341bc3666f
Merge pull request #6093 from sethalves/hold-action-changes
...
Hold action changes
2015-10-20 09:19:48 -07:00
Philip Rosedale
282485d412
Merge pull request #6116 from AndrewMeadows/reduced-hips-shift-from-hand-targets
...
hack to reduce hand influence of hips in HMD mode
2015-10-19 22:31:50 -07:00
Howard Stearns
2213a4bb02
Do not set (just rightHand) anim var if a script has done so.
2015-10-19 20:09:48 -07:00
Atlante45
1c46f2aa75
Fix autoresizing log spam
2015-10-19 18:22:44 -07:00
samcake
b977a094d3
Merge pull request #6115 from ZappoMan/fixLOD
...
fix model LOD behavior
2015-10-19 16:16:48 -07:00
Seth Alves
bddbe89c86
don't accept incoming location edits if an entity is being controlled by a shouldSuppressLocationEdits action
2015-10-19 16:13:53 -07:00
Seth Alves
9e24542c0b
don't accept incoming location edits if an entity is being controlled by a shouldSuppressLocationEdits action
2015-10-19 16:05:56 -07:00
Seth Alves
00594f0cce
don't accept incoming location edits if an entity is being controlled by a shouldSuppressLocationEdits action
2015-10-19 16:05:10 -07:00
Andrew Meadows
97b41957f7
Merge pull request #6113 from hyperlogic/tony/blender-fbx-fix
...
Joint rotation fix for FBX files exported from Blender.
2015-10-19 15:59:51 -07:00
Seth Alves
a1cfebc173
don't accept incoming location edits if an entity is being controlled by a shouldSuppressLocationEdits action
2015-10-19 15:57:15 -07:00
Brad Hefta-Gaub
0b2bf8bda8
remove some dead code
2015-10-19 15:23:45 -07:00
Brad Hefta-Gaub
110adc5c22
fix model LOD behavior
2015-10-19 15:21:25 -07:00
Andrew Meadows
917bfbf64e
hack to reduce hand influence of hips in HMD mode
2015-10-19 15:19:32 -07:00
Seth Alves
6f30a3c178
new method -- ObjectMotionState::getBodyLinearVelocityGTSigma
2015-10-19 13:56:30 -07:00
Anthony J. Thibault
62c89eaf7d
Joint rotation fix for FBX files exported from Blender.
...
This isn't a great fix. But it will at least allow people to export avatars from Blender.
2015-10-19 13:49:13 -07:00
ericrius1
dcb37ccd73
Removed whitelist and raypicking code from octree, fixed a small bug with polylines
2015-10-19 13:14:19 -07:00
Seth Alves
113321184d
if model RegistrationPoint doesn't match entityItem's, update it
2015-10-19 12:21:26 -07:00
Seth Alves
ac99005602
reverting a change to try to see sticking problem again
2015-10-19 12:13:08 -07:00
Seth Alves
f96e9eb1e8
fuck you, const!
2015-10-19 12:04:55 -07:00
ericrius1
8c229d88a8
moving whitelist code out of octree
2015-10-19 11:59:44 -07:00
Seth Alves
46e5bf0435
take entity-server clock-skew into account when handling action expiration times
2015-10-19 11:59:03 -07:00
Seth Alves
5c031a38c7
try another way of fixing held object snagging at slow velocity
2015-10-19 10:29:30 -07:00
Seth Alves
c5a5f26e6a
try another way of fixing held object snagging at slow velocity
2015-10-19 10:27:35 -07:00
Seth Alves
2bdcb256d8
try another way of fixing held object snagging at slow velocity
2015-10-19 10:26:37 -07:00
Seth Alves
26dcaeb056
try another way of fixing held object snagging at slow velocity
2015-10-19 10:10:43 -07:00
Seth Alves
fbe3cb9511
try another way of fixing held object snagging at slow velocity
2015-10-19 09:56:51 -07:00
Seth Alves
742e48b0c8
try another way of fixing held object snagging at slow velocity
2015-10-19 09:48:34 -07:00
Brad Hefta-Gaub
bddb0e1e7b
ifdef out buggy texture map code
2015-10-19 09:43:08 -07:00
Brad Davis
282cdadf63
Fixing line endings
2015-10-18 22:55:14 -07:00
Howard Stearns
6aa164ac85
Merge branch 'master' of https://github.com/highfidelity/hifi into expose-anim-vars
2015-10-18 11:47:19 -07:00
Seth Alves
1f3b92577d
update _model's location anytime it doesn't match the entity's location
2015-10-17 20:08:25 -07:00
