2047 commits

Author	SHA1	Message	Date
amantley	c4187f0d60	Merge remote-tracking branch 'upstream/master' into squattyPottyFix	2018-10-08 17:07:55 -07:00
amantley	3517905435	added getter and setter for sitstandstatechange bool	2018-10-05 16:22:30 -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
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
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