Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-08-25 05:58:17 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
85736 commits 28 branches 28 tags 1.2 GiB
Commit graph

5527 commits

Author SHA1 Message Date
Andrew Meadows
227b99859d fix api for checking EntityItem grab status 2019-09-06 17:23:38 -07:00
luiscuenca
0e4e09acb5
Add blending 2019-09-06 14:30:10 -07:00
luiscuenca
189ddf39e2
Merge branch 'master' into addLookAtThirdCamera 2019-09-06 14:29:51 -07:00
luiscuenca
78eee5961c
Fix key mapping for new camera 2019-09-05 18:05:46 -07:00
luiscuenca
ddbd30fac9
Fix magic numbers and refactor some code 2019-09-05 17:14:35 -07:00
luiscuenca
ff8f2c5c16
Add new LookAt camera 2019-09-05 17:04:39 -07:00
Shannon Romano
5f4b2a0080
Merge pull request #16109 from sethalves/fix-saccade-override 
apply fake eye saccades if eye joints aren't overridden
 2019-09-03 11:34:02 -07:00
RebeccaStankus
a34a533c07 Added defaults for some params 2019-09-03 10:06:17 -07:00
RebeccaStankus
5fadfa5275 Updated property in MyAvatar.h 2019-08-30 13:52:02 -07:00
luiscuenca
265b6f57a1
Try to mitigate the effect of background mic noise when simulating talking 2019-08-29 15:19:17 -07:00
Andrew Meadows
6be3750b38 use collision brake feedback to prevent tunneling 2019-08-27 20:28:56 -07:00
Seth Alves
1979e1dbc7 apply fake eye saccades if eye joints aren't overridden (rather than if HasProceduralEyeFaceMovement is true) 2019-08-27 16:47:01 -07:00
luiscuenca
19d85ba824
MyAvatar.endReaction return false when no reaction has been trigger previously 2019-08-23 09:07:27 -07:00
luiscuenca
da9163616a
Don't allow reactions ref count got bellow 0 2019-08-23 08:46:59 -07:00
Andrew Meadows
7cf0899d59 more correct safeLanding trigger 2019-08-20 17:33:29 -07:00
Andrew Meadows
32400a6baf improved isStuck detection and MyAvatar::safeLanding() trigger 2019-08-20 17:33:29 -07:00
Andrew Meadows
c8c704eb57 revert last change 2019-08-20 17:33:29 -07:00
Andrew Meadows
6d7565a568 CharacterController don't fight MyaAvatar::safeLanding() 2019-08-20 17:33:29 -07:00
Anthony Thibault
2b74e2a7fa
Merge pull request #16066 from hyperlogic/bug-fix/sit-bug-fixes 
Avatar sitting bug fixes
 2019-08-20 11:09:25 -07:00
Simon Walton
150b4e45d4 More robust handling of the avatar verify-failed property 2019-08-16 17:30:28 -07:00
Anthony J. Thibault
381f7c6bc4 Avatar sitting bug fixes 
* Added seatedToIdle transition, to make transition quicker to better match the capsule physics.
* Made switching into and out of instantly set animVar for the animation graph, previously it was delayed by 100 ms.
* Created "isNotSeated" anim var for exiting the seated state.
* MyAvatar::beginSit & MyAvatar::endSit no longer calls goToPosition, instead MyAvatar::slamPosition is called.
* MyAvatar::slamPosition will cause the AvatarTransit class to NOT play the teleport anticipation/reaction animation.
  Note: This does not prevent other clients from interpolating the position when entering the seat, but it prevents the teleport reaction animation from playing.
* Disable leg IK in HMD mode while seated.
 2019-08-16 10:57:03 -07:00
Sabrina Shanman
0728df8a8f
Merge pull request #16025 from sabrina-shanman/picks_debug 
(BUGZ-1059) Improve debug API for picks/pointers
 2019-08-07 12:01:26 -07:00
Shannon Romano
9e0e6f9d5e
Merge pull request #16003 from ctrlaltdavid/DOC-84 
DOC-84: Update JSDoc with glTF
 2019-08-06 13:22:04 -07:00
jennaingersoll
f487d094fe
Merge pull request #15959 from ctrlaltdavid/DOC-124 
DOC-124: Tidy JSDoc from some recent API changes
 2019-08-06 11:57:28 -07:00
sabrina-shanman
20fa78e51d Fix some dates and no newline at EOF 2019-08-02 16:13:07 -07:00
sabrina-shanman
f7c324c017 Improve pick/pointer debugging. Use unsigned int in Graphics api for compatibility 2019-08-02 16:10:39 -07:00
David Rowe
789f9c7d67 Merge branch 'master' into DOC-124 
# Conflicts:
#	interface/src/scripting/Audio.h
 2019-08-02 20:34:09 +12:00
David Rowe
ade85ad8c0 Update API JSDoc with glTF 2019-07-30 10:41:07 +12:00
Anthony J. Thibault
2f949a4d4d Disable head ik while reacting 
Also, split getReactions() API into two calls

* getTriggerReactions() - lists all reactions that can be triggered with MyAvatar.triggerReaction().
* getBeginReactions() - lists all reactions that can be used with MyAvatar.beginReaction() and MyAvatar.endReaction().
 2019-07-26 15:26:43 -07:00
luiscuenca
c1b818cd9b
Set timeout before enabling drive keys 2019-07-25 17:40:09 -07:00
luiscuenca
8900c4f2cd
stand up to right location-orientation 2019-07-24 13:29:01 -07:00
luiscuenca
6e4d1bde8e
Fix code and warnings 2019-07-24 13:16:53 -07:00
luiscuenca
015d1951fc
Add sitting clip node 2019-07-24 10:44:33 -07:00
luiscuenca
e7e864121f
Merge branch 'master' into avatarSitAPI 2019-07-23 14:22:42 -07:00
luiscuenca
9cec979552
Add sit API to MyAvatar 2019-07-23 14:20:54 -07:00
Shannon Romano
266230a53c
Merge pull request #15963 from hyperlogic/feature/avatar-reaction-api 
Initial version of Avatar Reaction API
 2019-07-23 13:13:31 -07:00
David Rowe
8c92f972e5 Merge branch 'master' into DOC-124 
# Conflicts:
#	interface/src/scripting/Audio.h
 2019-07-23 12:53:35 +12:00
David Rowe
3b2bb65c77 Tidy MyAvatar API's animation debug graphics methods' JSDod 2019-07-23 12:42:41 +12:00
Shannon Romano
1594e25c4e
Merge pull request #15950 from ctrlaltdavid/DOC-121 
DOC-121: AvatarBookmarks JSDoc
 2019-07-22 15:43:57 -07:00
David Rowe
cf9e563458 Miscellaneous JSDoc fixes noticed in passing 2019-07-19 08:37:10 +12:00
Andrew Meadows
dcf3df68f2 avoid NaN input for MyAvatar's scripted motor 2019-07-18 10:58:41 -07:00
Anthony Thibault
ecae92724e Added reaction api 2019-07-17 14:28:39 -07:00
Shannon Romano
d49fabf370
Merge pull request #15932 from SimonWalton-HiFi/remove-orb-on-kill 
BUGZ-781: Remove loading-orb upon killing of avatar
 2019-07-16 15:31:37 -07:00
Shannon Romano
3f7e5a48bb
Merge pull request #15533 from sethalves/squeeze-vision-while-moving 
Case 21663: comfort mode
 2019-07-15 14:54:31 -07:00
Simon Walton
e259aa55c2 Remove loading-orb upon killing avatar, in case destructor isn't called 2019-07-15 14:14:24 -07:00
Seth Alves
9baf4c7078 comfort mode -- squeeze vision to avoid sickness 2019-07-12 09:14:17 -07:00
Andrew Meadows
520c62f6f6 wait for objects added to physics before stop SafeLanding 2019-07-09 15:51:56 -07:00
David Rowe
2d6d3eb4fe Doc review 2019-06-28 17:05:36 +12:00
David Rowe
b2b7a6ae99 Merge branch 'master' into DOC-79 2019-06-22 12:11:22 +12:00
Anthony J. Thibault
3a6d8dc383 Disable handTouch.js to prevent finger twitching 
This PR disables handTouch.js.
handTouch.js allows the fingers to animate on the surface of an object.
However, it can sometimes detect collisions with walls or tables when the avatar is standing next to them.
We will more properly fix handTouch.js in a future PR, but for now we will disable the functionality.

Also, a small bug fix was made to the Rig to prevent the idleOverlayAlpha from exceeding the 0.0 to 1.0 range.
This can cause the fingers to bend incorrectly for a moment.

Also, three new items were added to the Developer > Show Animation Stats panel.

* Joint Override Count: displays the current count of joints that are overriden by MyAvatar.setJointRotation() JS API calls.
* Flow: displays if flow is active of disabled.
* Network Graph: displays if the network anim graph, used for teleportation, is enabled or disabled.

https://highfidelity.atlassian.net/browse/BUGZ-154
 2019-06-20 15:52:36 -07:00
jennaingersoll
150ae31a88
Merge pull request #15748 from ctrlaltdavid/DOC-85 
DOC-85: Revise new MyAvatar signals' JSDoc
 2019-06-19 15:16:46 -07:00
David Rowe
72fdbc0aa8 Entity information and manipulation 2019-06-19 10:18:48 +12:00
Anthony Thibault
10dae7e4d9
Merge pull request #15783 from hyperlogic/feature/anim-debug-draw-improvement 
Improvement to Developer > Avatar > Draw Animation
 2019-06-18 10:50:46 -07:00
Anthony J. Thibault
4b5d5062b1 Improvement to Developer > Avatar > Draw Animation 
This feature was added to help diagnose the root cause of a rarely occurring finger twitching bug.

Also, some asserts were added to AnimClip to also help catch a rarely occurring crash.
 2019-06-17 14:50:19 -07:00
Andrew Meadows
ce96ea5bf8 more correct rebuild OtherAvatar detailed pickable shapes 2019-06-17 11:20:42 -07:00
luiscuenca
20b17291b4 Reset detailed motion states when the workload zone changes 2019-06-13 09:05:55 -07:00
David Rowe
29079b9221 Miscellaneous JSDoc improvement 2019-06-12 19:15:29 +12:00
David Rowe
93d42917b0 Revise JSDoc for new MyAvatar signals 2019-06-12 19:15:14 +12:00
jennaingersoll
1935b49538
Merge pull request #15676 from ctrlaltdavid/DOC-33 
DOC-33: MyAvatar API JSDoc catch-up
 2019-06-11 15:05:06 -07:00
Andrew Meadows
dbce976887 fix another crash in MyAvatar::getAvatarEntitiesVariant() 2019-06-10 15:34:18 -07:00
Preston Bezos
e89f499c1a this should work 2019-06-07 12:02:15 -07:00
Preston Bezos
4eccb7a124 Revert "made one more change to get rid of ubuntu warning" 
This reverts commit e7255298de.
 2019-06-07 12:00:36 -07:00
Preston Bezos
e7255298de made one more change to get rid of ubuntu warning 2019-06-07 11:59:26 -07:00
Preston Bezos
27de181d0c Merge branch 'master' of github.com:highfidelity/hifi into logspam 2019-06-07 11:54:48 -07:00
Preston Bezos
ad562b8f91 really need to stop clanging myself 2019-06-07 11:22:11 -07:00
Preston Bezos
e63d98e137 fixed a couple of doc errors and accounted for some edge cases 2019-06-07 11:09:21 -07:00
Preston Bezos
3ab4be6b8d I got clanged 2019-06-07 10:42:31 -07:00
Shannon Romano
1e827a925a
Merge pull request #15699 from SamGondelman/avatarPick 
BUGZ-373, BUGZ-407: Put avatar spheres in R3 in simulation
 2019-06-07 09:59:42 -07:00
SamGondelman
3bb645b2d7 put avatar spheres in r3 in simulation 2019-06-06 17:17:18 -07:00
Sam Gateau
4c18ce7ae6
Merge pull request #15693 from sabrina-shanman/bug_avatar_res-state 
(BUGZ-559) Improve transition debugging and transition clean-up
 2019-06-06 16:35:04 -07:00
Preston Bezos
a7a765b025 added a couple more notifies and fixed a couple of jsdocs 2019-06-06 16:23:54 -07:00
Preston Bezos
36e1366cc4 added Notifies to various QProperties in order to remove warnings in interface logs 2019-06-06 14:51:43 -07:00
sabrina-shanman
833946ceb3 Clean up transition naming 2019-06-06 13:25:06 -07:00
David Rowe
caf29dc45a Doc review 2019-06-06 11:24:10 +12:00
David Rowe
f91c6dec3a Miscellaneous fixes noticed in passing 2019-06-05 08:38:52 +12:00
David Rowe
231d1373b6 Update MyAvatar, Avatar JSDoc per recent changes 2019-06-05 08:38:34 +12:00
Seth Alves
c5eb9c03d5 fix uninitialized read 2019-06-04 13:00:26 -07:00
Andrew Meadows
297517c85d minimize lock duration 2019-05-31 11:06:16 -07:00
Andrew Meadows
5f9262cf5e change data member names to not poke other devs in the eye 2019-05-31 11:03:11 -07:00
Andrew Meadows
0c916e0c03 guard MyAvatar::_scriptEngine with mutex 2019-05-30 16:08:47 -07:00
Andrew Meadows
940c122f46 clear _otherAvatarsToChangeInPhysics after processing it 2019-05-23 13:38:54 -07:00
SamGondelman
264051ed6d fix myavatar setSkeletonModelURL 2019-05-21 10:40:58 -07:00
SamGondelman
3273f46179 fix avatar loading spheres 2019-05-17 15:29:27 -07:00
Zach Fox
c57ddf969a Merge branch 'master' of github.com:highfidelity/hifi into simplifiedUI 2019-05-14 09:32:07 -07:00
Seth Alves
8b2d12e2f7 when an avatar entity is deleted, also delete its descendants 2019-05-13 17:33:10 -07:00
Brad Hefta-Gaub
51f2d1748e
Merge pull request #15544 from sabrina-shanman/bug_avatar_res-state 
(BUGZ-40) Check for possible avatar fade race condition
 2019-05-13 13:41:09 -07:00
sabrina-shanman
736c7a9736 Change logging from 'fade-out animation' to 'fade-out transition' 2019-05-10 15:18:52 -07:00
sabrina-shanman
6f5bf01f2b Add sanity check and logging for possible avatar fade lambda race condition 2019-05-10 14:33:25 -07:00
Simon Walton
4b51d81b42 Clear any reliable connection state upon Node ID change 2019-05-10 12:06:38 -07:00
Zach Fox
314c04ab96 Simplified UI v1 2019-05-10 10:49:25 -07:00
Andrew Meadows
a0b34e4f15 more correct clearing of dirty flags for AvatarMotionState 2019-05-09 14:45:36 -07:00
Andrew Meadows
c7432ffe5f also update easy flags when rebuilding avatar shape 2019-05-09 13:48:07 -07:00
Andrew Meadows
f6916edac4 cleanup and removing some accidental C++-20-isms 2019-05-06 17:37:35 -07:00
Andrew Meadows
af1f4364ef don't forget to add detailedMotionStates to simulation 2019-05-06 17:37:35 -07:00
Andrew Meadows
a0841c937c fix logic around updating off-thread shapes 2019-05-06 17:37:35 -07:00
Andrew Meadows
3eed8218ca overhaul of MotionState and shape creations 2019-05-06 17:37:35 -07:00
Simon Walton
60389017a4 Merge from master, including avatar protocol change 
Tony had added HandController version-type.
 2019-04-26 18:51:41 -07:00
Simon Walton
1fe8f4332f Fixes to banner; swap out avatar on client; reviewer comments; other WIP 2019-04-26 18:45:48 -07:00
Shannon Romano
a00545b48d
Merge pull request #15361 from SaracenOne/falling_push 
Case 22121: Allow players to disable automatic falling to flight threshold.
 2019-04-26 14:03:52 -07:00
Anthony Thibault
2c370d9d74
Merge pull request #15460 from hyperlogic/feature/network-opt-faux 
Avatar network bandwidth optimization
 2019-04-26 10:16:30 -07:00
Anthony Thibault
4761a69a4d
Merge pull request #15438 from luiscuenca/skeletonTrait 
Skeleton Trait Implementation
 2019-04-26 10:14:47 -07:00
jennaingersoll
fb1842cbfa
Merge pull request #15455 from ctrlaltdavid/M22330 
Case 22330: Regularize JSDoc deprecation notices
 2019-04-26 09:48:45 -07:00
luiscuenca
080f891c9f
Fix scale and refactor debug function 2019-04-25 14:54:40 -07:00
Simon Walton
f3efee56c0 Merge remote-tracking branch 'upstream/master' into avatar-verification 2019-04-25 13:40:27 -07:00
Shannon Romano
164984b15d
Merge pull request #15459 from luiscuenca/sentHandsCrashFix 
Fix crash sending other avatars hands to flow
 2019-04-25 12:32:06 -07:00
Shannon Romano
392b372815
Merge pull request #15452 from AndrewMeadows/send-after-applying-bookmark 
Case 21884: send update after changing AvatarEntity via AvatarBookmarks.updateAvatarEntities()
 2019-04-25 10:31:25 -07:00
luiscuenca
6b33f4e027
Don't call function if flow is not active and made it thread safe 2019-04-25 10:31:05 -07:00
David Rowe
8e69e0b049 Regularize deprecation notices 2019-04-25 20:55:30 +12:00
Simon Walton
de97af5c02 Minimal working version for avatar's client 
Also merge of Wayne's proof-of-concept
 2019-04-24 17:42:51 -07:00
Andrew Meadows
084759a918 send update after changing entity 2019-04-24 16:32:39 -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
4a236c3a4b
Fix warnings 2019-04-22 12:40:56 -07:00
luiscuenca
20cac4cd4d
Rotation fix and refactor 2019-04-22 11:38:27 -07:00
Anthony Thibault
0c0b847666 First version of faux joint optimizations 
There are still some AJT: TODO sections, mostly about stat tracking for the new Hand Controllers section.

Created a new hand controller section that is optional, when not present hand controllers are assumed to be disabled.
 2019-04-22 11:02:13 -07:00
Clement
0f2dbd7b6a Fix mac warnings 2019-04-19 20:14:15 -07:00
amantley
035c8a687d fixed merge conflict 2019-04-17 10:16:39 -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
Shannon Romano
517710bcb8
Merge pull request #15388 from r3tk0n/running-fix 
Case 22192: Adjust run speed constants.
 2019-04-16 14:51:23 -07:00
Shannon Romano
3500a1b19e
Merge pull request #15386 from danteruiz/fix-bubble 
Case 22203: Shield/bubble animation and sound plays when other users are ignored by PAL or their own shields of RC83
 2019-04-15 15:15:53 -07:00
r3tk0n
12d7e35722 Add separate constant for desktop run. HMD run affected negatively by 3x multiplier. This will need to be cleaned up in a future release. 2019-04-15 10:56:07 -07:00
danteruiz
246f11ba02 fixing bubble 2019-04-12 17:11:35 -07:00
Shannon Romano
d321ae9b79
Merge pull request #15284 from amantley/eyeRotationOverrideBug 
Fixes Bug that Prevented Eye Rotation Override When Procedural Eye Movement is Disabled
 2019-04-12 17:06:11 -07:00
Saracen
3dde53f743 Friendlier and more understandable naming. 2019-04-11 03:57:34 +01:00
David Rowe
38e21dcaa2 Doc review 2019-04-11 11:04:02 +12:00
David Rowe
ca3f45163f Merge branch 'master' into M21989 2019-04-11 10:37:34 +12:00
Sam Gateau
51d1c4b1f3
Merge pull request #15357 from SamGondelman/cauterize 
Case 21417: Fix cauterization of entities that are children of MyAvatar's head
 2019-04-10 12:29:40 -07:00
Sam Gateau
c33efdf9e0
Merge pull request #15282 from kitely/fix-ray-local-entities 
Case 21883: Fix safe landing code improperly finding local entities
 2019-04-10 12:28:07 -07:00
Saracen
bce80130bd Allow players to disable automatic falling to flight threshold. 2019-04-09 21:07:17 +01: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
SamGondelman
27338c3639 fix cauterization of entities that are children of MyAvatar's head 2019-04-08 19:48:11 -07:00
danteruiz
475cf4d6f7 fix another fading avatar 2019-04-05 15:10:30 -07:00
Wayne Chen
3f85e064b8
initialize transform outside of switch statement 2019-04-04 14:46:06 -07:00
Wayne Chen
c18b00ebec adding precheck procedure 2019-04-04 13:55:35 -07:00
Wayne Chen
819bf9212c fixing typo 2019-04-04 13:47:13 -07:00
Wayne Chen
ec4ad02192 more code feedback 2019-04-04 13:26:34 -07:00
Wayne Chen
4f738a5b42 code review feedback/formatting issues 2019-04-04 12:03:48 -07:00
r3tk0n
17e559f8e8 Merge branch 'master' of https://github.com/highfidelity/hifi into project-freeloco 2019-04-03 16:17:00 -07:00
r3tk0n
283ec97bb9 Fix desktop movement. 2019-04-03 16:09:13 -07:00
David Rowe
2a17ad3da5 AvatarList and AvatarManager JSDoc 2019-04-04 10:11:54 +13:00
r3tk0n
8b670110a9 Fix omitted return in MyAvatar::scaleMotorSpeed 2019-04-03 13:06:22 -07:00
r3tk0n
874fb6b6d7 Merge branch 'master' of https://github.com/highfidelity/hifi into project-freeloco 2019-04-03 12:42:33 -07:00
r3tk0n
ac2971894b Fix sprint mode scalar. 2019-04-03 11:42:40 -07:00
r3tk0n
ec37ad7dc6 Address Wayne and Angus' comments on github. 2019-04-03 09:38:14 -07:00
danteruiz
ff3e5bbc61 make sure to delete avatar when thier is no reason 2019-04-02 16:20:10 -07: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
fcb838a71f addressing review requests 2019-04-01 15:43:04 -07:00
r3tk0n
4fb7bbabe1 Merge branch 'master' of https://github.com/highfidelity/hifi into project-freeloco 2019-04-01 14:52:21 -07:00
Wayne Chen
abe5748e60
Merge branch 'master' into newAudioMuteStates 2019-04-01 12:24:46 -07:00
Wayne Chen
0d83e622ff Revert "Attempt to add acceleration curve." (#23) 
This reverts commit 9ea476ea89.
 2019-04-01 13:47:49 -04:00
Shannon Romano
dbecf1f611
Merge pull request #15292 from thoys/fix/avatarTools/fbxCasing 
Case 20625: On avatar project creation, the .fbx filter for selecting an FBX is case-sensitive.
 2019-03-29 17:04:37 -07:00
danteruiz
db17f094da adding entities to fade out list; 2019-03-29 15:23:16 -07:00
Shannon Romano
c4925ddfa0
Merge pull request #15259 from SimonWalton-HiFi/avatar-hero-zone-improvements 
Avatar hero zone improvements
 2019-03-29 10:49:06 -07:00
Shannon Romano
a83b90cdc6
Merge pull request #15044 from sethalves/lock-wearables 
case 21149: add a button to Avatar panel to lock or unlock wearables; allow others to grab unlocked wearables
 2019-03-29 10:41:21 -07:00
Thijs Wenker
687409b756 ignore case for .fbx file extension in AvatarDoctor 2019-03-29 01:46:57 +01:00
Angus Antley
ab1fb0f376 added js doc info for overrideHandAnimation() and restoreHandAnimation in MyAvatar.h 2019-03-28 17:45:23 -07:00
danteruiz
b9d04c6ebb adding entity to a faded list 2019-03-28 16:42:29 -07:00
danteruiz
04d9858f02 fixing remaining issues 2019-03-28 11:43:53 -07:00
Angus Antley
d963ec3005 can now override the eye rotation when procedural eye movement is turned off 2019-03-28 11:27:26 -07:00
Anthony Thibault
65507cfe11
Merge pull request #15180 from luiscuenca/flowCppFixes 
Fix Flow touch and scale issues
 2019-03-28 11:11:08 -07:00
Oren Hurvitz
32406b8399 Fixed Safe Landing interaction with Local entities. 
Local entities are collisionless, so they shouldn't affect Safe Landing since it specifies that it only wants
to find COLLIDABLE entities. However, due to the requirement to support legacy behavior, picks for COLLIDABLE
entities *do* intersect Local entities. In order to prevent this, we have to explicitly request only intersections
with Domain or Avatar entities.

For more information about this, see this Pull Request:
https://github.com/highfidelity/hifi/pull/15282
 2019-03-28 18:54:14 +01:00
danteruiz
d9b522d10c remove error file 2019-03-27 16:43:03 -07:00
danteruiz
40d424a01d avatar fading 2019-03-27 16:42:34 -07:00
Wayne Chen
f3708ba27b
Merge branch 'master' into newAudioMuteStates 2019-03-27 15:49:39 -07:00
Simon Walton
6b21fc1af7 Merge remote-tracking branch 'upstream/master' into avatar-hero-zone-improvements 
Fix jsdoc conflict, also minor clean-up.
 2019-03-27 10:54:49 -07:00
Sam Gondelman
0a28090aa4
Merge pull request #15213 from MiladNazeri/Fix/avatarDominantHandChanged 
Updated engine code to not emit if dominant hand isn't actually changed
 2019-03-27 10:53:00 -07:00
Andrew Meadows
fb7daa185d improved physics for grabbed AvatarEntities 2019-03-27 10:12:59 -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
Shannon Romano
d464415e0b
Merge pull request #15255 from AndrewMeadows/fix-owningAvataID 
Case 21897: fix bug where AvatarEntities vanish after going to serverless and back
 2019-03-27 09:11:36 -07:00
Angus Antley
02d9331603 This changes the avatar-animation json so that we have override 
animations for the right and left hand, similar to how we have whole
body override animations.
 2019-03-26 23:27:54 -07:00
Shannon Romano
1d5f9cc0ec
Merge pull request #15149 from ctrlaltdavid/M21222 
Case 21222: Agent, Avatar, and MyAvatar JSDoc
 2019-03-26 15:43:32 -07:00
Shannon Romano
16d791703d
Merge pull request #15206 from thoys/feat/avatarTools/avatarDoctorWarningURLs 
Case 21353: Avatar Doctor documentation / Video URLs
 2019-03-25 14:36:30 -07:00
David Rowe
4a832be8c6 Fix JSDoc post-merge 2019-03-26 10:03:30 +13: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
cd2dbbb955 fix logic typo 2019-03-25 11:52:52 -07:00
r3tk0n
3ac42e69e3 Merge branch 'master' of https://github.com/highfidelity/hifi into project-freeloco 2019-03-25 11:27:31 -07:00
Simon Walton
d7a1ecdbb3 Expose hero-status to scripts 2019-03-22 17:19:39 -07:00
Andrew Meadows
55b3b5034a always update OwingAvatarID of AvatarEntities 2019-03-22 15:47:13 -07:00
Wayne Chen
d382893e75 staging avatar inputs for ignore radius 2019-03-22 14:16:28 -07:00
Sam Gondelman
04ecdb463f
Merge pull request #15173 from SamGondelman/audio 
Case 21457, Case 16836, Case 15782: Improve AudioInjector threading
 2019-03-21 18:03:58 -07:00
Shannon Romano
212f02598c
Merge pull request #15231 from AndrewMeadows/fix-vanishing-avatar-entities 
Case 21838: fix vanishing avatar entities for 0.82.0
 2019-03-21 17:39:11 -07:00
r3tk0n
4301d74df5 Fix flying bug. 2019-03-21 16:53:53 -07:00
r3tk0n
108e8b9994 Merge branch 'master' of https://github.com/highfidelity/hifi into project-freeloco 2019-03-21 15:17:56 -07:00
r3tk0n
7a8dfe0aaf Fix run speeds. 2019-03-21 15:06:21 -07:00
Andrew Meadows
206792f851 don't queue AvatarEntity messages when not in domain 2019-03-21 15:00:11 -07:00
Shannon Romano
33e73953eb
Merge pull request #15163 from danteruiz/fix-laser-scaling 
Case 21499: Lasers are offset in front of hands after scaling avatar down then relaunching
 2019-03-21 13:13:18 -07:00
r3tk0n
543d53ecde Add ability to toggle strafing. 2019-03-21 13:12:15 -07:00
Andrew Meadows
9d11e44b4b update AvatarEntity trait when parentID changes 2019-03-20 11:37:16 -07:00
Shannon Romano
4ac25121e0
Merge pull request #15190 from roxanneskelly/Case20393 
Case20393 - Add item counts to interface categories
 2019-03-19 17:53:30 -07:00
milad
6ed4937dc0 Updated engine code to not emit if dominant hand isn't actually changed 2019-03-18 10:12:32 -07:00
Thijs Wenker
b5a45be7b9 avatar doctor documentation urls 2019-03-16 02:09:00 +01:00
SamGondelman
83bac723ef fix wearable duplication on domain switch 2019-03-15 13:38:25 -07:00
r3tk0n
38fe22e4f7 Fix compiler error for Linux. 2019-03-14 16:27:40 -07:00
luiscuenca
c14b135f2b Fix flow touch and scale issues 2019-03-13 15:42:04 -07:00
David Rowe
74edea8034 Miscellaneous JSDoc fixes 2019-03-14 10:25:31 +13:00
David Rowe
277ef56f49 Fill in JSDoc for new flow functions 2019-03-14 10:24:19 +13:00
Roxanne Skelly
2dc38df779 Case 20393 - Display item counts in categories dropdown in Marketplace 2019-03-13 10:17:39 -07:00
David Rowe
7445d73857 Merge branch 'master' into M21222 
# Conflicts:
#	libraries/avatars/src/AvatarData.h
 2019-03-13 16:14:14 +13:00
SamGondelman
609c4ab52e try to fix audio injector threading issues 2019-03-12 18:41:43 -07:00
danteruiz
6303f61cc3 fix lasers scale issue 2019-03-12 14:26:59 -07:00
r3tk0n
6ce955d915 Fix hand-relative movement after hand dominance notion swap. 2019-03-11 18:19:43 -07:00
r3tk0n
39342b9771 Merge branch 'master' of https://github.com/highfidelity/hifi into project-freeloco 2019-03-11 16:27:05 -07:00
r3tk0n
ce2e0c7b81 Merge branch 'project-freeloco' of https://github.com/r3tk0n/hifi into project-freeloco 2019-03-11 16:25:13 -07:00
r3tk0n
cbd841a14d Update gearing system. 2019-03-11 16:22:48 -07:00
Shannon Romano
801306364a
Merge pull request #15148 from samcake/rc81-hero 
Case 21639: RC81: Adding Hero support in simulation of avatars
 2019-03-11 14:13:49 -07:00
Sam Gateau
3464fe09c1 Applying the hero changes to master soon to be rc81 2019-03-08 18:13:20 -08:00
Anthony Thibault
c36d752b6b
Merge pull request #15141 from luiscuenca/flowAPIExtra 
add getFlowData method to MyAvatar
 2019-03-08 17:45:11 -08:00
David Rowe
24c7c8be19 Update JSDoc per merge from master 2019-03-09 12:03:59 +13:00
luiscuenca
df32b61eaf remove unused variable 2019-03-08 16:01:18 -07:00
luiscuenca
bfcb1a8391 Make methods thread safe 2019-03-08 15:57:25 -07:00
Thijs Wenker
06e5927ee1 CR fixes 2019-03-08 23:07:01 +01:00
luiscuenca
4858f64810 get the colliding joints 2019-03-08 14:36:47 -07:00
luiscuenca
cbe920774f add getFlowData jsdoc 2019-03-08 12:45:29 -07:00
luiscuenca
cb6f573b35 Merge branch 'master' into flowAPIExtra 2019-03-08 12:43:02 -07:00
luiscuenca
a977bb6dc8 remove unuse variable 2019-03-08 12:39:57 -07:00
David Rowe
4779a6b156 Merge branch 'master' into M21222 2019-03-09 07:57:53 +13:00
luiscuenca
e8da6b5a0c add getFlowData 2019-03-08 10:36:58 -07:00
Thijs Wenker
f2bca5d6c6 added the multiple root joints warning 2019-03-08 07:32:41 +01:00
Thijs Wenker
c35e4d15ab - warning grammar / no more texture folder content requirement for No textures assigned warning 
- resolved partial commit issue / Fix UNIX builds by removal of unused warning
 2019-03-08 03:36:56 +01:00
Thijs Wenker
d985d1bff0 use Rig instead of Avatar for height calculations 2019-03-08 03:36:56 +01:00
Thijs Wenker
bcd00f98d0 - added more warnings to the avatar doctor 
- read embedded fst texture mappings
 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
John Conklin II
9a4b95faa2
Merge pull request #15111 from luiscuenca/flowDataOnFst 
Load flow bone data from FST file
 2019-03-07 12:48:36 -08:00
SamGondelman
380df059ff fix shapes app 2019-03-06 18:18:39 -08:00
Roxanne Skelly
a54171d60c
Merge pull request #15104 from roxanneskelly/79hero-master 
merge PR 15026 15051 15067 15070 from v0.79.HERO-rc into master
 2019-03-06 13:06:45 -08:00
Shannon Romano
3600b98bd0
Merge pull request #15013 from thoys/feat/avatarTools/avatarDoctorProjectStatus 
Case 21340: avatar doctor project page status
 2019-03-06 12:36:18 -08:00
luiscuenca
dfb434ea09 Fix warning and refactoring 2019-03-06 09:25:49 -07:00
luiscuenca
76609197e2 Read flow data from the fst file 2019-03-05 18:50:53 -07:00
Roxanne Skelly
3ef02085ff Merge commit '041a561dbcaa7280fd2c14ba2051b2add756ca6f' 2019-03-05 15:07:49 -08:00
Shannon Romano
1084e79a2e
Merge pull request #15019 from AndrewMeadows/fix-crash-after-avatar-upload 
Case 21422: fix crash for nullptr deref when looking at recently uploaded avatar in inventory
 2019-03-01 09:35:01 -08:00
David Rowe
d73ff2e855 Revise current MyAvatar API JSDoc 2019-02-28 10:40:10 +13:00
r3tk0n
42b62ff2d5 Fix Ubuntu compiler warnings. 2019-02-26 19:16:34 -08:00
r3tk0n
a093fe5c4f Merge branch 'master' of https://github.com/highfidelity/hifi into project-freeloco 2019-02-26 15:08:57 -08:00
r3tk0n
030211aea8 Fix OSX compiler error, init list in wrong order after merge. 2019-02-26 14:46:04 -08:00
Shannon Romano
2aa622b855
Merge pull request #15014 from sethalves/fix-grab-earthquake 
case 21411: don't allow others' grabs to move locked or ungrabbable things
 2019-02-26 09:03:44 -08:00
Andrew Meadows
6e13203fec avoid nullptr deref 2019-02-25 13:52:46 -08:00
r3tk0n
5d3a778b0b Merge branch 'master' of https://github.com/highfidelity/hifi into project-freeloco-fargrab-rotation 2019-02-25 13:10:47 -08:00
SamGondelman
e102ad073e allow flying in HMD if you would otherwise fall forever 2019-02-25 11:49:38 -08:00
Seth Alves
db821487d9 don't allow others' grabs to move locked or ungrabbable things 2019-02-25 11:27:10 -08:00
Thijs Wenker
79d0a0a0a8 avatar doctor project status 2019-02-25 19:28:38 +01:00
luiscuenca
3072ca43de Detailed picking if avatar is not null 2019-02-22 09:24:38 -07:00
Anthony Thibault
8785f733db
Merge pull request #14817 from amantley/animSplineIK 
AnimSplineIK node added to inverse kinematics
 2019-02-21 17:13:41 -08:00
Anthony Thibault
e54754c4ce
Merge pull request #14926 from luiscuenca/flowCpp 
Cpp implementation of the Flow script
 2019-02-21 17:10:05 -08:00
amantley
3bf5c44f98 fixed build warnings 2019-02-21 16:24:46 -08:00
amantley
5cf8a963cd make spine2 rotation damping only happen in optimized code. the regular code is already damped 2019-02-21 15:41:16 -08:00
amantley
6323f49f26 changed the define variable to HIFI_USE_OPTIMIZED_IK 2019-02-21 14:36:05 -08:00
r3tk0n
a3c4747290 Add leveled controller-relative movement option. 2019-02-21 11:17:31 -08:00
amantley
afed0b5442 review changes 2019-02-21 11:08:29 -08:00
Angus Antley
b6bc467f4b added HIFI_USE_Q_OS_ANDROID to cmake lists and to MySkeletonModel 2019-02-21 06:42:55 -08:00
amantley
f8a74efdc2 fixed build errors from jenkins 2019-02-20 17:59:45 -08:00
amantley
27bfe2f0fe changed name of pre processor variable 2019-02-20 15:14:12 -08:00
luiscuenca
04e57d0dd1 No Rig pointer on Flow class, solve network animations and fixed bug 2019-02-19 17:45:46 -07:00
r3tk0n
ebbf48a11b Merge branch 'master' of https://github.com/highfidelity/hifi into project-freeloco 2019-02-19 12:02:50 -08:00
David Rowe
f58a5db0b0 Reorganize JSDoc inheritance for MyAvatar and Avatar 2019-02-19 09:47:51 +13:00
Angus Antley
748368bfda mid tweak on the wrist and position coeffs 2019-02-17 23:32:52 -08:00
David Rowe
50a1e07ed2 Stub missing MyAvatar, Avatar, and Agent functions and properties JSDoc 2019-02-18 18:32:49 +13:00
Angus Antley
70764bc3c4 Merge remote-tracking branch 'upstream/master' into animSplineIK 2019-02-15 19:24:30 -08:00
amantley
d78f253d24 code to generate pole vector from theta 2019-02-15 17:43:53 -08:00
amantley
36093926d0 added fake android defines for running the new ik on pc 2019-02-15 15:00:39 -08:00
Thijs Wenker
e900d3784b fixes 2019-02-15 23:58:42 +01:00
Thijs Wenker
74ce98a075 Merge branch 'master' of github.com:highfidelity/hifi into feat/avatarTools/avatarDoctor 2019-02-15 20:57:20 +01:00
Thijs Wenker
556a55ff16 Better scale and texture checks 2019-02-15 20:55:27 +01:00
amantley
0fcaa695ba Merge remote-tracking branch 'upstream/master' into animArmIK 2019-02-15 10:35:33 -08:00
amantley
d6dfaacf6f adding ifdef for android os 2019-02-15 10:35:25 -08:00
luiscuenca
c966f71cb1 More fixes 2019-02-15 10:17:37 -07:00
luiscuenca
98c321c718 Fix warnings 2019-02-15 09:40:49 -07:00
amantley
425413419a fixed merge conflict in avatar.h 2019-02-15 08:26:54 -08:00
luiscuenca
624a53449f Merge branch 'master' into flowCpp 
# Solved Conflicts:
#	interface/src/avatar/MyAvatar.cpp
 2019-02-14 18:55:43 -07:00
luiscuenca
88eae0f2ec Remove test functions 2019-02-14 18:49:49 -07:00
luiscuenca
3e66bce112 set useFlow function 2019-02-14 18:30:37 -07:00
Anthony Thibault
a3407b96b0 Merge branch 'master' into bug-fix/revert-anim-pose-optimization 2019-02-14 16:56:17 -08:00
Sam Gateau
6168001ad4
Merge pull request #14909 from AndrewMeadows/update-collision-group-after-grab-80 
Case 21159: fixes for more grab bugs
 2019-02-14 16:52:03 -08:00
Anthony Thibault
39b4eaac34 Revert "AnimPose operator* optimizations" 
This reverts commit 569bef50fd.
 2019-02-14 16:13:00 -08:00
Bradley Austin Davis
d45d87031d
Merge pull request #14782 from SamGondelman/NOverlaysFinal 
Case 20723, Case 20334: Internally, replace all overlays with local entities
 2019-02-14 13:49:47 -08:00
Thijs Wenker
3026fd625a Avatar Doctor 2019-02-14 18:52:50 +01:00
Shannon Romano
8a07e2b31a
Merge pull request #14895 from ctrlaltdavid/M21132 
Case 21132: Add "Avatar Script" classification to relevant JSDoc APIs
 2019-02-13 10:35:00 -08:00
Shannon Romano
07a92aea95
Merge pull request #14894 from AndrewMeadows/update-collision-group-after-grab 
Case 21093: recompute collision group/mask when Grab ends
 2019-02-12 17:31:43 -08:00
Andrew Meadows
ed8481ead9 fix grab bugs 2019-02-12 14:04:56 -08:00
luiscuenca
954cac907d Other avatars after update and mod timer when active 2019-02-12 15:02:56 -07:00
Andrew Meadows
3ea6241cc9 send update for AvatarEntity on deleteGrab 2019-02-12 12:50:47 -08:00
danteruiz
fdfb9196d3 comments explaining horrible code 2019-02-12 11:45:08 -08:00
luiscuenca
942e9ccdfd Hand collisions working 2019-02-11 18:21:00 -07:00
danteruiz
a7e28f7a66 fix spatially nestable parent overwrite 2019-02-11 17:04:07 -08:00
danteruiz
50dd865bdc fix spatially nestable parent overwrite 2019-02-11 16:48:34 -08:00
Andrew Meadows
fab3e5e3fd remember hash of AvatarEntityItemData 2019-02-11 16:13:56 -08:00
David Rowe
5428bb19dc Add "Avatar Script" JSDoc API classification 2019-02-12 11:49:49 +13:00
r3tk0n
bdafb99402 Remove unused variable and function to address warnings in Mac and Linux builds. 2019-02-11 14:19:15 -08:00
SamGondelman
d988de4a17 Merge remote-tracking branch 'upstream/master' into NOverlaysFinal 2019-02-11 10:27:12 -08:00
amantley
822ec1c529 working on the wrist tweak, dampened the spine twist 2019-02-08 17:53:23 -08:00
John Conklin II
f9b86725fd
Merge pull request #14816 from SamGondelman/avatar 
Case 20924: Cleaning up Avatar findRayIntersection
 2019-02-08 14:40:45 -08:00
Anthony Thibault
d012d07519
Merge pull request #14865 from hyperlogic/feature/anim-optimizations 
Animation System Optimizations
 2019-02-08 12:44:10 -08:00
Jeff Clinton
54109deab9
Merge pull request #14825 from SamGondelman/fall 
Case 20829: Always fall when flying is not allowed
 2019-02-07 14:39:46 -08:00
SamGondelman
e74ff18bef Merge remote-tracking branch 'upstream/master' into NOverlaysFinal 2019-02-07 09:49:27 -08:00
SamGondelman
25ca52d892 Merge remote-tracking branch 'upstream/master' into NOverlaysFinal 2019-02-07 09:48:13 -08:00
Shannon Romano
30a6f25b69
Merge pull request #14851 from AndrewMeadows/myAvatar-unmovable-until-floor 
case 20048: don't allow MyAvatar to move until physics enabled
 2019-02-06 11:52:42 -08:00
Anthony Thibault
569bef50fd AnimPose operator* optimizations 2019-02-05 14:48:05 -08:00
Andrew Meadows
cbd83f972c remove unsued variable 2019-02-05 10:17:10 -08:00
Andrew Meadows
e50892b3d2 MyAvatar is unmovable until physics is enabled 2019-02-05 09:00:48 -08:00