Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-08-26 05:01:42 +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
Sabrina Shanman
e74de214e2
Merge pull request #16404 from highfidelity/master 
Merge master into instancing
 2019-10-25 09:55:44 -07:00
Anthony J. Thibault
dc7b611e8e documentation and warning fixes 2019-10-24 09:53:11 -07:00
Anthony J. Thibault
d43d12dfa7 Merge branch 'master' into feature/arkit-blendshapes 2019-10-23 21:45:10 -07:00
Anthony Thibault
edb181bd16
Merge pull request #16317 from luiscuenca/setAvatarLookAtAPI 
DEV-2285: Improve eyes look at
 2019-10-23 20:42:27 -07:00
Anthony J. Thibault
f28d317914 Clean up reamining issues 2019-10-23 16:43:10 -07:00
luiscuenca
bb0849d3a0
Move changes to Head and remove leftover code 2019-10-23 14:23:29 -07:00
David Rowe
a949f327d2 Merge branch 'master' into DOC-199 2019-10-24 09:14:08 +13:00
luiscuenca
9849205ca0
Add perf timer to code block 2019-10-23 12:32:16 -07:00
Anthony J. Thibault
61b9f08fec Blendshapes for OtherAvatars should update even if no joints have changes. 2019-10-22 22:19:03 -07:00
luiscuenca
f6aa4a2dd4
Head look at should update before rig 2019-10-22 11:42:19 -07:00
Anthony J. Thibault
03f88f696d Renamed LipsTogether to MouthClose and bug fixes. 2019-10-21 19:37:57 -07:00
luiscuenca
a4fcb2c39e
Add eyesLookAtTarget set/get API methods 2019-10-21 14:31:15 -07:00
Sabrina Shanman
5d91d22314
Merge pull request #16379 from highfidelity/master 
Merge master into instancing
 2019-10-18 10:24:35 -07:00
luiscuenca
63c2b41929
Restate legacy first person camera mode 2019-10-17 13:26:42 -07:00
David Rowe
fa9bf4d51c JSDoc fixes noticed in passing 2019-10-18 09:17:03 +13:00
luiscuenca
9000b4c7f8
Tweak camera position in first person to further hide neck 2019-10-16 17:31:10 -07:00
luiscuenca
9f0e82e1e6
Improve eye's look at and blinking. Fix look at update 2019-10-16 15:29:28 -07:00
Sam Gateau
af269a4720 Merge branch 'master' of github.com:highfidelity/hifi into upstream-instancing 2019-10-16 11:57:15 -07:00
Anthony Thibault
5115b52ca0
Merge pull request #16356 from luiscuenca/fixLookAtNoHead 
DEV-2316: Fix camera position in first person
 2019-10-16 10:52:53 -07:00
Anthony J. Thibault
389f5a1d33 ARKit Blendshape hookup work 2019-10-16 10:36:39 -07:00
Anthony J. Thibault
6efd74a339 WIP adding blendshapes to input system 2019-10-16 10:36:38 -07:00
Anthony J. Thibault
da0911e01b Delete legacy blendshape code 
Move FaceshiftConstants to BlendshapeConstants.
Delete FaceTracker and DdeFaceTracker classes.
Delete old facetracker menu and preferences
 2019-10-16 10:36:37 -07:00
Anthony J. Thibault
8411e6b033 Blendshape script API work 
* Moved hasScriptedBlendshapes, hasProceduralBlinkFaceMovement, hasProceduralEyeFaceMovement, hasAudioEnabledFaceMovement to AvatarData
  so they are accessable via agent scripts.
* Marked setForceFaceTrackerConnected as depricated.
* Updated jsdoc comments
 2019-10-16 10:36:35 -07:00
luiscuenca
02837be13f
Get state using CharacterController 2019-10-16 09:04:03 -07:00
luiscuenca
93a1adc736
Fix camera position in first person 2019-10-15 18:25:33 -07:00
Anthony J. Thibault
288f9bfb16 Fix for HMD mode flying 
In HMD mode you should fly/move in the direction you are looking.
 2019-10-15 18:22:42 -07:00
Shannon Romano
f29d4aad1b
Merge pull request #16322 from Atlante45/feat/xcode-11-compatible-build 
Add Bullet3 patch for Xcode 11 build
 2019-10-14 16:28:17 -07:00
luiscuenca
505813b3c3
Fix blink async and other is talking bug 2019-10-14 10:44:55 -07:00
Brad Hefta-Gaub
51669e1ac3
Revert "DEV-1811: apply deletion rules to linked entities" 2019-10-11 11:06:10 -07:00
Clement
0df6661f5b Fix incorrect assert 2019-10-10 15:57:05 -07:00
Maia Hansen
07b916f0b7
Merge pull request #16307 from AndrewMeadows/colossal-cave 
DEV-1811: apply deletion rules to linked entities
 2019-10-10 13:24:43 -07:00
Sam Gateau
c0e4509095 Merge branch 'master' of github.com:highfidelity/hifi into instancing 2019-10-10 09:04:38 -07:00
Brad Hefta-Gaub
1316f9b046
Merge pull request #16301 from dooglifeSF/drivekey_anim_triggers 
Drivekey anim triggers
 2019-10-09 18:25:10 -07:00
luiscuenca
fc018257e1
Select avatar to look using API. Blink when look at change 2019-10-09 12:20:35 -07:00
Sam Gateau
9df2186696 Merge branch 'master' of github.com:highfidelity/hifi into instancing 2019-10-09 10:03:09 -07:00
Shannon Romano
b3d974504a
Merge pull request #16316 from luiscuenca/fixForwardEyeLookAt 
DEV-2285: Fix eye look at forward vector
 2019-10-09 09:13:02 -07:00
dooglifeSF
8a262a3d1a Merge branch 'master' into drivekey_anim_triggers 2019-10-09 07:37:38 -07:00
Sam Gateau
abaf0262a7 Merge branch 'master' of https://github.com/highfidelity/hifi into instancing 2019-10-08 18:55:51 -07:00
Sam Gateau
1f3993c308 getting the transform right for the rigid bodies 2019-10-08 18:13:24 -07:00
luiscuenca
68e287628c
Fix eye look at forward vector 2019-10-08 14:39:27 -07:00
Shannon Romano
0bf7fd0233
Merge pull request #16310 from luiscuenca/fixStrafeWhileFlying 
DEV-2261: DEV-2320: Fix strafe while flying, and ramp up diagonal movement
 2019-10-08 11:45:26 -07:00
luiscuenca
5576132df7
Fix strafe while flying, and ramp up diagonal movement 2019-10-08 10:13:58 -07:00
David Rowe
f224832d27 Merge branch 'master' into DOC-111 2019-10-08 20:44:13 +13:00
Andrew Meadows
052a0c3ebe remove cruft, add comments, change variable name 2019-10-07 16:23:30 -07:00
Sam Gateau
521ce3936b I changed names! Renaming the Geometry to NetworkModel, the GeometryResource to ModelResource, i think there is no need for the 2, only one would be enough in my opinion... 2019-10-07 15:19:23 -07:00
Andrew Meadows
8ab70225d9 apply delete rules down linked hierarchy 2019-10-07 14:38:36 -07:00
Andrew Meadows
470a45c012 EntityItem::_owningAvatarID always AVATAR_SELF_ID for MyAvatar's entities 2019-10-07 14:38:36 -07:00
Sam Gateau
42bc91b389 Merge branch 'master' of github.com:highfidelity/hifi into instancing 2019-10-07 09:42:14 -07:00
dooglifeSF
387f0a3f10 add isInput* and isNotInput vars for use in json, and edit json to use them 2019-10-04 15:28:35 -07:00
Shannon Romano
f797f714bd
Merge pull request #16298 from luiscuenca/addisSeatedAPImethod 
DEV-2011: Add MyAvatar::isSeated API method
 2019-10-04 15:06:46 -07:00
luiscuenca
07080f0138
Clarify jdocs 2019-10-04 13:47:20 -07:00
luiscuenca
3a9c829c95
Add MyAvatar::isSeated API method 2019-10-04 11:07:49 -07:00
Sam Gateau
c7ca431296 Merge branch 'master' of github.com:highfidelity/hifi into instancing 2019-10-04 10:00:41 -07:00
luiscuenca
e0d0ec5852
Fix isInAir so takes into account the new seated state: 2019-10-03 10:36:23 -07:00
luiscuenca
75f0b4ea54
Fix First Person Camera issues 2019-10-02 14:17:57 -07:00
luiscuenca
059bcc10cc
merge master 2019-10-02 13:24:32 -07:00
luiscuenca
521aa50356
Set time and angle recentering parameters 2019-10-02 11:43:06 -07:00
Sam Gateau
dcfc3cddd2 Merge branch 'master' of https://github.com/highfidelity/hifi into instancing 2019-10-01 19:50:33 -07:00
luiscuenca
18af7c5d84
Add recenter timer and temp API 2019-10-01 13:44:27 -07:00
Shannon Romano
38574cd66b
Merge pull request #16245 from luiscuenca/implementPointAt 
DEV-442: Implement directional blending node for point reaction
 2019-10-01 11:46:30 -07:00
Sam Gateau
1d19671e88 Merge branch 'master' of github.com:highfidelity/hifi into instancing 2019-10-01 11:27:16 -07:00
luiscuenca
d4a74f798c
aimToBlendValues to static function 2019-10-01 10:15:16 -07:00
Anthony Thibault
c2690eb39d
Merge pull request #16268 from luiscuenca/limitRotationWhileSeated 
DEV-2125: Rotation while seated do not trigger re-centering
 2019-10-01 09:33:02 -07:00
luiscuenca
7c55cee1f0
Limit rotation while seated to not trigger recentering 2019-09-30 17:37:14 -07:00
luiscuenca
0fac1e134f
Allow avatar look at when in first person camera 2019-09-30 16:43:02 -07:00
luiscuenca
02d889ba6e
account for point target validity 2019-09-30 11:35:00 -07:00
luiscuenca
1b064a0ebe
Fix Q key on first person cam. Let camera control flying Y axis 2019-09-26 14:29:01 -07:00
luiscuenca
d7fc4e905c
fix function on jsdoc 2019-09-25 14:02:43 -07:00
luiscuenca
0aab2ed07f
Disable head look at when pointing 2019-09-25 12:37:24 -07:00
luiscuenca
ad79393e1f
Implement point at directional blend and API 2019-09-24 17:55:38 -07:00
luiscuenca
10f76da3ec
Reset look at values when goToLocation or sitting 2019-09-23 11:53:47 -07:00
luiscuenca
f979c4e1ab
Add more info to jdocs 2019-09-20 09:51:51 -07:00
luiscuenca
365aa1bf03
Add jdoc to camera modes and fix variable namings 2019-09-19 17:30:01 -07:00
David Rowe
605d272392 Merge branch 'master' into DOC-111 2019-09-20 10:25:21 +12:00
David Rowe
19888fad03 Format findableBy and audioListenerMode property values as lists 2019-09-20 08:35:23 +12:00
luiscuenca
279e25ca70
Merge master 2019-09-19 13:21:49 -07:00
David Rowe
d5e08d19e3 Fix JSDoc for miscellaneous white space issues 2019-09-20 08:17:24 +12:00
luiscuenca
6d98537a20
Clean up code and refactor avatar-animation.json 2019-09-19 10:45:20 -07:00
luiscuenca
7bc8e6b237
Solved some sitting and sound issues while looking at 2019-09-18 17:00:10 -07:00
Shannon Romano
e7001c3f1b
Merge pull request #16157 from sethalves/vive-pro-groundwork 
DEV-605: Vive pro groundwork
 2019-09-18 16:36:12 -07:00
luiscuenca
1054e8fcde
Selfie camera and updated camera menus 2019-09-17 17:15:16 -07:00
Anthony J. Thibault
1157d59f67 Sit bug fixes 
* You should not be able to move after being seated, even if you switch seats.
* You should not be able to jump out of the chair by holding the space bar.
* Fixed small issue with the sitting to standing transition being delayed. (causing the user to look
  like there were sitting in mid-air)  This was due to a missing transition in the animation.json
 2019-09-17 13:40:43 -07:00
Seth Alves
3ece763a8e code review 2019-09-17 10:52:55 -07:00
Seth Alves
58cf51058b code review 2019-09-17 09:43:32 -07:00
Seth Alves
a288c0a52d remove old/unused eyetracker code. 2019-09-17 09:43:21 -07:00
Seth Alves
943348ba51 input action channels for eyes and eyelids and fingers. connect eyelid input actions to blendshapes. 2019-09-17 09:43:20 -07:00
David Rowe
dff37a71eb Fix JSDoc markup HTML issues 2019-09-17 16:26:09 +12:00
luiscuenca
481917ae8a
Rotate avatar with camera and diagonal rotation 2019-09-16 18:26:19 -07:00
luiscuenca
5adf3e8c25
Expose API some parameters for live configuration 2019-09-13 14:10:11 -07:00
sabrina-shanman
b944db3e79 std::vector-ize joints and materials in hfm::Model 2019-09-11 16:54:07 -07:00
luiscuenca
8af22f0c04
Compute when negative deltas 2019-09-11 16:27:07 -07:00
luiscuenca
793b2917f6
Compute only when delta is not zero 2019-09-11 16:25:48 -07:00
luiscuenca
8a6cb93a84
Limit the camera pitch and use the eyes as the pivot point 2019-09-11 16:08:14 -07:00
luiscuenca
7c7c3cd223
merge master 2019-09-11 14:07:19 -07:00
luiscuenca
f0dcfa7f15
fix rotation frame 2019-09-11 12:04:23 -07:00
luiscuenca
b28154235a
Look at camera when camera in front 2019-09-11 11:43:26 -07:00
luiscuenca
7584fe587e
Fix warnings and initial camera orientation 2019-09-11 11:21:53 -07:00
luiscuenca
2f33e37eb6
Angles instead dot product and fix API 2019-09-10 18:10:02 -07:00
Shannon Romano
e1dac580b6
Merge pull request #16121 from luiscuenca/audioPosesSyncFix 
BUGZ-1234: Mitigate the effect of audio noise on talking animations
 2019-09-09 10:37:07 -07:00
luiscuenca
1f458d195e
Refactorting, up/down attenuation and comments 2019-09-06 17:50:06 -07:00
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