Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-04 06:43:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
73099 commits 76 branches 59 tags 1.2 GiB
Commit graph

327 commits

Author SHA1 Message Date
SamGondelman
a3c42363cc please for the love of god 2018-10-24 12:43:01 -07:00
Luis Cuenca
fac9188dfb
Merge pull request #14187 from luiscuenca/transitAddAnimation 
Add animations to Avatar Transit
 2018-10-24 10:51:21 -07:00
John Conklin II
e21e7d30d7
Merge pull request #14126 from amantley/squattyPottyFix 
Sit State for the seated user in HMD:  Squatty Potty Fix
 2018-10-23 15:20:49 -07:00
Brad Davis
c8e664a0a1 New SPIRV Shader toolchain 2018-10-23 10:40:12 -07:00
amantley
cce2f295a1 fixed conflict in myskeletonmodel.cpp 2018-10-22 17:49:30 -07:00
Luis Cuenca
e1c760b566
Merge branch 'master' into transitAddAnimation 2018-10-20 15:30:23 -07:00
luiscuenca
f8d67d124f Hold flickering fixed and refactor 2018-10-20 15:22:25 -07:00
John Conklin II
9c841db9fb
Merge pull request #14184 from SamGondelman/blendshape 
Move blendshape buffers to render thread
 2018-10-19 11:55:44 -07:00
luiscuenca
bb5c042f16 Blend network animation 2018-10-18 17:51:20 -07:00
SamGondelman
47c6825aea CR 2018-10-18 11:08:53 -07:00
luiscuenca
078baa86e4 Sitting abort post transit animation 2018-10-16 13:16:01 -07:00
luiscuenca
ad09007bd8 Fix flickering holded entity, renames and refactors 2018-10-13 16:32:51 -07:00
luiscuenca
52ed6cb6e9 Abort settle animation if already moving 2018-10-12 11:35:51 -07:00
luiscuenca
de1b6e717f Cancel animation on chained trasits 2018-10-11 11:35:56 -07:00
luiscuenca
1adac78828 fix errors and set new anim parameters 2018-10-11 10:45:35 -07:00
SamGondelman
327c2f4e3d move blendshape buffers to render thread 2018-10-10 15:32:53 -07:00
unknown
82918a5c31 Add animation support 2018-10-10 12:31:16 -07:00
Seth Alves
de8ae9156c fix build on clang 7 2018-10-09 12:25:01 -07:00
amantley
c4187f0d60 Merge remote-tracking branch 'upstream/master' into squattyPottyFix 2018-10-08 17:07:55 -07:00
John Conklin II
afe6d97b00
Merge pull request #14100 from danteruiz/soft-entities-updates 
update soft entities and fix deadlock from qml.
 2018-10-04 13:33:34 -07:00
luiscuenca
a05e493e06 Long distance avatars should not be new 2018-10-03 17:09:51 -07:00
luiscuenca
bb98457d09 Fix avatars transit on domain enter 2018-10-03 16:23:09 -07:00
amantley
52355e53f1 adding the menu item to the avatar app for the sit state. 2018-09-27 16:44:55 -07:00
Dante Ruiz
c1c853790b update soft entities and fix deadlock 2018-09-27 14:53:28 -07:00
luiscuenca
80daf35e77 Animation and particles clean up 2018-09-25 07:17:26 -07:00
luiscuenca
3e2ee119f0 API to configure animation and particle effect 2018-09-25 06:03:29 -07:00
luiscuenca
012cd207b3 No data sent during basic transit 2018-09-24 11:39:10 -07:00
luiscuenca
82b14b6e9b Merge branch 'master' of https://github.com/highfidelity/hifi into smoothTeleport 2018-09-22 05:47:05 -07:00
luiscuenca
01f87a0645 lerp myavatar 2018-09-22 05:34:17 -07:00
luiscuenca
a7a128f1f1 Particle effect and ease movement 2018-09-20 18:37:42 -07:00
luiscuenca
cad8425c7b Time-based frames, max distance and setting animation from script 2018-09-19 16:43:45 -07:00
luiscuenca
96e8b060eb Enable transit animations 2018-09-18 12:42:37 -07:00
luiscuenca
b39391ca7a From first frame 2018-09-17 13:53:57 -07:00
luiscuenca
f339bbdd7f Fix bug while walking 2018-09-17 13:29:04 -07:00
luiscuenca
ff319ebd95 Bypass position updates from mixer 2018-09-17 09:47:22 -07:00
Stephen Birarda
b1f44d2ad7 perform avatar entity cleanup in AvatarManager::handleRemovedAvatar 2018-09-12 12:30:15 -07:00
Stephen Birarda
1789d51d6e Revert "cycle avatar entity IDs for new avatar mixer" 
This reverts commit 20912349a4.
 2018-09-12 12:22:07 -07:00
luiscuenca
889e033048 fix warnings 2018-09-12 11:20:23 -07:00
luiscuenca
4d381b9d04 Smooth other avatars positions 2018-09-12 10:01:41 -07:00
Anthony Thibault
bc5d9a46a2 Avatar loading orb now indicates status 
white - no url has been received yet for this avatar
purple - a url has been received for this avatar but it's content is still downloading/loading
blue - (only visible breifly) content has succesfully loaded
red - (only visible briefly) content has failed to download.
 2018-09-11 13:12:46 -07:00
John Conklin II
3b0f37c6f7
Merge pull request #13885 from birarda/bug/recording-scripting-stuck 
fix Agent teardown of recording and ScriptEngine(s)
 2018-09-10 10:51:52 -07:00
John Conklin II
405e2da91e
Merge pull request #13949 from sabrina-shanman/stt_parenting_scale 
Scale Collision Pick to match parent
 2018-09-07 11:54:02 -07:00
sabrina-shanman
8d4c47cf8e Make template specialization of BaseNestableTransformNode explicit 2018-09-07 08:49:44 -07:00
sabrina-shanman
836f810c41 Have OverlayTransformNode and similar define scale relative to nestable scale on creation time, and refactor code 2018-09-06 16:33:29 -07:00
sabrina-shanman
3f7a7fb11a Return early from AvatarTransformNode and similar when getTransform fails 2018-09-06 10:29:01 -07:00
sabrina-shanman
f7226757ad Just import TransformNode in AvatarTransformNode.h and similar 2018-09-06 10:03:05 -07:00
sabrina-shanman
e8ce152687 Scale collision picks relative to parent by adding and using more 
specialized transform nodes.
 2018-09-05 16:51:28 -07:00
Stephen Birarda
20912349a4 cycle avatar entity IDs for new avatar mixer 2018-08-31 16:53:58 -07:00
Anthony Thibault
78d7c321b8
Merge pull request #13796 from amantley/noNeckFix 
Avatar without Neck Joint bug 14620
 2018-08-30 14:52:44 -07:00
Sam Gateau
d9d23e7fcf
Merge pull request #13877 from luiscuenca/multiplyOtherAvatars 
Create N replicas of each other-avatar on the client side
 2018-08-28 09:02:13 -07:00