Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-15 18:16:39 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
63325 commits 25 branches 0 tags 1.1 GiB
Commit graph

129 commits

Author SHA1 Message Date
Anthony J. Thibault
963ddce7bc Use eye-height to match user and avatar scales, follow fixes 
Fix postPhysicsUpdate to properly transform follow displacement into sensor frame.
 2017-08-21 17:42:24 -07:00
Anthony J. Thibault
80b660b258 Added userHeight accessors and preference 
Also made Avatar::getHeight thread-safe
 2017-08-21 17:42:23 -07:00
Anthony J. Thibault
d196743986 Added Avatar::getHeight() method 2017-08-21 17:42:22 -07:00
Sam Gateau
79f3be1efe Merge pull request #11021 from Zvork/fade2 
Fade dissolve effect  JUST AVATARS
 2017-08-10 13:48:30 -07:00
Anthony J. Thibault
1b6feb63c8 Fix for crash when attempting to teleport while avatar was loading 
The fix had two parts.
  * Make Avatar::getAbsoluteDefaultJointXXXInObjectFrame thread safe
  * Make teleport.js handle a zero foot offset more gracefully, to prevent the avatar from teleporting into the floor.
 2017-08-01 18:40:43 -07:00
Andrew Meadows
8c55476c65 fix motor direction when walking upside down 
also maintain worldUp and remove unnecessary cruft
 2017-07-24 16:00:13 -07:00
Andrew Meadows
29be9aee65 move nextAttitude() from AvatarData to MyAvatar 2017-07-24 16:00:13 -07:00
humbletim
f9e0e616f7 Merge remote-tracking branch 'upstream/master' into 21180-C++ 2017-07-18 17:34:39 -04:00
Olivier Prat
b125fba2e1 Removed untested avatar bubble fade code. Made changes as requested by Andrew 2017-07-13 23:04:55 +02:00
Olivier Prat
b68ec4f933 Merge branch 'master' of git://github.com/highfidelity/hifi into fade 2017-07-13 22:36:52 +02:00
Olivier Prat
edcfecd5d4 Merge branch 'master' of git://github.com/highfidelity/hifi into fade 2017-07-13 11:05:14 +02:00
Olivier Prat
2d2722bfc5 Added async transition query on scene 2017-07-13 11:05:04 +02:00
Seth Alves
85d0b68284 try again on putting result of Avatar::getJointNames in index order 2017-07-12 20:36:37 -07:00
Seth Alves
44de1dd2be put result of Avatar::getJointNames back in index-order 2017-07-12 19:25:39 -07:00
Stephen Birarda
f6d9a79fb5 Revert "Revert "fix for invisible avatars after radius ignore"" 2017-07-12 10:36:53 -07:00
Olivier Prat
2f9885870b First merge with Sam's fader branch with custom pipeline support in shape plumber 2017-07-12 17:29:21 +02:00
Olivier Prat
7552cca316 First alpha version of bubble collision fade events. Missing a lot of information. 2017-07-11 19:26:15 +02:00
Olivier Prat
381e0c64a8 Working avatar fade in / fade out except that it is also triggered on bubble collisions 2017-07-11 16:43:27 +02:00
Andrew Meadows
96b88dccd7 Merge pull request #10913 from samcake/orange 
Introducing the Stages to the render::Scene, Better scene update phase and getting away from the singleton model
 2017-07-10 09:46:09 -07:00
Olivier Prat
267531cc1a First working fade 2017-07-10 15:27:09 +02:00
Seth Alves
6782a891d0 rename the joint-name caches in AvatarData and Avatar so it's more clear that they are different 2017-07-07 10:35:45 -07:00
Seth Alves
88c39f3237 off-by-one 2017-07-07 09:15:42 -07:00
Sam Gateau
156c20d01e Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2017-07-07 10:58:05 +02:00
Seth Alves
ddabe940d6 dry up some code 2017-07-06 18:42:00 -07:00
Seth Alves
801c45898f dry up some code 2017-07-06 18:41:11 -07:00
Seth Alves
57ba2c5cd6 add invalidateJointIndicesCache method 2017-07-06 18:16:41 -07:00
Seth Alves
ef4a04b9cf code style 2017-07-06 18:01:58 -07:00
Seth Alves
ab8d9f4885 check for faux joints before heading into code that needs to lock 2017-07-06 18:00:11 -07:00
Seth Alves
a543b957ef fix a race 2017-07-06 17:45:57 -07:00
Seth Alves
fc61fcf494 coding style 2017-07-06 17:40:41 -07:00
Seth Alves
2e88eca2b9 oopsy crazy 2017-07-06 16:33:37 -07:00
Seth Alves
e03b902a15 change when joint cache is copied 2017-07-06 15:42:24 -07:00
Seth Alves
0ac8f6efa3 cache the jointnames and indexes from FBXGeometry for out-of-thread access 2017-07-06 14:02:59 -07:00
Seth Alves
e9bdbd7715 Merge branch 'calvin' of github.com:samcake/hifi into faster-getters-on-avatar-for-scripts 2017-07-06 11:09:38 -07:00
Brad Davis
6fc82bb351 Switch to preprocessor macro for blocking invokes to capture function information 2017-06-30 11:36:24 -07:00
Brad Davis
b52dd7b822 Don't use blocking connections on the main thread 2017-06-29 20:45:17 -07:00
Sam Gateau
f7a3b3a411 Experimenting faster getters on Avatar for scripts 2017-06-29 15:55:47 +02:00
humbletim
f6262ad54d Merge remote-tracking branch 'upstream/master' into 21180-C++ 2017-06-23 16:37:10 -04:00
samcake
20d8c11e28 ALmost there, getting eback everything to work with the light and background stages in the scene, not in deferredLighting Effect anymore 2017-06-22 17:54:16 -07:00
Zach Fox
cbdffce88e Merge branch 'master' of https://github.com/highfidelity/hifi into spectatorCamera_mergeable_20170619 2017-06-19 13:53:29 -07:00
Brad Davis
a69cf31f4b PR feedback and cmake fixes 2017-06-16 16:59:58 -07:00
humbletim
fc33e95e2d Merge branch 'master' into 21180-C++ 2017-06-16 16:16:42 -04:00
Zach Fox
a4f5d327a2 Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera 2017-06-09 11:38:35 -07:00
David Kelly
32d83e375c fix for avatar entities disappearing after grabbing and releasing 2017-06-08 13:48:01 -07:00
Seth Alves
9fcc1e15b8 remove some cruft 2017-06-05 15:52:47 -07:00
humbletim
7cab0363a9 standalone 21180 branch with just the C++ changes 2017-06-05 15:57:54 -04:00
Thijs Wenker
712aff7ad6 base scale attachment on the natural dimensions 2017-05-23 17:53:08 +02:00
Chris Collins
978eb0dfa9 Merge pull request #10492 from ctrlaltdavid/21359 
Fix eye behavior in recording playback
 2017-05-22 21:53:13 -07:00
David Rowe
9cb990a3aa Simplify head simulation methods 2017-05-23 09:53:42 +12:00
David Rowe
a279d581ae Fix code order 2017-05-20 12:56:23 +12:00
David Rowe
768415695d Tidying 2017-05-20 12:43:47 +12:00
David Rowe
d9baa337d8 Fix call order 2017-05-20 12:41:50 +12:00
David Rowe
597312ff45 Reinstate missing guards 2017-05-20 12:08:01 +12:00
Andrew Meadows
7b879a7964 Model has a Rig rather than a RigPointer 2017-05-19 13:24:16 -07:00
David Rowe
f6c1fa4213 Merge branch 'master' into 21359 2017-05-18 16:40:20 +12:00
David Rowe
f00232ab6d Fix avatar eyelids and blinking in recording playback 
Reinstates conditions to not calculate eye movements if face / eye
trackers are connected; they're considered connected for recording
playback.
 2017-05-18 13:30:29 +12:00
Andrew Meadows
09433a93ba Merge pull request #10477 from AndrewMeadows/correct-avatar-mass 
More correct avatar mass
 2017-05-17 16:22:06 -07:00
Brad Hefta-Gaub
764bfe94f5 Merge pull request #10336 from trentpolack/feature/snap-turn-smoothing-21270 
Feature/snap turn smoothing 21270
 2017-05-16 21:05:38 -07:00
Andrew Meadows
d065b569d3 support for variable avatar mass by size 2017-05-16 16:03:51 -07:00
Seth Alves
66a1dbfcfe Merge pull request #10445 from AndrewMeadows/cleanup-head-simulation 
cleanup Head::simulate() code
 2017-05-15 11:21:43 -07:00
Andrew Meadows
a43447310d remove physics dependency from avatars-render lib 2017-05-11 15:22:22 -07:00
Andrew Meadows
f4df223d23 cleanup Head::simulation() code 2017-05-11 14:46:00 -07:00
Seth Alves
19401af3e1 Merge branch 'master' of github.com:highfidelity/hifi into word-align--memorystorage 2017-05-11 12:43:05 -07:00
Andrew Meadows
0852852f39 Merge pull request #10443 from ctrlaltdavid/21326-2 
Fix avatar recording playback mouth not moving
 2017-05-11 10:41:41 -07:00
Seth Alves
712386f256 Merge branch 'master' of github.com:highfidelity/hifi into word-align--memorystorage 2017-05-11 06:55:49 -07:00
David Rowe
1b855f2c6b Voice modulation and facetrackers write to transient blendshapes 2017-05-11 18:15:38 +12:00
Seth Alves
c9868640c1 force data in MemoryStorage to be word aligned to avoid crash in glTextureSubImage2D 2017-05-10 18:14:50 -07:00
Andrew Meadows
a3df55915b avoid floating point error in fake mouth shapes 2017-05-10 12:02:37 -07:00
David Rowe
a0bc8ae2ee Fix unreachable eye blink code 2017-05-10 11:40:42 +12:00
Andrew Meadows
2be6d19dfe always call Head::simulate() for Avatar in view 2017-05-09 14:00:18 -07:00
trent
a3545661dc Merged hifi/master into this PR and resolved merge conflicts. 2017-05-09 15:09:53 -04:00
humbletim
29b1ac3572 optimizations per feedback 2017-05-08 21:50:24 -04:00
humbletim
68ca0d921e use assert rather than whole if block 2017-05-08 21:34:55 -04:00
humbletim
ef0e32643d update refactored logic to match previous application behavior 2017-05-08 18:53:47 -04:00
Brad Davis
b63015eaea Fix sped up animations 2017-05-06 14:34:28 -07:00
ZappoMan
43a177cf9a CR feedback 2017-05-04 15:22:44 -07:00
ZappoMan
0e3b65abde Merge branch 'master' of https://github.com/highfidelity/hifi into MyAvatarAttachmentsNotVisibleBug 2017-05-04 15:06:31 -07:00
Brad Davis
2d0bbf70ae Migrate core avatar rendering functionality to library 2017-05-04 14:08:59 -07:00
Bradley Austin Davis
0ca0874c52 Creating new avatar rendering library, prepping for crowd rendering project 2017-04-10 10:55:04 -07:00