Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-16 22:57:14 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
35306 commits 75 branches 59 tags 1.2 GiB
Commit graph

14253 commits

Author SHA1 Message Date
Seth Alves
b8d800f5b8 Merge branch 'master' of github.com:highfidelity/hifi into parents 2015-12-01 11:59:10 -08:00
Stephen Birarda
7dbf29821a don't persist the octree if it never loaded 2015-12-01 10:00:25 -08:00
Seth Alves
b7ebe5b92b merge from upstream 2015-11-30 16:59:52 -08:00
Seth Alves
3402585d1a fix a crash from previous commit 2015-11-30 16:54:29 -08:00
Howard Stearns
6f50d91208 Merge pull request #6461 from hyperlogic/tony/remove-joint-states 
Refactor of Rig and MyAvatar animation JavaScript interface
 2015-11-30 16:28:15 -08:00
Seth Alves
9b54924524 edit.js can now manipulate children without flipping the table 2015-11-30 16:21:14 -08:00
Clément Brisset
e168966b87 Merge pull request #6409 from birarda/injector-hybrid 
more efficient threading of networked AudioInjector objects
 2015-11-30 15:36:41 -08:00
Seth Alves
02c4730388 Merge branch 'master' of github.com:highfidelity/hifi into parents 2015-11-30 14:09:31 -08:00
Anthony J. Thibault
e2d9e37eb8 Fix for head offset for models with no eyes 
This was causing in correct body poses while wearing an HMD.
 2015-11-30 14:08:21 -08:00
Seth Alves
5c327edd5a keep AvatarHashMap::findAvatar from creating bogus avatar entries. remove some more stray consts 2015-11-30 14:08:07 -08:00
Seth Alves
89b78986d5 remove some more stray const 2015-11-30 14:01:17 -08:00
Seth Alves
941dfe5bd2 initialize _parentJointIndex 2015-11-30 13:30:47 -08:00
Seth Alves
4b87e09848 clean up some unneeded consts. get edit.js closer to working on parented entities 2015-11-30 13:23:55 -08:00
Anthony J. Thibault
11bfed4185 Merge branch 'master' into tony/remove-joint-states 2015-11-30 11:21:44 -08:00
James B. Pollack
85b8266537 Merge pull request #6494 from ctrlaltdavid/20744 
Fix menu shortcuts created in JavaScript not working
 2015-11-30 11:20:10 -08:00
Seth Alves
081174fe69 Merge branch 'master' of github.com:highfidelity/hifi into parents 2015-11-30 10:18:01 -08:00
Andrew Meadows
49a6f63663 remove whitespace and fix warning (unused var) 2015-11-30 10:00:05 -08:00
Seth Alves
4add3e2e91 rework worldToLocal, start on allowing scripts entity position/rotation to always be in world space 2015-11-30 09:41:15 -08:00
Seth Alves
cf39cac7fc attempt to make SpatiallyNestable data access thread-safe 2015-11-29 12:50:33 -08:00
David Rowe
d6b13ef42c Fix crash when try to remove invalid menu item in JavaScript 2015-11-30 08:33:38 +13:00
Seth Alves
204c3d839e added localToWorld calls, put locks around access to _children hashtable 2015-11-29 10:17:21 -08:00
Seth Alves
eb50c9de5f aabox delivered to scripts in properties should be in world space 2015-11-29 10:16:56 -08:00
Seth Alves
facf91faac minimize diff vs master 2015-11-26 07:13:43 -08:00
Seth Alves
6062691c2a minimize diff vs master 2015-11-26 07:04:27 -08:00
Seth Alves
10cf85bad9 fix some rotation handling in EntityItem, minimize diff vs master 2015-11-26 07:02:53 -08:00
Seth Alves
ca75802b9c unmangle merge 2015-11-26 06:43:28 -08:00
Anthony J. Thibault
7c9cb97783 Merge branch 'master' into tony/remove-joint-states 2015-11-25 15:48:51 -08:00
Andrew Meadows
527408c7c1 Merge pull request #6292 from huffman/physics-continuous-collision-detection 
Physics continuous collision detection
 2015-11-25 15:45:18 -08:00
Anthony J. Thibault
5072339a22 Warning fix 2015-11-25 14:04:01 -08:00
Anthony J. Thibault
23def8d173 Merge branch 'master' into tony/remove-joint-states 2015-11-25 13:55:23 -08:00
Anthony J. Thibault
2a9adafc09 Bumped avatar packet version number 2015-11-25 12:13:40 -08:00
Anthony J. Thibault
97a2eb62d4 Fix for incorrect avatar bounds after changing avatars 2015-11-25 12:06:50 -08:00
Clément Brisset
5ff482071e Merge pull request #6465 from ericrius1/polyLineFix 
moved logic to build vertex buffer to renderable polyline class, recalculati…
 2015-11-25 11:02:02 -08:00
Anthony J. Thibault
868cf83b48 Fix for attachments and MyAvatar::getDefaultEyePosition() 2015-11-25 10:07:29 -08:00
Andrew Meadows
bc20b72645 Merge pull request #6453 from howard-stearns/avatar-render-controller2 
Survive Flash Mobs Without Making Everyone Sick
 2015-11-25 09:52:28 -08:00
Anthony Thibault
527199bc69 Merge pull request #1 from AndrewMeadows/fix-avatar-capsule 
compute bounding capsule of avatars
 2015-11-25 09:39:18 -08:00
Andrew Meadows
2cc1dfe819 getRootAbsoluteBindPoseByChildName() is deprecated 2015-11-24 20:39:26 -08:00
Andrew Meadows
3ae082f09c compute bounding capsule of avatars 2015-11-24 20:28:39 -08:00
Anthony J. Thibault
386dad7aff Fixes hand IK for some avatars 
Specifically:

   https://hifi-content.s3.amazonaws.com/ozan/dev/avatars/hifi_team/ryan/_test/ryan.fst
   https://hifi-content.s3.amazonaws.com/ozan/dev/avatars/hifi_team/brad/brad.fst
   https://s3.amazonaws.com/hifi-public/tony/blackmery/blackmery.fst

These avatars have "Hips" joints that are NOT the root of the skeleton.
This would cause the getRootAbsoluteBindPoseByChildName() to return (0,0,0).
Causing the IK targets to be lower then they should have.
 2015-11-24 18:57:35 -08:00
Anthony J. Thibault
76034d62d5 Eye tracking fixes 2015-11-24 16:57:26 -08:00
Anthony J. Thibault
f120e10ff4 Merge branch 'master' into tony/remove-joint-states 2015-11-24 15:00:05 -08:00
Howard Stearns
b12bc96fb7 Merge pull request #6482 from hyperlogic/tony/avatar-eye-tracking-fix 
Fix for avatar eye tracking
 2015-11-24 14:38:28 -08:00
Anthony J. Thibault
e07e1c5c92 Fix for avatar eye tracking 
When computing a full eye to world matrix, the translations need to be the geometry coordinate frame, not scaled into meters.
 2015-11-24 14:01:01 -08:00
Philip Rosedale
dde01b2071 Merge pull request #6476 from AndrewMeadows/arrow 
fix for objects suffering from very small updates to physics properties
 2015-11-24 11:22:25 -08:00
Brad Hefta-Gaub
fd7a704753 Merge pull request #6471 from birarda/url-cmp 
fix unnecessary model URL updating thanks to URL encoding
 2015-11-24 10:56:21 -08:00
Andrew Meadows
e26081e981 always update physics properties when they change 
and move activation check logic to MotionState
 2015-11-24 10:20:19 -08:00
Andrew Meadows
5135c9dded whitespace cleanup 2015-11-24 10:20:19 -08:00
Brad Hefta-Gaub
d32e500464 Merge pull request #6462 from jherico/rec5 
Blendshapes and attachments in recordings, plus other minor fixes.
 2015-11-24 10:01:17 -08:00
Stephen Birarda
5a7b0dd1ad put the parsed model URL in ModelEntityItem 2015-11-24 11:46:51 -06:00
Stephen Birarda
0d6b919448 cleanup printing of updated model URL 2015-11-24 11:22:30 -06:00