Anthony J. Thibault
559ac6786d
Fix MyAvatar getting stuck in T-pose on loading
...
Before this change, there was a race condition between the main thread calling Model::initWhenReady,
and the render thread calling Avatar::fixupModelsInScene(). They both would end up setting the
Model::_addedToScene flag. This race caused Model::initWhenReady() to never return true, which
resulted in the MyAvatar class never initializing the animation system.
2017-09-08 11:44:06 -07:00
Zach Fox
fdcc149c34
Merge branch 'master' of https://github.com/highfidelity/hifi into SelectionScriptingInterface
2017-08-30 13:27:18 -07:00
Chris Collins
47a2e57e26
Merge pull request #10625 from humbletim/21180-C++
...
CR 21180-C++ Camera app -- core changes
2017-08-30 07:20:00 -07:00
Zach Fox
0cdef28cfd
Fixup after Merge branch 'master' of https://github.com/highfidelity/hifi into SelectionScriptingInterface
2017-08-28 14:55:18 -07:00
Brad Davis
e817d3ced4
Threaded rendering & entity rendering refactor
2017-08-24 13:34:34 -07:00
humbletim
9348048387
Merge remote-tracking branch 'upstream/master' into 21180-C++
2017-08-24 16:23:47 -04:00
Zach Fox
88c24c16d7
I finally understand - initial progress
2017-08-23 15:02:07 -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
