Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-10 13:58:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
76087 commits 74 branches 59 tags 1.2 GiB
Commit graph

413 commits

Author SHA1 Message Date
luiscuenca
d630fe9dbd Add menu checkbox to toggle collisions with other avatars 2019-01-04 16:38:48 -07:00
Jeff Clinton
c2c744b44e
Merge pull request #14622 from SimonWalton-HiFi/avatar-scaling-delayed 
Correctly set avatar-scale timestamp when changing in Avatar class
 2019-01-04 10:00:46 -08:00
Andrew Meadows
65a7e15f5d don't send AvatarEntity updates when not necessary 2019-01-03 17:57:11 -08:00
Anthony Thibault
fa137f0586 Merge remote-tracking branch 'upstream/master' into feature/improve-eye-look-at-interest-calculation 2019-01-03 13:19:11 -08:00
Seth Alves
3c0243419b trying again on avatar-entity grab releases 2019-01-03 08:17:52 -08:00
Seth Alves
895e8cdba1 fix off-hand adjustment of equipped entities. make traits-based grabbing be enabled by default, again 2019-01-03 08:17:52 -08:00
Seth Alves
fc128b49de don't crash when releasing an entity that has expired 2019-01-03 08:17:52 -08:00
Seth Alves
78aff6e95c grab js api; send grab information through trait system 2019-01-03 08:17:52 -08:00
Anthony Thibault
d87bc3e898 Update eye look at interest calculation 
This now takes distance, your facing toward them, and their facing toward you into the interest calculation.
Also, separate the logic for myAvatar look at from other avatars snapping their gaze toward myAvatar.
Previously these two separate elements where merged together in a single loop.
 2018-12-31 13:37:22 -08:00
luiscuenca
bd21d0589a Merge branch 'master' into otherAvatarMotionStates01 2018-12-30 10:55:05 -07:00
luiscuenca
4a8bbd79fe other avatars motion states 2018-12-30 10:53:28 -07:00
Simon Walton
9cb53af023 Correct set avatar-scale timestamp when changing in Avatar class 2018-12-19 16:13:12 -08:00
amantley
42a17980cb fixed mac build conflict, unused variable 2018-12-17 16:21:22 -08:00
Angus Antley
77fa4e7d13 took out the unnecessary hfm.jointindex code 2018-12-16 17:29:16 -08:00
Sam Gondelman
b690faeb12
Merge branch 'master' into NOverlays 2018-12-06 11:29:06 -08:00
SamGondelman
e282d51883 CR 2018-11-26 01:15:07 -05:00
SamGondelman
079d1dcbd6 convert clientOnly to entityHost and add local entities 2018-11-14 11:25:37 -08:00
Sam Gondelman
13f650d514
Merge pull request #14093 from SamGondelman/police 
Case 19409, Case 19468: Fading fixes and shader cleanup
 2018-11-13 15:00:23 -08:00
Brad Hefta-Gaub
bb2239c0bd
Merge pull request #14359 from howard-stearns/no-url-logging 
remove urls from logs in Interface
 2018-11-13 13:19:30 -08:00
Brad Hefta-Gaub
153b8920be
Merge pull request #14348 from sabrina-shanman/hfm_library 
(case 19302) Create the HFM library and namespace
 2018-11-13 12:03:53 -08:00
Howard Stearns
545b85bc9d Merge branch 'master' of github.com:highfidelity/hifi into no-url-logging 2018-11-13 09:55:54 -08:00
sabrina-shanman
753557736e Merge branch 'master' into hfm_library 2018-11-12 15:03:30 -08:00
SamGondelman
df1a848811 fix fade out 2018-11-12 12:58:40 -08:00
SamGondelman
1d1510e18e Merge remote-tracking branch 'upstream/master' into police 2018-11-09 13:32:41 -08:00
Roxanne Skelly
cef7000a72 Case 19754 - Remove logging URLs and related file locations. 
The goal is to strip out data that can be used by untoward users in
copying models, avatars, etc.
 2018-11-06 16:24:32 -08:00
Andrew Meadows
6ecf850159 clarify ShapeInfo::setCapsuleY() API and use it correctly 2018-11-06 12:37:55 -08:00
John Conklin II
4d74f7a0da
Merge pull request #14338 from sabrina-shanman/hfm_geo2model 
(case 19302) Rename HFMGeometry to HFMModel and adjust related variables
 2018-11-05 15:00:06 -08:00
sabrina-shanman
2801f324b7 Switch references to HFM to the HFM lib and remove HFM classes in FBX 2018-11-05 12:47:34 -08:00
sabrina-shanman
30eb360f62 Convert remaining HFMModels called model to hfmModel, and rename some missed local variables 2018-11-05 12:07:17 -08:00
Brad Hefta-Gaub
d0181283dd
Merge pull request #14308 from sabrina-shanman/fbx2hfm 
(case 19302) Re-name FBXGeometry to HFMGeometry and do the same for related classes
 2018-11-02 16:44:31 -07:00
sabrina-shanman
cbca77b12f Rename HFMGeometry to HFMModel and adjust related variables 2018-11-01 17:17:48 -07:00
Anthony Thibault
5c78a463de
Merge pull request #14270 from luiscuenca/softEntitiesLooseJointsFix 
Extra joints on soft entities keep their local transform
 2018-11-01 09:29:16 -07:00
sabrina-shanman
becee7f010 Re-name FBXGeometry to HFMGeometry and do the same for related classes 2018-10-30 17:28:42 -07:00
luiscuenca
b8cd5045c7 Extra joints on soft entities keep their local transform 2018-10-24 12:54:09 -07:00
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
SamGondelman
0efbdc1ab5 merge with master 2018-10-23 14:33:57 -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
SamGondelman
09ea32dcc0 fix fading and highlighting issues 2018-10-22 14:12:43 -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
Stephen Birarda
a76b50ce33 fix teardown of recording and ScriptEngine(s) 2018-08-27 15:07:19 -07:00
luiscuenca
3d959ca7ee Refactoring and cleaning 2018-08-23 15:52:42 -07:00
Andrew Meadows
99aafb1f95 move code from Avatar to OtherAvatar 2018-08-23 12:59:28 -07:00
John Conklin II
1320a34a18
Merge pull request #13841 from luiscuenca/noAttachmentsToJSON 
Don't include old attachment data on new avatar recordings
 2018-08-23 10:51:33 -07:00
luiscuenca
b3d127c953 Fix flickering 2018-08-22 14:31:34 -07:00
luiscuenca
5f4903f884 Record entities 2018-08-22 08:53:51 -07:00
Stephen Birarda
4875738a05 always add to detached, flag update on full replace 2018-08-21 10:32:05 -07:00
Stephen Birarda
e33f349d53 fix flagging for avatar entity update/delete 2018-08-21 10:32:05 -07:00
John Conklin II
b28aa3951f
Merge pull request #13802 from jherico/feature/scribe_programs 
Migrating to scribe program descriptors
 2018-08-20 14:48:54 -07:00
Seth Alves
527b27da96 pseudo-joints for far-grab positions 2018-08-14 08:55:20 -07:00
Brad Davis
f03370c826 Migrating to scribe program descriptors 2018-08-09 17:58:34 -07:00
amantley
93baad7387 removed unnecessary computation of head height from eye position code 2018-08-09 14:35:44 -07:00
amantley
f26d6b8c3d cleaned up code and changed the forward offset for the default eyes when there is no neck bone 2018-08-09 12:15:35 -07:00
amantley
a3f2fd1f23 removed some print statements and added the code to use the head parent when the neck is missing, this allows for cauterization 2018-08-09 11:33:27 -07:00