Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-04 05:33:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
78042 commits 25 branches 0 tags 1.1 GiB
Commit graph

467 commits

Author SHA1 Message Date
SamGondelman
0bcd8b81e1 trying and failing to fix models 2019-05-01 12:01:49 -07:00
SamGondelman
d99af64410 fix wearables not disappearing with avatar 2019-04-29 16:01:38 -07:00
Anthony Thibault
4761a69a4d
Merge pull request #15438 from luiscuenca/skeletonTrait 
Skeleton Trait Implementation
 2019-04-26 10:14:47 -07:00
luiscuenca
080f891c9f
Fix scale and refactor debug function 2019-04-25 14:54:40 -07:00
luiscuenca
b10aca10d4
Fix code standard issues 2019-04-23 09:45:39 -07:00
luiscuenca
9c90a2b684
more fixes 2019-04-22 13:17:42 -07:00
luiscuenca
20cac4cd4d
Rotation fix and refactor 2019-04-22 11:38:27 -07:00
luiscuenca
1ad197df26
Send avatar skeleton trait 2019-04-16 17:40:43 -07:00
Shannon Romano
50f39e88d6
Merge pull request #15365 from hyperlogic/bug-fix/better-camera-in-head-check 
Better head vs camera checks for avatar head cauterization
 2019-04-16 15:07:46 -07:00
Anthony J. Thibault
7aeb4bca87 Include head rotation in getEyeModelPositions 2019-04-11 14:05:15 -07:00
David Rowe
ca3f45163f Merge branch 'master' into M21989 2019-04-11 10:37:34 +12:00
Anthony J. Thibault
02d5769991 Better head vs camera checks for avatar head cauterization 
* cameraInsideHead() check now uses detailed avatar collision when possible.
* head is now more constantly hidden in first person camera mode
* getEyeModelPositions() uses a better estimate when avatar eye joints are missing.
* moved findPointKDopDisplacement from Rig.cpp into AnimUtil.cpp
* added isPlayingOverrideAnimation() method to Rig class
 2019-04-09 12:57:03 -07:00
Anthony Thibault
0e2c5ea3c2
Merge pull request #15291 from luiscuenca/multiSpheresMixFix 
Fix avatar multi-sphere bad scaling on some avatars
 2019-04-05 15:55:13 -07:00
David Rowe
2a17ad3da5 AvatarList and AvatarManager JSDoc 2019-04-04 10:11:54 +13:00
Shannon Romano
cf7eeb7355
Merge pull request #15285 from danteruiz/avatar-fading 
Case 21415: Avatars stay behind after they disconnect
 2019-04-01 18:04:42 -07:00
danteruiz
8115ef6d36 addressing more requested changes 2019-04-01 16:46:15 -07:00
danteruiz
db17f094da adding entities to fade out list; 2019-03-29 15:23:16 -07:00
luiscuenca
bea45e67cb Fix multisphere scale, desyncronize visualization and support joint scaling 2019-03-28 17:38:17 -07:00
danteruiz
b9d04c6ebb adding entity to a faded list 2019-03-28 16:42:29 -07:00
danteruiz
40d424a01d avatar fading 2019-03-27 16:42:34 -07:00
Andrew Meadows
fb7daa185d improved physics for grabbed AvatarEntities 2019-03-27 10:12:59 -07:00
Seth Alves
fa36f12145 lock wearables when adjust-wearables page is opened 2019-03-27 10:12:57 -07:00
Seth Alves
29af3b1612 add a button to Avatar panel to lock or unlock wearables. 
allow grabbing / adjusting others' wearables if they are unlocked.
 2019-03-27 10:12:57 -07:00
David Rowe
cf4370ed3a Merge branch 'master' into M21222 2019-03-26 09:44:48 +13:00
David Rowe
b78ae80ae6 Address review comments and add further examples 2019-03-26 09:40:47 +13:00
Andrew Meadows
9d11e44b4b update AvatarEntity trait when parentID changes 2019-03-20 11:37:16 -07:00
SamGondelman
79dda7a6c7 build errors 2019-03-15 14:29:50 -07:00
SamGondelman
c985fc735d clean up avatar rendering and ring gizmo normals 2019-03-14 14:43:43 -07:00
David Rowe
7445d73857 Merge branch 'master' into M21222 
# Conflicts:
#	libraries/avatars/src/AvatarData.h
 2019-03-13 16:14:14 +13:00
David Rowe
4779a6b156 Merge branch 'master' into M21222 2019-03-09 07:57:53 +13:00
Thijs Wenker
d985d1bff0 use Rig instead of Avatar for height calculations 2019-03-08 03:36:56 +01:00
David Rowe
0b7cddb886 Fill in and tidy MyAvatar JSDoc 2019-03-08 13:49:10 +13:00
amer cerkic
ad69611b7c removing redef of the two functions in avatar.h 2019-03-01 11:08:00 -08:00
amerhifi
35dc13e06a
Merge branch 'master' into quest-demo 2019-02-28 14:06:47 -08:00
David Rowe
d73ff2e855 Revise current MyAvatar API JSDoc 2019-02-28 10:40:10 +13:00
David Rowe
e79594ef53 Fill in and tidy Avatar JSDoc 2019-02-27 09:53:11 +13:00
amantley
9b73c83ebc removed merge markers 
(cherry picked from commit 4286142daac70269de155c99c9bbdb1f951eaff6)
 2019-02-22 11:55:14 -08:00
amantley
87d98e5b85 These are the squashed commits for the ik optimization for the Quest 
Implmented using a new AnimSplineIK node in the anim graph

(cherry picked from commit 4fe03ba238659fee7763991f2499a315482b351f)
 2019-02-22 11:21:36 -08:00
amantley
c9db426ce4 Merge remote-tracking branch 'upstream/master' into animSplineIK 2019-02-21 14:36:13 -08:00
amantley
64ec28ef44 added back missing unity meta files 2019-02-21 11:37:14 -08:00
amantley
afed0b5442 review changes 2019-02-21 11:08:29 -08:00
SamGondelman
c8ffb130a3 only update sub items on change 2019-02-19 17:38:47 -08:00
David Rowe
f58a5db0b0 Reorganize JSDoc inheritance for MyAvatar and Avatar 2019-02-19 09:47:51 +13:00
David Rowe
50a1e07ed2 Stub missing MyAvatar, Avatar, and Agent functions and properties JSDoc 2019-02-18 18:32:49 +13:00
SamGondelman
06ac2b291b attachments and wearables cull with avatar parent 2019-02-17 17:52:10 -08:00
SamGondelman
935d827421 try to cull wearables with avatars 2019-02-17 02:10:25 -08:00
Angus Antley
70764bc3c4 Merge remote-tracking branch 'upstream/master' into animSplineIK 2019-02-15 19:24:30 -08:00
Sam Gondelman
9aa99f24f0
Merge pull request #14905 from SamGondelman/materialMapping 
Case 20242: FST materialMapping supports our material JSON format
 2019-02-15 11:21:51 -08:00
amantley
0fcaa695ba Merge remote-tracking branch 'upstream/master' into animArmIK 2019-02-15 10:35:33 -08:00
amantley
425413419a fixed merge conflict in avatar.h 2019-02-15 08:26:54 -08:00