Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 17:55:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
34009 commits 71 branches 56 tags 1.2 GiB
Commit graph

34009 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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