Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-13 09:27:24 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
81163 commits 25 branches 0 tags 1.1 GiB
Commit graph

2391 commits

Author SHA1 Message Date
amantley
635300c6d5 changed pre physics to use cg for desired body when in cg mode 2018-10-04 18:05:05 -07:00
amantley
82f8c67436 put the mode in sensor space for cg 2018-10-04 15:37:01 -07:00
amantley
acce675efc added snap for recentering with sit stand state change. using average height with tipping point for thresholds 2018-10-04 14:53:51 -07:00
amantley
809ca0e512 vive hmd input is implemented. not using mode 2018-10-03 18:05:30 -07:00
amantley
8a0fbc3fe9 changed the height to use the mode . to do fix sensor space bug. 2018-10-02 17:47:56 -07:00
David Rowe
f7fd76b316 Merge branch 'master' into M18586 
# Conflicts:
#	interface/src/scripting/HMDScriptingInterface.h
 2018-10-02 16:49:16 +13:00
amantley
f0676d796c added constants and tipping point for running average. this should be replaced by the mode 2018-10-01 17:57:00 -07:00
John Conklin II
8ad5ca5a67
Merge pull request #14105 from luiscuenca/bookmarkOnFloorFix 
Fix avatar warp into floor when navigating to a saved bookmark
 2018-10-01 16:36:31 -07:00
Brad Hefta-Gaub
6290b56383
Merge pull request #14079 from luiscuenca/simpleAvatarTransit 
Simple avatar transit
 2018-10-01 16:24:46 -07:00
amantley
90feeffa9d cleaning up. putting squat fix in vertical recenter 2018-10-01 14:21:00 -07:00
amantley
1a0e2c6ea1 clean up for pr 2018-10-01 08:30:51 -07:00
amantley
9e40045927 added criteria to stop false positive for sit down 2018-09-30 17:13:34 -07:00
amantley
bdd6befef9 Merge remote-tracking branch 'upstream/master' into squattyPottyFix 2018-09-29 15:39:36 -07:00
amantley
884ad66a14 added sensor space detection of height of the user in MyAvatar.cpp 1.2 * average sensor space height changes to standing. .833 sensorspace height changes to sitting. there is also a manual override in the avatar app settings now 2018-09-28 17:18:24 -07:00
David Rowe
1c4bde3e84 Fix build warnings 2018-09-28 18:38:38 +12:00
David Rowe
545c2591e3 Merge branch 'master' into M18586 2018-09-28 16:19:44 +12:00
David Rowe
f2c13f193c Don't jump in HMD mode unless option is set 2018-09-28 16:05:20 +12:00
luiscuenca
195df9e0ec compute feet position offset in situ 2018-09-27 17:18:43 -07:00
amantley
42cb8a7ef0 avatar app changes 2018-09-27 16:59:54 -07:00
amantley
52355e53f1 adding the menu item to the avatar app for the sit state. 2018-09-27 16:44:55 -07:00
luiscuenca
bbe836ee88 Remove smooth teleport and set/get API methods 2018-09-27 10:38:45 -07:00
David Rowe
6ae206677d Add Settings > Controls option for displaying play area 2018-09-27 14:55:53 +12:00
amantley
fa9abf0fff added the floor at 0.0 in sensor space for oculus. to do: vive 2018-09-26 18:08:00 -07:00
amantley
4f9de1be1c Merge remote-tracking branch 'upstream/master' into squattyPottyFix 2018-09-26 08:38:30 -07:00
luiscuenca
754653b093 Fix warnings 2018-09-25 17:31:18 -07:00
luiscuenca
82b08f1a93 Wait until skeleton is loaded to locate the avatar 2018-09-25 16:21:05 -07:00
amantley
ad6bbc7ff6 latest squatty changes 2018-09-25 11:22:44 -07:00
luiscuenca
0676f25e31 Save transit preferences 2018-09-25 07:42: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
Seth Alves
86e502637e Make Settings thread safe 2018-09-21 15:46:35 -07:00
amantley
42e248ef84 maded more changes to support sitting state to do: add option for stuck pose reset 2018-09-18 17:37:44 -07:00
amantley
96da9b7e54 cleaned up code for squatty fix 2018-09-18 10:31:19 -07:00
amantley
14fb7e1d44 removed redundant code 2018-09-17 17:53:08 -07:00
amantley
ff0d938d37 initial changes to stop the squatty potty from happening when users are sitting down in vr mode 2018-09-17 16:53:15 -07:00
luiscuenca
ff319ebd95 Bypass position updates from mixer 2018-09-17 09:47:22 -07:00
luiscuenca
c5669ef1f5 better property names 2018-09-13 15:22:18 -07:00
luiscuenca
ceccc6d6ec make getCollisionCapsule thread safe 2018-09-13 14:49:35 -07:00
luiscuenca
b517808bc2 Fix smaller size avatar capsule and land on detailed mesh 2018-09-12 21:24:19 -07:00
luiscuenca
fedea6e84d Comply with review comments 2018-09-11 12:23:25 -07:00
luiscuenca
a9f676354b Only invisible pointers and scale fix 2018-09-10 08:54:53 -07:00
luiscuenca
d09391faa5 Fix invisible error 2018-09-07 12:17:40 -07:00
luiscuenca
02065518cb Merge branch 'master' of https://github.com/highfidelity/hifi into stt_teleport_wip 2018-09-07 11:57:48 -07:00
amantley
90a51e6181 added walk velocity threshold, this determines if we are in the walk state. when we are then we don't do cg leaning calculation. this will smooth out the walking in a large tracked area 2018-09-06 13:12:48 -07:00
amantley
6fb335429d starting to re-implement the walking state detection for smoothwalking 2018-09-05 17:55:27 -07:00
luiscuenca
abb632afda Update capsule when scale/load and teleport without safe landing 2018-09-05 16:51:34 -07:00
amantley
73e628bb8d merge with master fixes 2018-09-05 14:42:49 -07:00
Anthony Thibault
b21fa1037f Code review feedback and bug fixes for calibraiton matrices 2018-09-04 11:55:52 -07:00
Anthony Thibault
3a034fdf66 HMD mode bug fix for avatars with no eyes 
Previously getCenterEyeCalibrationMat() would return the average eye position for an avatar, if the eyes are missing.
Now we fall back to using the HeadCalibrationMat() and adding an offset from the head to the center of the eyes.
This is more accurate for characters that don't quite have human proportions.
 2018-09-04 10:13:57 -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
John Conklin II
8fa4a2855e
Merge pull request #13641 from amantley/rotateFilterChange 
Hand Azimuth Controls Shoulder Rotation
 2018-08-30 13:59:00 -07:00
Stephen Birarda
aaf5f593c5 send MyAvatar avatar entity updates through entity tree 2018-08-29 16:30:24 -07:00
Angus Antley
f7d0cdda02 added a check for whether the head to shoulder azimuth is greater than 100 degrees. If so unflip the chest azimuth 2018-08-29 20:44:21 +01:00
Angus Antley
ee33f5dc97 normalize the hip hand vector in getSpine2RotationRigSpace, made computeHandAzimuth a const function that returns a vec2 2018-08-29 01:57:49 +01:00
amantley
3c792a04c1 fixed roll rotation added to azimuth in MySkeletonModel.cpp 2018-08-28 11:25:42 -07:00
amantley
89b508251e added some comment to explain rig to avatar transform 2018-08-27 17:57:50 -07:00
amantley
055f03878e made changes to add roll to the spine2 rotation. also only the shoulders control the rotation recenter now 2018-08-27 14:44:27 -07:00
amantley
8406fb2359 Merge remote-tracking branch 'upstream/master' into steppingReboot 2018-08-24 16:48:26 -07:00
amantley
dd8a00983c Merge remote-tracking branch 'upstream/master' into rotateFilterChange 2018-08-24 16:29:20 -07:00
amantley
2bec867863 added the sanity check to see if the shoulders have flipped 2018-08-24 16:29:08 -07:00
amantley
a60ab863a3 demo version of the head and hands determining the rotate function 2018-08-24 11:06:36 -07:00
Angus Antley
25610c7587 got the hands turning the shoulders, needs error checking 2018-08-24 11:04:36 +01:00
Angus Antley
44a6c7df5f added hook to myskeleton model to update spine2, need to get the rotation from myavatar then we have spine rot 2018-08-24 07:17:17 +01:00
amantley
0e0561bb24 latest rotate code 2018-08-23 17:59:18 -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
Angus Antley
30ef544c6d starting the c++ version of shoulder rotation 2018-08-23 15:57:14 +01:00
Wayne Chen
9518b8cdaf rearrangement 2018-08-22 15:46:02 -07:00
Wayne Chen
c32cc1ead2 adding implementation 2018-08-22 15:42:15 -07:00
luiscuenca
b3d127c953 Fix flickering 2018-08-22 14:31:34 -07:00
amantley
9dfaf32b72 fixed the step animation but it still needs work 2018-08-22 14:12:19 -07:00
amantley
2dd812935f Merge remote-tracking branch 'upstream/master' into rotateFilterChange 2018-08-22 12:57:16 -07:00
amantley
1e3ca6f902 added quicker follow code and added head to rotate calculation 2018-08-22 12:57:06 -07:00
amantley
456b8bf2a9 tweaked the animvars callback to update the spine2 position 2018-08-22 09:36:52 -07:00
luiscuenca
5f4903f884 Record entities 2018-08-22 08:53:51 -07:00
amantley
1fabc77244 latest update to stop lurching, and allow leaning, and stop perma leans 2018-08-21 12:34:05 -07:00
Stephen Birarda
1723f3d3d8 don't use entity tree to clear all avatar entities 2018-08-21 12:21:29 -07:00
Stephen Birarda
a177e49877 Revert "send attachment clears through setAvatarEntityData" 
This reverts commit 25876bca63.
 2018-08-21 12:18:11 -07:00
Stephen Birarda
25876bca63 send attachment clears through setAvatarEntityData 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
Stephen Birarda
ea7c0e923a make client traits handler a unique ptr in AvatarData 2018-08-21 10:31:15 -07:00
Stephen Birarda
a0df68f32f move skeleton model URL emit to AvatarData 2018-08-21 10:31:14 -07:00
Stephen Birarda
a80d19a44a remove skeleton from identity, handle in clients 2018-08-21 10:31:14 -07:00
Stephen Birarda
ac835650b7 add skeleton trait sending to Agent, queuing in AvatarMixer 2018-08-21 10:31:14 -07:00
Stephen Birarda
486557e28a initial trait packet sending on skeleton URL change 2018-08-21 10:31:14 -07:00
amantley
2dcdd60750 added new AvatarConstants and more frequent horizontal recentering to deal with lurching walk in large tracked volumes 2018-08-20 17:32:52 -07:00
amantley
baa17395f0 Merge remote-tracking branch 'upstream/master' into rotateFilterChange 2018-08-20 16:47:21 -07:00
amantley
94026fb4dd added activate(rotation) to prephysics update 2018-08-20 16:47:14 -07:00
amantley
471bb28545 Merge remote-tracking branch 'upstream/master' into steppingReboot 2018-08-20 09:50:45 -07:00
John Conklin II
1edf1b4337
Merge pull request #13555 from SamGondelman/destroy 
Trying to fix dependency shutdown
 2018-08-16 13:14:58 -07:00
Seth Alves
527b27da96 pseudo-joints for far-grab positions 2018-08-14 08:55:20 -07:00
Seth Alves
0a5c96ecc1
Merge pull request #13792 from luiscuenca/attachmentsAPImgr 
Attachments API returns avatar entities
 2018-08-13 14:21:13 -07:00
amantley
c2612af7a8 changed the spine stretch limit, will check the scale implications next 2018-08-10 17:10:33 -07:00
luiscuenca
dd93055d89 Convert and load attachments when rig is ready 2018-08-10 16:15:30 -07:00
John Conklin II
644ff1eafa
Merge pull request #13655 from amantley/animationBlendChanges 
New Default Strafe Animations Plus Animation Tuning Support
 2018-08-10 15:03:30 -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
luiscuenca
9ca0ee05dc Fix wanings 2018-08-09 12:13:03 -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
luiscuenca
8c121a531d Turn attachments into avatar entities 2018-08-09 10:35:15 -07:00
amantley
c774dd7f5b debugging to solve the no-neck crazy scale problem 2018-08-08 17:52:22 -07:00
r3tk0n
32165dff40 Fixed rotations in MyAvatar::goToFeetLocation() 2018-08-07 14:31:48 -07:00
amantley
1353406254 more whitespace 2018-08-07 12:56:28 -07:00
amantley
84619e7adc cleaned up to match coding standards 2018-08-07 10:40:11 -07:00
MuteTab
b590ff793a New function for changing location in domains such that the AVatar's leg-length is taken into account. 2018-08-06 20:26:44 -07:00
amantley
1ad6b041cd updated the elipes equation code for determining the forward speed of the avatar. We can now set the max forward == walkSpeed, max side and backwards == walkBackwardsSpeed and the sprint speed == sprintSpeed 2018-08-06 18:36:32 -07:00
Sam Gondelman
2edefe3209
Merge branch 'master' into destroy 2018-08-06 09:51:14 -07:00
amantley
08889b627a Merge remote-tracking branch 'upstream/master' into animationBlendChanges 2018-08-06 09:16:53 -07:00
Dante Ruiz
f30b552e19 fix-flying 2018-08-03 15:50:11 -07:00
amantley
bd88d5f15b merging with ik leg fix code in master 2018-08-02 09:48:04 -07:00
amantley
6b2c67e5bd more doug support 2018-08-01 18:22:51 -07:00
SamGondelman
8a9c27ed92 Merge remote-tracking branch 'upstream/master' into destroy 2018-08-01 16:07:48 -07:00
amantley
02dd2f4f28 added velocity scaling for forward and back 2018-07-31 18:26:44 -07:00
John Conklin II
16940cc9b7
Merge pull request #13716 from r3tk0n/17170-flying-crash 
Remove deprecated flying setting from MyAvatar.cpp saveData()
 2018-07-31 09:48:01 -07:00
John Conklin II
bd2ab38bfe
Merge pull request #13701 from ElderOrb/FB16702 
FB16702 - Avatar App does not save Animation JSON Override URL
 2018-07-30 14:51:32 -07:00
r3tk0n
63de16bac5 Remove deprecated flying setting from MyAvatar.cpp saveData() 2018-07-30 11:40:15 -07:00
John Conklin II
021e09d083
Merge pull request #13708 from sethalves/fix-grab-entity-w-child-overlay-crash 
fix a crash when grabbing a non-dynamic entity with an overlay child
 2018-07-27 12:49:14 -07:00
John Conklin II
d4cbbfe4c1
Merge pull request #13692 from amantley/leanBackSittingFix 
Fix For Unnatural Hips Behaviour When Sitting In HMD
 2018-07-27 12:30:31 -07:00
Seth Alves
91d509f5a4 fix a crash when grabbing a non-dynamic entity with an overlay child 2018-07-27 10:35:26 -07:00
Alexander Ivash
29f7cab7df FB16702 - Avatar App does not save Animation JSON Override URL 
note: PR also changes logic of 'hint' - previously it showed hard-coded senseless text, now - current value of 'animation URL'
 2018-07-27 02:08:44 +03:00
r3tk0n
f3d0d9b4a0 Clean up garbage comments. 2018-07-26 15:37:42 -07:00
r3tk0n
f8c611b1d0 Divorce HMD and Desktop flying settings, implement setters and getters, change loadData and saveData in MyAvatar.cpp 2018-07-26 15:35:12 -07:00
amantley
12cb212dc7 used avatar constants from AvatarConstants.h to initialize tpposehips and tposerightfoot, and added space between multiplication to meet coding standards 2018-07-26 12:05:17 -07:00
amantley
37540c79b3 removed print statement and added const upper leg fraction 2018-07-25 10:51:19 -07:00
amantley
c5599623f7 added a reset when the hips go below 1/3 of the default avatar height of the hips also reset the vertical this prevents real life sitting 2018-07-25 10:29:29 -07:00
John Conklin II
2ac9463830
Merge pull request #13653 from ElderOrb/fake-wearables-fix 
FB16870: Avatar Wearables showing incorrect number
 2018-07-23 15:55:11 -07:00
Alexander Ivash
33c858774b fix coding standard compliance 2018-07-23 21:01:43 +03:00
r3tk0n
bc91affa70 Bring this PR inline with RC70.1 PR. 2018-07-20 15:13:44 -07:00
Alexander Ivash
849c91d8f6 remove not necessary EntityTreeRenderer from removeAvatarEntities's condition 2018-07-20 19:32:58 +03:00
Alexander Ivash
fb8640de47 FB16870: Avatar Wearables showing incorrect number 2018-07-20 02:51:17 +03:00
MuteTab
dfcf47e8ee Removed useless comment. 2018-07-19 14:44:32 -07:00
MuteTab
8d65e14193 Remove one change, turned out to be unnecessary. 2018-07-19 14:43:46 -07:00
MuteTab
3080539b63 Make getFlyingEnabled() always true when in desktop. 2018-07-19 14:40:20 -07:00
amantley
5ec7ab3a7d removed the other way of computing the average lookat which used a ring buffer 2018-07-18 17:20:47 -07:00
amantley
a8c4f4e650 removed extra whitespace 2018-07-18 17:10:09 -07:00
amantley
7cc724a27b added properties to allow the toggling of the debug draw the look at vector, and the reset moving average look at on step detection 2018-07-18 17:08:04 -07:00
amantley
ef2d3c9f16 Merge remote-tracking branch 'upstream/master' into rotateFilterChange 
synching with master
 2018-07-18 09:00:18 -07:00
Qliemillar
080d664341
Merge pull request #13619 from luiscuenca/handTouchDisabler 
Allow creators to disable hand touch from javascript
 2018-07-18 08:16:37 -06:00
amantley
33f9acde67 latest 2018-07-17 17:42:11 -07:00
luiscuenca
e3594fe1b7 mutex added 2018-07-17 17:23:03 -07:00
luiscuenca
fcb7614f7e Format and fixes 2018-07-17 16:34:30 -07:00
luiscuenca
82a3b73de8 Added disable hand touch for entityID 2018-07-17 07:06:48 -07:00
luiscuenca
84dac94379 Allow creator to disable hand touch 2018-07-16 17:03:50 -07:00
amantley
abb2c7ef14 Added reset of the _headControllerFacingMovingAverage in MyAvatar.cpp prePhysicsUpdate(). This stops some of the flipping back and forth that has been happening with rotational recenter. 2018-07-16 11:29:49 -07:00
Anthony Thibault
1d33f51ca4
Merge pull request #13528 from amantley/integratedStepping 
Step Detection From Head and Hands Tracking
 2018-07-10 09:59:22 -07:00
John Conklin II
81f5631ce9
Merge pull request #13386 from ElderOrb/FB13949 
AvatarApp
 2018-07-09 15:20:18 -07:00
amantley
cb421fd5b0 fixed build errors for mac and linux 2018-07-09 15:09:45 -07:00
amantley
55ae08c071 Merge remote-tracking branch 'upstream/master' into integratedStepping 2018-07-09 13:55:59 -07:00
amantley
b2d77ef51a bracket spacing 2018-07-09 13:54:18 -07:00
amantley
7ed8f17b57 tweaked posterior threshold and head velocity threshold 2018-07-09 13:49:21 -07:00
amantley
a3417cace9 implemented code review changes. 1. checking for divide by zero before glm::normalize. 2. clearing the ring buffer on reset. 3. renaming _standingHeightMode to _currentStandingHeight 2018-07-09 11:58:02 -07:00
amantley
defd6f88e6 started changes suggested by code review, ie mode computation 2018-07-06 18:17:13 -07:00
Alexander Ivash
aaa2e3f6a8 fix issue with duplicated wearables on switching between bookmarks / cancelling 'adjust wearables' 2018-07-06 21:00:56 +03:00
Alexander Ivash
dbcc654af1 remove comments 2018-07-06 21:00:55 +03:00
Alexander Ivash
3ac44376b2 bind Settings page to a backend 2018-07-06 21:00:53 +03:00
Alexander Ivash
b6769f9678 avatar selection & wearables adjustments work-on-progress 2018-07-06 21:00:52 +03:00
Dante Ruiz
533164e1e4 some more fixes 2018-07-06 08:55:20 -07:00
SamGondelman
7954865141 trying to fix dependency shutdown 2018-07-05 14:34:37 -07:00
amantley
0ebc7fc29e fixed the mode computation so that it can keep track of all long term height frequencies. This makes it unnecessary to reset the mode, because it will revert back to the highest frequency 2018-07-05 13:41:06 -07:00
amantley
6460c9e861 fixed case for 0.0 as the filter length 2018-07-03 17:11:19 -07:00
amantley
4995b57712 removed print statements and fixed rotation threshold update code 2018-07-03 14:31:36 -07:00
amantley
59dfe80940 Merge remote-tracking branch 'upstream/master' into integratedStepping 2018-07-03 11:47:09 -07:00
amantley
9e5763ea5c adding the recentering back into the non hmd lean code 2018-07-03 11:46:59 -07:00
amantley
3424f412aa
Merge pull request #13437 from amantley/lurchfix 
Fix for Avatar Lean in Direction of Movement: Bug 16075 (for RC70)
 2018-07-03 19:38:01 +01:00
amantley
f216316b55 removed some comments and whitespace 2018-07-02 18:19:31 -07:00
amantley
47110d080f removed clang induced changes to MyAvatar.cpp 2018-07-02 17:06:16 -07:00
amantley
7f5f762208 fixing merge conflict 2018-07-02 15:54:21 -07:00
amantley
096d0d2827 reorganized the step detection code, creating a shouldActivateHorizontalCG that calls all the step detection conditionals. The average rotation and the mode are now calculated in MyAvatar::update 2018-07-02 15:43:57 -07:00
amantley
44d9edec3c added the properties for filter length and rotation threshold to MyAvatar class This will help us test the right combo for head based turning 2018-06-29 14:42:23 -07:00
amantley
c9c222a253 added the failsafe code to the stepping 2018-06-29 11:33:42 -07:00
amantley
15a17ae32a finished the step detection, need to finish the failsafe 2018-06-28 18:36:13 -07:00
amantley
3e6d54e83c added all the parts for the step conditional to do: failsafe 2018-06-28 11:56:46 -07:00
John Conklin II
138342ba91
Merge pull request #13485 from zfox23/MS16257_clearOverlay 
Implement MS16257: Remove 'clear overlay when moving' setting and code
 2018-06-28 09:31:04 -07:00
Angus Antley
2307c8e24a more work on the mode threshold 2018-06-28 15:40:42 +01:00
amantley
621ca7d2b4 more work on the mode function 2018-06-27 18:46:24 -07:00
amantley
61a935dbb5 added the first pass at mode computation 2018-06-27 18:02:11 -07:00
John Conklin II
0cb8b4dfa1
Merge pull request #13471 from danteruiz/disable-flying-by-default 
Disable flying by default
 2018-06-27 16:04:16 -07:00
amantley
7b49ae4950 added the within threshold of height function and to do: the mode computation 2018-06-27 14:23:24 -07:00
Zach Fox
cfc8c0fb09 Implement MS16257: Remove 'clear overlay when moving' setting and code 2018-06-27 14:07:04 -07:00
amantley
3893b7e339 added the head angular velocity check 2018-06-27 10:37:54 -07:00
amantley
8cf59783d1 removed white space 2018-06-27 09:20:46 -07:00
amantley
be6fadbc2d Merge remote-tracking branch 'upstream/master' into integratedStepping 2018-06-27 09:16:43 -07:00
Dante Ruiz
3cf36bed55 making small adjustments 2018-06-26 14:57:15 -07:00
Dante Ruiz
1fec900ba6 disable flying by default 2018-06-26 13:31:59 -07:00
David Rowe
af3861def8 Code review 2018-06-25 16:33:05 +12:00
David Rowe
40fb627504 Merge branch 'master' into 21892 2018-06-25 16:04:44 +12:00
amantley
3027f8242c added the conditional for leaving the base of support to pre physics update in MyAvatar.cpp 2018-06-21 17:23:03 -07:00
amantley
e4ca6c6303 added the fixes for the lurch that happens when driving or flying 2018-06-21 11:22:26 -07:00
amantley
8fc04776f9 starting to implement the step detection code in MyAvatar.cpp 2018-06-21 10:59:07 -07:00
SamGondelman
8014f61243 loading priorities for avatars and attachments 2018-06-20 12:29:28 -07:00
David Rowe
be4b929301 Fix cauterization when reparent entity to a different joint 2018-06-16 16:31:06 +12:00
David Rowe
4dd6ba1d18 Fix Mac crash 2018-06-16 16:29:45 +12:00
David Rowe
249f72758e Fix entity detaching from head joint not becoming visible 2018-06-15 16:36:16 +12:00
John Conklin II
0ba97fa83b
Merge pull request #13338 from amantley/scriptedBlendshapesFaceFlags 
Scripted Blendshapes and Procedural Face Movement Flags
 2018-06-13 10:32:59 -07:00
Anthony J. Thibault
042f902d2e Merge branch 'master' into scriptedBlendshapesFaceFlags 2018-06-11 17:13:30 -07:00
Anthony J. Thibault
f773aef053 Merge branch 'master' into bug-fix/large-avatar-little-domain-rc68 2018-06-11 11:06:21 -07:00
Anthony J. Thibault
b8379045a8 Fix MyAvatar::isReadyForPhysics() in serverless domains. 2018-06-11 09:53:34 -07:00
Anthony Thibault
044d142635
Merge pull request #13133 from amantley/nativeCGCode 
Center of Gravity Leaning
 2018-06-08 17:53:55 -07:00
amantley
913d78841d Merge remote-tracking branch 'upstream/master' into scriptedBlendshapes 
synching with upstream master
 2018-06-07 16:20:11 -07:00
Anthony J. Thibault
608575cf17 Large avatars should instantly shrink when entering small height domains 
Also reduce the fudge factor for safeLanding from an additional 50% of avatar's height to 25%.
 2018-06-07 15:31:40 -07:00
Anthony J. Thibault
c3d1daf855 Merge branch 'master' into nativeCGCode 2018-06-04 09:32:38 -07:00
Andrew Meadows
9ae19714b5 also update queryAACube for children of worn entities 2018-06-01 16:38:57 -07:00
amantley
3bda5bf6a0 added MyAvatar.hasProceduralBlinkFaceMovement and MyAvatar.hasProceduralEyeFaceMovement properties to MyAvatar.h and cpp and HeadData.h 2018-05-31 17:58:37 -07:00
samcake
386c0f9ab2 Re review adjustments 2018-05-31 12:16:57 -07:00
amantley
7cc5e96f2d Merge remote-tracking branch 'upstream/master' into feat/hasScriptedBlendshapes 
merging hifi master to update the branch
 2018-05-31 10:35:31 -07:00
Sam Gateau
513acc529e INtroduce RenderConstants header file to define the alias names for Tag and Layer for Hifi REnder Engine 2018-05-30 23:31:54 -07:00
samcake
2e9076c71e Clean up and trying to get ready for merge 2018-05-30 11:14:49 -07:00
samcake
873cabe284 Cleaning the code 2018-05-29 17:46:25 -07:00
samcake
82503a9e64 Merge branch 'master' of https://github.com/highfidelity/hifi into punk 2018-05-29 08:59:37 -07:00
Sam Gateau
678effdb48 Cleaning up the Model set ItemKey flags and bringing Item::Layer in the ItemKey 2018-05-26 23:28:59 -07:00
NissimHadar
d01482bf68 Now looks for an actual change in the boom length (vs a change has been requested). 2018-05-24 17:44:39 -07:00
samcake
5bede45c85 Merge branch 'master' of https://github.com/highfidelity/hifi into punk 2018-05-23 11:26:07 -07:00
NissimHadar
e07e716d40 Fixed stupid gcc warning. 2018-05-23 07:35:25 -07:00
NissimHadar
06203d44d8 Correct Camera.mode command. 2018-05-22 17:08:28 -07:00
samcake
36a08fdd84 Friday night end of the day, last compilation.... almost 2018-05-18 17:41:28 -07:00
samcake
aa18aaa7b1 Maybe 2018-05-17 18:06:46 -07:00
samcake
735db27919 Merge branch 'master' of https://github.com/highfidelity/hifi into punk 2018-05-16 17:18:23 -07:00
Dante Ruiz
e676348c4f fixing some menu reog bugs 2018-05-16 10:40:28 -07:00
Thijs Wenker
8b4298514e send out one last blendshape update when setting MyAvatar.hasScriptedBlendshapes to false 2018-05-15 21:39:17 +02:00
Anthony J. Thibault
ec638d9d91 Avatar can now look straight down without spinning 180. 
Also, come code clean up and removal of unnecessary Y_180 flips.
 2018-05-14 13:48:04 -07:00
Anthony J. Thibault
1cc7eb635f Fix ubuntu warning by removing cancelOutRollAndPitch2() 2018-05-14 09:13:26 -07:00
Anthony J. Thibault
274ac98bd6 Merge branch 'master' into nativeCGCode 2018-05-14 09:12:08 -07:00
vladest
0a67fc3b36 Merge conflicts 2018-05-12 11:24:35 +02:00
amantley
20c960c0da removed white space in MyAvatar.cpp 2018-05-09 15:00:20 -07:00
amantley
eff84de99f added more straight forward computation of the hips rotation inMyAvatar.cpp contributed by AJT 2018-05-09 14:55:10 -07:00
amantley
50f225777a removed debug code from cg code in MyAvatar.cpp 2018-05-09 11:31:19 -07:00
amantley
a7955b642a removed the follow hips code from pre physics update 2018-05-09 11:27:04 -07:00
amantley
77aedc1512 changed lerp to saferLerp in cg code 2018-05-09 11:14:13 -07:00
amantley
8000bcd272 cleaned up cg code ie computeNewHipsRotation 2018-05-08 18:12:53 -07:00
amantley
6051f4b8ff Merge remote-tracking branch 'origin/nativeCGCode' into nativeCGCode 
synching the branch with the remote repo
 2018-05-08 10:55:14 -07:00
amantley
544967ef3b added test function to cancel out roll and pitch 2018-05-08 10:55:10 -07:00
amantley
bbf8c73572 code review changes to declare functions static 2018-05-08 10:52:28 -07:00
amantley
3a10cacec0 1.added the swing twist code to update the follow rotation in MyAvatar.cpp 
2.added step.js and cg_lean.js to the developer folder
3.added menu item for toggling the hips following between head and hips
4.added new function to return true if the root of MyAvatar is translating
to be under the head.  Used to smooth the path of the hips
5.added computeCounterBalance to MyAvatar.h and cpp
6.added the menu item under developer/avatar to enable debug draw of the base of support in menu.h menu.cpp MyAvatar.h MyAvatar.cpp
7.added head yaw into the calculation of the hip rotation for the center
of gravity.  This is already was happening in the deriveBodyFromHMD code
that is default
8.Changed Constants in Avatar constants for the base of support
9.fixed the over rotation of the shoulders
10.fixed scaling problem in cg computation
11.added room for going up on the toes without stretching
 2018-05-07 17:41:35 -07:00
vladest
5a5bfcfe02 Merge branch 'master' into menu-updates 2018-05-05 07:11:39 +02:00
Brad Davis
72526781d9 Additional work on splash screen 2018-05-04 16:40:05 -07:00
Anthony J. Thibault
fc9bd7f905 Fix for crash deep in QML after useFullAvatarURL 
Here we avoid calling FSTReader::downloadMapping() from within MyAvatar::useFullAvatarURL().
This prevents the error case where a QEventLoop is entered during QML execution.
 2018-05-03 14:06:06 -07:00
Seth Alves
b68d9ecd68
Merge pull request #12985 from druiz17/attachments-disappearing 
fixing avatr attachments not being visible when coming out of first person
 2018-05-02 18:50:41 -07:00
luiscuenca
689fbd2da0 added requested changes 2018-05-02 11:09:17 -07:00
luiscuenca
2ac7fcadd2 load scripts once on rigReady 2018-05-01 09:37:01 -07:00
luiscuenca
2de982a5a2 Added script types and better script reload 2018-04-30 12:04:35 -07:00
luiscuenca
12f578c93c More fixes 2018-04-25 19:46:31 -07:00
luiscuenca
e0770f06b1 Add scripts to Model Packager 2018-04-25 19:35:26 -07:00
luiscuenca
165c3214a7 Avatar Scripts 2018-04-24 18:43:53 -07:00
Dante Ruiz
29fce488e4 make some changes 2018-04-24 14:00:52 -07:00
Dante Ruiz
b2925c5843 fixing attachments not being visible when coming out of first person 2018-04-24 13:32:30 -07:00
vladest
6d53512c6c Merge 2018-04-15 15:24:16 +02:00
John Conklin II
74ca98dc81
Merge pull request #12727 from amantley/triggerRecenterBehaviour 
Trigger Avatar Recenter Behaviour
 2018-04-02 14:42:21 -07:00
John Conklin II
796bd069b2
Merge pull request #12659 from alexiamandeville/script_charcontroller 
Updating char controller
 2018-04-02 13:24:15 -07:00
amantley
90d87c5b5d changed get functions to const in MyAvatar.cpp changed bool variables to atomic for thread safety 2018-03-28 14:00:36 -07:00
amantley
4b1f974561 fixed merge conflict for declaring _hmdLeanRecenterEnabled in MyAvatar.h 2018-03-28 11:57:48 -07:00
amantley
95f1d0e4fa added get and set functions for the activate recenter variables 2018-03-28 10:33:00 -07:00
amantley
9f3b82a417 added the functions triggerVerticalRecenter,triggerHorizontalRecenter,and triggerRotationRecenter to MyAvatar.h, these allow java script calls to recenter the avatar on the fly 2018-03-27 18:21:14 -07:00
Dante Ruiz
f36a916fb6 revert comment change 2018-03-22 17:44:17 -07:00
Dante Ruiz
4d52caccde making some more requested changes 2018-03-22 17:39:22 -07:00
samcake
a896e9872c adressing the avatar vissibility switch 2018-03-14 17:09:23 -07:00
Dante Ruiz
00fa5cfd06 Merge branch 'master' of github.com:highfidelity/hifi into remap-keybaord 2018-03-13 10:08:00 -07:00
Alexia Mandeville
c5b8a2d06e Revert "Increasing speed on mousescroll - zooming in/out of avatar" 
This reverts commit 748507f1e3.
 2018-03-12 13:18:02 -07:00
Alexia Mandeville
6ddb91e593 Revert "Updating default mouse pitch/yaw input to be more stabilized" 
This reverts commit 2598be16f8.
 2018-03-12 13:17:48 -07:00
Alexia Mandeville
748507f1e3 Increasing speed on mousescroll - zooming in/out of avatar 2018-03-10 22:20:00 -08:00
Alexia Mandeville
2598be16f8 Updating default mouse pitch/yaw input to be more stabilized 2018-03-10 21:46:20 -08:00
samcake
10447bf10e Fix the fact that all avatars should cast shadows, not just MyAvatar. since this is always a SkeletonMOdel class let s just turn it on by default there 2018-03-09 13:04:04 -08:00
Dante Ruiz
c949b44f0c conforming to coding standards 2018-03-09 10:42:19 -08:00
Dante Ruiz
cfa85b5137 Merge branch 'master' of github.com:highfidelity/hifi into remap-keybaord 2018-03-09 09:37:08 -08:00
NissimHadar
d1b87b3116 Added missing avatar shadows. 2018-03-08 12:14:42 -08:00
Dante Ruiz
a70509233e making small changes 2018-03-07 08:25:27 -08:00
Dante Ruiz
69af12fbc7 chaning speeds 2018-03-06 15:47:01 -08:00
Dante Ruiz
fe363e7f2a changing keybaord mapping 2018-03-06 14:16:25 -08:00
SamGondelman
0fca56eef0 Revert "Merge pull request #12407 from NissimHadar/shadowControlsOffZvork" 
This reverts commit 3201d2ba21, reversing
changes made to c0f20900a0.
 2018-02-27 11:33:05 -08:00
John Conklin II
6316f33282
Merge pull request #12485 from dback2/avatarMotors 
Add dynamic mode for scripted avatar motor
 2018-02-26 11:03:30 -08:00
John Conklin II
3201d2ba21
Merge pull request #12407 from NissimHadar/shadowControlsOffZvork 
Shadow control for zones, models and shapes
 2018-02-26 10:13:40 -08:00
David Back
283b5724ba CR changes 2018-02-23 15:02:51 -08:00
David Back
da391564a8 CR changes 2018-02-23 15:01:29 -08:00
David Back
a418129bea simplify to just changing timescales 2018-02-23 15:00:23 -08:00
David Back
083e461eb0 Merge branch 'master' of https://github.com/highfidelity/hifi into avatarMotors 2018-02-22 17:20:49 -08:00
David Back
902672f85e add dynamic mode for scripted avatar motor 2018-02-22 17:20:36 -08:00
Nissim Hadar
bf4ba07b72 Added parameters to canCastShadow - still sucks. 2018-02-21 12:36:34 -08:00
Zach Fox
74655bde49 Fix skeletonmodelURLchanged signal 2018-02-21 12:12:20 -08:00
Nissim Hadar
4c1f22f84e Models and Avatar cast shadows (box doesn't, yet). 2018-02-16 14:01:33 -08:00
Nissim Hadar
194c7f4101 WIP - for review. 2018-02-16 09:28:15 -08:00
Bradley Austin Davis
33690e09b7
Merge pull request #12399 from samcake/blue 
Introducing group culling to avoid the avatar model to be partially culled
 2018-02-14 15:38:52 -08:00
samcake
1d3ae1b187 Work in progress to get the render items beeing tagged correctly for groupCulled 2018-02-13 17:50:01 -08:00
Dante Ruiz
45f09dde96 address tony's requests 2018-02-13 10:32:15 -08:00
Dante Ruiz
1a25332575 fix indenting 2018-02-12 10:59:25 -08:00
Dante Ruiz
3c84318918 fixing merge conflict 2018-02-12 10:57:55 -08:00
Dante Ruiz
d381beb213 cleaning up code 2018-02-12 10:53:42 -08:00
Dante Ruiz
5325b22b01 working on lambdas 2018-02-09 16:46:11 -08:00
Dante Ruiz
beb41495d5 save avatarUrl when setting new skeletonModelUrl 2018-02-09 09:35:24 -08:00
Dante Ruiz
e87067f93d fix variable naming and edge case 2018-02-05 15:31:37 -08:00
Dante Ruiz
d593e7107c fix merge conflict 2018-02-02 13:29:31 -08:00
Seth Alves
861497e907 Merge branch 'master' of github.com:highfidelity/hifi into cauterize-head-av-entities-1 2018-02-02 08:56:18 -08:00
Seth Alves
14d5029f4d only update cauterization of child entities when something relevant changes 2018-02-02 08:56:11 -08:00
Anthony J. Thibault
b23f98b311 Removal of hips offset shifting from AnimInverseKinematics node 
With the addition of the hips IK target, the hips offset shifting code is no longer necessary.
This PR should not effect any behavior, but it removes this unused code from the animation system.
 2018-01-31 17:56:33 -08:00
Seth Alves
64a46bf5df merge from upstream 2018-01-31 10:43:41 -08:00
MiladNazeri
3585bead96
Merge pull request #12037 from humbletim/Leopoly_Phase1_004_RayPick-Changes 
Leopoly_Phase1_004_RayPick-Changes
 2018-01-29 14:02:38 -08:00
Dante Ruiz
264aa7f4d2
Merge pull request #12191 from druiz17/entity-attachment-bookmark 
Bookmark avatar entities
 2018-01-29 12:55:35 -08:00
Seth Alves
98e0e663e7 Merge branch 'master' of github.com:highfidelity/hifi into cauterize-head-av-entities-1 2018-01-29 12:36:37 -08:00
Dante Ruiz
a670a0b9a2 Merge branch 'master' of github.com:highfidelity/hifi into entity-attachment-bookmark 2018-01-29 11:25:26 -08:00
Seth Alves
17ec79f182 add breaks in case statements that used to have returns 2018-01-26 10:36:16 -08:00
Sam Gateau
51dac04374 Introducing the tag in lieu of the vsisiblity mask 2018-01-26 02:59:43 -08:00
Seth Alves
b6f7d2eb89 print warnings if head position contains not-a-number 2018-01-25 15:15:59 -08:00
Dante Ruiz
2cbcc28bd4 only call init animGraph once 2018-01-24 10:44:04 -08:00
Seth Alves
1cbc2e31cf merge from upstream 2018-01-23 15:21:03 -08:00
Dante Ruiz
071f7d54d9 Merge branch 'master' of github.com:highfidelity/hifi into fix-camera-update 2018-01-23 14:44:26 -08:00
Dante Ruiz
6a03557801 don't override sensorToWorldMatrix 2018-01-23 14:44:10 -08:00
humbletim
65455e7b50 Merge remote-tracking branch 'upstream/master' into Leopoly_Phase1_004_RayPick-Changes 2018-01-23 14:57:33 -05:00
Brad Davis
8ae0b09ea2 Merge remote-tracking branch 'upstream/master' into android 2018-01-22 15:07:30 -08:00
Seth Alves
31c007d167 more backwards logic, added withViewVisibilityMask call in ItemKey 2018-01-18 14:15:30 -08:00
Seth Alves
fb974b0b9c attempt to straighten out use of view-visibility masks 2018-01-18 10:09:23 -08:00
Anthony J. Thibault
c5efcf5d6a Bug fix for cocked head after playing an input recording. 
I thought this was the cause of the Manuscript case 11454 but apparently not.
 2018-01-18 09:21:15 -08:00
Seth Alves
76ef3d7c7d pull from upstream 2018-01-18 07:01:50 -08:00
Brad Davis
cbb2d9d854 Merge remote-tracking branch 'upstream/master' into android 2018-01-17 17:51:39 -08:00
Dante Ruiz
eadd3b48bd bookmark avatar-entities-done 2018-01-17 15:42:07 -08:00
Dante Ruiz
8f22c719b3
Merge pull request #12099 from sethalves/run 
allow avatar walk-speed to be set from javascript
 2018-01-17 13:53:13 -08:00
Seth Alves
33c586de60
Merge pull request #12188 from hyperlogic/feature/small-anim-refactor 
Remove dangerous "Use Anim Pre and Post Rotations" menu item
 2018-01-17 13:41:51 -08:00
Bradley Austin Davis
9f6c2c3cdd Merge remote-tracking branch 'upstream/master' into android 2018-01-17 11:44:00 -08:00
Dante Ruiz
ebb09f4271 Merge branch 'master' of github.com:highfidelity/hifi into entity-attachment-bookmark 2018-01-17 11:04:46 -08:00
Dante Ruiz
3abb3d6fcc trying to add offset 2018-01-17 11:04:32 -08:00
Seth Alves
1e847cf32e Merge branch 'master' of github.com:highfidelity/hifi into run 2018-01-17 08:08:13 -08:00
Seth Alves
d3084dc0df defang 2018-01-17 07:11:27 -08:00
Anthony J. Thibault
51ea2632c0 Remove Avatar UseAnimPreAndPostRotations option. 
This should always be true and can lead to hard to diagnose bugs if it is ever set to false.
 2018-01-16 17:27:19 -08:00
Dante Ruiz
7707e68234 bookmarks add back avatar-entities 2018-01-16 15:37:03 -08:00
Brad Davis
58530c595a Pre-merge cleanup 2018-01-14 19:48:12 -08:00
Dante Ruiz
5b82c7bc41 fix merge conflict 2018-01-12 11:00:19 -08:00
Brad Davis
7579451c24 Merge remote-tracking branch 'upstream/master' into android 2018-01-11 23:31:45 -08:00
Seth Alves
e7a3d98ae5 don't draw head-descendent entities when in 1st-person camera mode 2018-01-11 19:34:54 -08:00
Dante Ruiz
96a97b5938 added model transform override 2018-01-11 16:41:45 -08:00
Seth Alves
c09f644612 Merge branch 'master' of github.com:highfidelity/hifi into run 2018-01-11 09:09:11 -08:00
Brad Davis
97593bc4d8 Fixing compiled resource access 2018-01-10 17:18:12 -08:00
Dante Ruiz
c4253f3b3b Merge branch 'master' of github.com:highfidelity/hifi into soft-entities 2018-01-09 15:31:38 -08:00
Seth Alves
d0ddbc0092 fix warning 2018-01-08 16:52:07 -08:00
Seth Alves
ad389e5072 make avatar walk-speed adjustable from js. add a tablet button to control walking vs running 2018-01-08 15:27:41 -08:00
Seth Alves
1c94c9c11d Merge branch 'master' of github.com:highfidelity/hifi into run 2018-01-08 12:27:42 -08:00
Seth Alves
f1c03b2d40 adjust RENDER_HEAD_CUTOFF_DISTANCE so that I don't see my head when I run 2018-01-08 12:27:35 -08:00
Anthony J. Thibault
61edd83987 Improve stability for HMD third person avatars 
Previously there was a hack where the sensor to world matrix was NOT updated in HMD mode if the camera was third person.
The reason the hack existed was to make third person camera less nauseating for users.
However this had a major drawbacks.
It led to avatar hip spasms when the user turned around in the tracked volume, while in third person camera.

To fix this issue properly, the hack which prevented updating the sensor to world matrix was removed, and now the third person camera is now computed in sensor space relative to the hmd.
 2018-01-08 11:26:29 -08:00
John Conklin II
d660bbf6e5
Merge pull request #12101 from hyperlogic/bug-fix/avatar-sit 
Bug fix for sit script.
 2018-01-08 09:59:17 -08:00
Seth Alves
f6fed444b0 Merge branch 'master' of github.com:highfidelity/hifi into run 2018-01-08 07:49:09 -08:00
Anthony J. Thibault
243dcb88ee Bug fix for sit script. 2018-01-05 16:20:44 -08:00
Seth Alves
3cd0ec3336 default run speed is faster, advanced movement on by default 2018-01-05 13:20:41 -08:00
Dante Ruiz
6fa3446c57 joints are being relayed to children 2018-01-02 13:54:13 -08:00
humbletim
a146b778f7 support additional .extraInfo for ray intersections 2017-12-21 12:35:13 -05:00
howard-stearns
d730b7b87b consistent goToUser behavior in PAL, and be able to go to flying user. 2017-12-15 17:00:54 -08:00
Anthony Thibault
f3fcac8e58
Merge pull request #11903 from Delanir/IPD8258 
8258 IPD Tertiary Task List: Changing to Smaller Avatar Does not Resize Tablet
 2017-12-15 15:37:27 -08:00
Daniela Fontes
46583a90be Change abs to fabsf and other corrections requested. 2017-12-09 00:14:36 +00:00
Anthony J. Thibault
542af47e9e Fix for hand controller avatar scaling. 
* Added getDomainMaxScale() and getDomainMinScale() to JS api.
* Updated scaleAvatar controller module to use this to prevent scaling past the limits.
* Made sure that getDomainMaxScale() getDomainMinScale() and getUnscaledEyeHeight are thread safe,
  so that they can be invoked on the script thread.
* Added signals to Model class that can be used to let observers know when the Rig has finished initializing it's skeleton.
  and also when the skeleton is no longer valid.  These hooks are used to cache the unscaled eye height of the avatar.
 2017-12-07 17:08:13 -08:00
Andrew Meadows
ed231fa4a1
Merge pull request #11894 from hyperlogic/bug-fix/flying 
Improvements to HMD flying
 2017-12-07 16:31:33 -08:00
Anthony J. Thibault
47b52238d9 code review feedback 2017-12-07 10:49:23 -08:00
Anthony J. Thibault
fbcecbfc89 Merge branch 'master' into feature/domain-limited-height 2017-12-07 10:01:33 -08:00
Daniela Fontes
9bc165d8b4 Changing to Smaller Avatar Resizes Tablet 2017-11-30 18:49:53 +00:00
Anthony J. Thibault
a4d70e89df hmd turn roll tuning 
* Tighten action motor timescale while flying. This should cause less drift as the user
  changes direction and should lead to more comfort and control.
* Hmd head roll is only enabled if you are forward or backward faster then 2 meters per
  second. This should prevent un-intentional turning/rolling when hovering or moving at
  slow speeds.
* Documented hmdRoll tuning parameters accessible from JavaScript.
* Removed roll feathering code, because it is non-linear and can perhaps induce nausea.
* Tuned default dead spot and turning speeds to match Eagle Flight's defaults.
 2017-11-28 17:20:26 -08:00
Anthony J. Thibault
7327b79ce3 WIP 2017-11-28 11:37:58 -08:00
Anthony J. Thibault
b3896f664d Made increaseScale and decreaseScale more responsive at limits 2017-11-22 14:45:52 -08:00
Anthony J. Thibault
9f54ce55f3 Change domain setting from min/max avatar scale to min/max avatar height 
* Domain settings version has been bumped from version 2.0 to 2.1
* Old domain settings for avatar scale will be auto-converted to avatar height
* Avatar code has been changed so that limitDomainScale() works with the new height limits
* Avatar getUnscaledEyeHeight() was added to C++.
* MyAvatar.getHeight() was added to JS.
 2017-11-21 13:25:47 -08:00
ZappoMan
b44ced4c21 Merge branch 'master' of https://github.com/highfidelity/hifi into entityItemCleanup 2017-11-20 17:19:18 -08:00
ZappoMan
04ee1adabd Merge branch 'master' of https://github.com/highfidelity/hifi into entityItemCleanup 2017-11-19 14:40:31 -08:00
Seth Alves
93fd2a6a6b clear garbage out of avatar-entity settings array before writing it to disk. when changing domains, re-rez avatar-entities after octree is cleared 2017-11-15 20:10:05 -08:00
luiscuenca
10f484c668 6944 Avatar scale is saved across domains 2017-11-09 12:21:23 -07:00
MissLiviRose
45e58b93e5 add skeleton scale change signal so scripts can detect scaling change 2017-11-08 14:23:49 -08:00
ZappoMan
b5199220ab cleanup SpatiallyNestable Velocity to match WorldVelocity naming 2017-11-02 17:07:53 -07:00
ZappoMan
afaad5fcd7 Merge branch 'master' of https://github.com/highfidelity/hifi into entityItemCleanup 2017-11-02 13:39:51 -07:00
ZappoMan
f63db42c0e migrate SpatiallyNestable::getOrientation to getWorldOrientation, remove redundant getRotation 2017-10-28 10:14:25 -07:00
ZappoMan
a7a0f03ede rename SpatiallyNestable::getPosition() to SpatiallyNestable::getWorldPosition() 2017-10-27 18:39:17 -07:00
luiscuenca
f0eab58ebd Bug 6719 fixed 2017-10-26 09:41:24 -07:00
Seth Alves
f2cb5d4aff clean-up concept of puffed queryAACube 2017-10-19 13:19:13 -07:00
Seth Alves
f1abb0cd55 don't send avatar-entity updates for queryCube-changes, because avatar-entities don't use them 2017-10-17 19:01:24 -07:00
Seth Alves
23f41457be Revert "Revert "fix importing of avatar entities"" 
This reverts commit 28a8b18060.
 2017-10-09 11:52:43 -07:00
Seth Alves
28a8b18060 Revert "fix importing of avatar entities" 2017-10-07 16:54:05 -07:00
Seth Alves
53a49272dc fix importing of avatar-entities 2017-10-05 11:43:19 -07:00
Andrew Meadows
171151b92a use new form of MovingEntitiesOperator ctor 2017-09-29 11:34:32 -07:00
Seth Alves
913d3c4d12 Merge pull request #11422 from hyperlogic/feature/ant-man2 
Secondary IPD fixes
 2017-09-26 11:53:45 -07:00
Anthony J. Thibault
09c61deda8 Fixes for Vive puck calibration 2017-09-20 15:41:49 -07:00
Cain Kilgore
796e9e7ab3 Fixed things 2017-09-20 23:23:30 +01:00
Anthony J. Thibault
0757f513af Merge branch 'master' into feature/ant-man 2017-09-18 11:36:39 -07:00
Anthony Thibault
c7fc45e0ae Merge pull request #11375 from hyperlogic/bug-fix/avatar-attachments-rendering 
Avatar Attachments now render correctly
 2017-09-15 13:28:00 -07:00
Anthony J. Thibault
3f6c88e77f Avatar Attachments now render correctly 
* moved Avatar::fixupModelsInScene off the newly created render thread back
  to the main thread.
* updated Avatar::postUpdate to take a scene pointer, necessary for
  Avatar::fixupModelsInScene
* updated developer/tests/avatarAttachementTest.js to account for recent
  changes in avatar attachment scale, commit 712aff7ad.
* updated initialization of anim graph to use Model::isLoaded() instead of
  Model::initWhenReady() to know when the model was completely loaded.
 2017-09-15 11:23:09 -07:00
Seth Alves
8a49edbecb code review 2017-09-15 10:08:35 -07:00
Cain Kilgore
67a5c75a0d Doesn't need to be here anymore 2017-09-15 06:08:22 +01:00
Cain Kilgore
c2e342ddac Gravity Implementation 2017-09-15 06:03:56 +01:00
Seth Alves
d89f2b77da rework ScriptEngine lifetimes using 'smart' pointers 2017-09-14 10:42:21 -07:00
Cain Kilgore
72ca62c4af Initial Commit - more to do. 2017-09-14 00:25:11 +01:00
Dante Ruiz
fec8482b69 Merge branch 'master' of github.com:highfidelity/hifi into feature/ant-man 2017-09-05 16:26:51 -07:00
Anthony J. Thibault
23ff1b9ead Fixes for scaling controller display 
Adds MyAvatar.sensorToWorldScaleChanged signal.
 2017-09-05 15:03:41 -07:00
Dante Ruiz
9f2bdce190 Merge pull request #11005 from Armads/WL21424 
WL21424 hide head attachments when head joint is hidden
 2017-09-05 13:04:14 -07:00
Anthony J. Thibault
a1b94fd9d2 Bug fixes for laser offset and avatar hold action 2017-08-31 17:26:00 -07:00
Anthony J. Thibault
c9cdaadeb5 Better scale support in SpatiallyNestable class. 
Previously avatar used SpatiallyNestable scale to keep track of model rendering scale.
It now uses a new member variable _modelScale instead. This is important because the
notion of "Avatar" space does NOT include scale, so this is now reflected correctly in
the SpatiallyNestable class.

Similarly, EntityItems no longer stuff dimensions into the SpatiallyNestable scale
field.  a new _dimensions member variable is used instead.  The SpatiallyNestable scale
field for entities should always be one.

Parent joints can now have scale if getAbsoluteJointScaleInObjectFrame() returns a non-zero scale.
This is used in the case of the faux SENSOR_TO_WORLD_MATRIX_INDEX joint.

Overlays now ignore the SpatiallyNestable scale, and render using only orientation, position and dimensions.

Added qDebug stream support for Transform class.
 2017-08-30 15:46:36 -07:00
Anthony J. Thibault
9cd8b6991e Merge branch 'master' into feature/ant-man 2017-08-30 08:58:55 -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
Anthony J. Thibault
5230b03f4f clang warning fixes 2017-08-28 10:35:03 -07:00
Anthony J. Thibault
573985c7c9 Merge branch 'master' into feature/ant-man 2017-08-28 09:27:04 -07:00
Anthony J. Thibault
3ac09b7716 Fix run blends and removed debug draws 2017-08-25 15:48:53 -07:00
Anthony J. Thibault
4f830cf1dc Calculate jump speed based on canonical jump height. 2017-08-25 15:34:51 -07:00
Anthony J. Thibault
e0ff7f5f40 Moved speed constants into AvatarConstants.h 2017-08-25 10:47:54 -07:00
Anthony J. Thibault
dd9ee28b18 Adjust avatar walking and flying speed based on sensor scale factor 2017-08-25 10:10:23 -07:00
Armads
b30562b9ce Adding checks to hide avatar attachments to other head and facial joints 2017-08-25 10:25:34 -04: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
Anthony J. Thibault
d62a0ea8ff Correct controller offsets with sensor scaling 2017-08-22 11:43:39 -07:00
Anthony J. Thibault
ffdb10681e Fix for laser rendering and positioning with sensor scale 2017-08-22 11:07:04 -07:00
Anthony J. Thibault
de2262968e Fix for CAMERA_RELATIVE controllers with sensor scale 2017-08-22 09:44:32 -07:00
Anthony J. Thibault
8e56404c40 Fixes for flying and rotation re-centering in wikiplanet 2017-08-21 17:42:25 -07:00