amantley
b9a2f19d30
made all the suggested corrections except the dropdown qml.
2018-10-18 16:39:50 -07:00
amantley
cd7af8b605
changed the name of sumuserheightsensorspace to averageuserheightSensorSpace
2018-10-17 08:51:40 -07:00
amantley
baeccebfb9
changed the transition times to make the sit longer and the stand shorter
2018-10-16 17:45:55 -07:00
amantley
02f499e9f7
Merge remote-tracking branch 'upstream/master' into squattyPottyFix
2018-10-16 16:56:10 -07:00
amantley
1764531822
removed hand azimuth changes, that fixed azimuth when hands go behind origin of MyAvatar, these changes will be in a separate pr
2018-10-16 16:31:55 -07:00
amantley
cf7dc49499
removed a commment and changed the sanity check to be a const instead of a magic number
2018-10-16 16:04:31 -07:00
amantley
952b112271
changed the transition times to make them shorter sit == 3sec stand == 1sec, also added failsafe for when the average height is above 5ft. this can recover from a missed transition to standing.
2018-10-16 15:10:26 -07:00
amantley
7d7fe8c089
removed some cruft
2018-10-15 18:12:27 -07:00
amantley
49b869c5e3
got rid of velocity count, now use 'away' to trigger when to start computing the sit stand state
2018-10-15 18:02:50 -07:00
amantley
9ec999e15e
added condition for start up in oculus that gets the correct starting height
2018-10-15 16:43:03 -07:00
amantley
ae3ae9ce9a
put in condition for away mode so that when you take the hmd off and put it back on the initial guess to your state is made again.
2018-10-15 09:52:34 -07:00
amantley
8e272d6dd2
added the correction code for when you are misslabeled as sitting while you are standing. It will now handle a sit down correctly. Also made the first approximation of state based on the average user height. This should use the user input of their height associated with their account
2018-10-15 08:43:25 -07:00
amantley
90c9e578c8
when you unlock the transitions you now start in stand state
2018-10-12 16:47:53 -07:00
amantley
ee830cdcb0
cleaned white space
2018-10-12 16:05:31 -07:00
amantley
7dd156ccdd
made the threshold for the spine angle larger to make auto transitions more robust
2018-10-12 15:00:15 -07:00
amantley
67afc86222
cleanup
2018-10-11 18:39:44 -07:00
amantley
f73d974ad7
added a lock state so you can lock sit or stand state, also made the
...
hand azimuth relative to the spine2 location in avatar space. This stops
the arms from behaving badly when the hands are in front of the chest
but behind the root position of the avatar
2018-10-11 15:14:33 -07:00
amantley
5faf26abd1
turned off shoulder rotation when we don't have hmd lean recentering on. this temporarily fixes the behavior of the shoulders in this mode. todo: use the spine2 position to determine azimuth of hands, then they will work in all conditions
2018-10-11 10:38:59 -07:00
amantley
c4187f0d60
Merge remote-tracking branch 'upstream/master' into squattyPottyFix
2018-10-08 17:07:55 -07:00
divya
91df342ae9
Merge pull request #14094 from wayne-chen/interstitialMerged
...
Merged interstitial page/redirect domain improvements
2018-10-08 10:32:29 -07:00
amantley
3517905435
added getter and setter for sitstandstatechange bool
2018-10-05 16:22:30 -07:00
Wayne Chen
f758438dcc
Merge pull request #9 from danteruiz/interstitialMerged
...
fix for failing to enter domain
2018-10-05 16:19:25 -07:00
Dante Ruiz
36c2cceb57
fix for failing to enter domain
2018-10-05 15:39:51 -07:00
amantley
96872f8412
moved all the state update for sit and stand to myavatar::update() also
...
made it so that sit horizontal reset is handled in non-cg recentering.
to do: revisit what should be sent for desired body in prephysics update
call
2018-10-05 14:55:43 -07:00
Andrew Meadows
c3478dc018
remove expired avatarEntities from their avatars
2018-10-05 13:48:35 -07:00
amantley
ad46b71966
before moving the step state counting to myavatar::update()
2018-10-05 13:04:14 -07:00
Wayne Chen
8abbd51bb1
removing unused variable
2018-10-04 23:11:27 -07:00
danteruiz
d285080197
remmoving some debug statements
2018-10-04 18:38:25 -07:00
amantley
cbe638bfdb
added flag for vertical recentering that is state change, snap, versus
...
the usual .5 second recentering
2018-10-04 18:17:27 -07:00
amantley
635300c6d5
changed pre physics to use cg for desired body when in cg mode
2018-10-04 18:05:05 -07:00
Dante Ruiz
5d011bafb2
small tweaks
2018-10-04 17:02:44 -07:00
Dante Ruiz
2a3b4a85c7
debugging
2018-10-04 15:57:05 -07:00
amantley
82f8c67436
put the mode in sensor space for cg
2018-10-04 15:37:01 -07:00
Dante Ruiz
651f37aceb
Merge branch 'interstitialMerged' of github.com:wayne-chen/hifi into interstitialMerged
2018-10-04 15:01:39 -07:00
Dante Ruiz
bda9735b5d
fix loading progress
2018-10-04 15:01:16 -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
John Conklin II
afe6d97b00
Merge pull request #14100 from danteruiz/soft-entities-updates
...
update soft entities and fix deadlock from qml.
2018-10-04 13:33:34 -07:00
divya
7aa715c383
Merge pull request #14141 from luiscuenca/transitFirstPacketFix
...
Fix avatars transit on domain enter
2018-10-04 13:08:59 -07:00
Dante Ruiz
613a6ab8cd
removing unneeded code
2018-10-04 12:18:18 -07:00
Wayne Chen
c785efec84
removing extraneous bool
2018-10-04 10:56:04 -07:00
Wayne Chen
0a7102b4d3
Merge branch 'master' of https://github.com/highfidelity/hifi into interstitialMerged
2018-10-04 08:59:26 -07:00
amantley
809ca0e512
vive hmd input is implemented. not using mode
2018-10-03 18:05:30 -07:00
luiscuenca
a05e493e06
Long distance avatars should not be new
2018-10-03 17:09:51 -07:00
luiscuenca
bb98457d09
Fix avatars transit on domain enter
2018-10-03 16:23:09 -07:00
Dante Ruiz
676293c880
trying another fix
2018-10-03 16:19:47 -07:00
Dante Ruiz
b46d2319b1
fix spelling error
2018-10-03 15:22:53 -07:00
Dante Ruiz
78268001c4
reverting logic change
2018-10-03 15:13:42 -07:00
Dante Ruiz
5734c24af4
another PR fix
2018-10-03 13:52:40 -07:00
sabrina-shanman
2ef85dfdba
Merge branch 'master' into stt_parenting2
2018-10-03 11:39:00 -07:00
John Conklin II
4805d3564a
Merge pull request #14075 from ctrlaltdavid/M18586
...
Teleport with play area
2018-10-03 11:02:33 -07:00
