51712 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
David Rowe	b9869264ba	Display avatar settings dialog in tablet	2017-03-02 13:16:23 +13:00
David Rowe	9f56d2f6f6	Make tablet general settings dialog naming more consistent with desktop	2017-03-02 12:30:36 +13:00
David Rowe	6fafc829e1	Merge branch 'menuFix' into tablet-ui	2017-03-02 09:28:35 +13:00
David Rowe	f60c2f8ec9	Merge branch 'tablet-ui-edit-js' into tablet-ui	2017-03-02 09:27:09 +13:00
Howard Stearns	8424f151bf	Merge pull request #9789 from davidkelly/dk/3313 ... Remember gain settings when pal is closed and reopened	2017-03-01 10:21:02 -08:00
David Kelly	efe44425a6	cr feedback, plus something I missed	2017-03-01 09:26:03 -07:00
Dante Ruiz	accff0a37a	Merge branch 'master' into menuFix	2017-03-01 16:05:58 +00:00
Dante Ruiz	e2479a78bd	Merge branch 'tablet-ui-edit-js' of github.com:sethalves/hifi into menuFix	2017-03-01 16:04:12 +00:00
David Kelly	678020fed6	now use it (plus a bit of cleanup)	2017-02-28 15:03:45 -07:00
Seth Alves	0d0c26ef64	Merge pull request #9759 from sethalves/voxel-paint-opti ... no bullet shape for collisionless polyvox	2017-02-28 13:54:44 -08:00
Seth Alves	319c5f69e7	Merge pull request #8 from druiz17/tablet-edit-js ... fixed combobox and pushOntoStack	2017-02-28 13:53:59 -08:00
David Kelly	c10b0389de	Add a getAvatarGain method to NodeList and UsersScriptingInterface	2017-02-28 14:45:34 -07:00
Dante Ruiz	16d3f22e77	remove uncommented code	2017-02-28 21:39:33 +00:00
Dante Ruiz	606d618fe8	Merge branch 'tablet-ui-edit-js' of github.com:sethalves/hifi into tablet-edit-js	2017-02-28 21:35:14 +00:00
Seth Alves	c2085ebb6e	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js	2017-02-28 13:33:51 -08:00
Dante Ruiz	f0f2b8c4da	fix comboBox and PushOntoStack	2017-02-28 21:30:25 +00:00
Andrew Meadows	c6730f7c58	Merge pull request #9745 from AndrewMeadows/faster-avatar-updates ... Faster avatar updates	2017-02-28 10:55:21 -08:00
Clément Brisset	7f9437dcc5	Merge pull request #9690 from Atlante45/feat/sit ... Add hips pinning / Sit script	2017-02-28 10:41:22 -08:00
Dante Ruiz	50471db376	Merge branch 'tablet-ui-edit-js' of github.com:sethalves/hifi into tablet-edit-js	2017-02-28 17:12:41 +00:00
Dante Ruiz	d5714bfa6e	Merge branch 'master' into menuFix	2017-02-28 16:55:44 +00:00
Seth Alves	6b230bad14	oops	2017-02-27 20:56:25 -08:00
Seth Alves	3b669089e4	Merge branch 'master' of github.com:highfidelity/hifi into voxel-paint-opti	2017-02-27 20:56:16 -08:00
Atlante45	e03368414e	CR	2017-02-27 18:57:44 -08:00
Atlante45	38317a23c9	Keep orientation while seated	2017-02-27 17:33:26 -08:00
Seth Alves	60101ac119	Merge pull request #9743 from sethalves/tablet-ui-tablet-is-overlay ... Tablet ui tablet is overlay	2017-02-27 17:14:29 -08:00
Seth Alves	117be16c31	pull from upstream	2017-02-27 16:48:23 -08:00
Atlante45	cd10b828dd	Store whether avatar is sitting in a setting	2017-02-27 16:38:57 -08:00
Atlante45	9ce10742ec	Move avatar not joint	2017-02-27 16:38:57 -08:00
Atlante45	40fdc4ea41	Remove extra script	2017-02-27 16:38:57 -08:00
Atlante45	2d8b71810e	remove hips swing	2017-02-27 16:38:57 -08:00
Andrew Meadows	6991970044	relax lower spine for head IK when sitting ... also: fix crash bug for bad parentJointIndex also: reduce limit leakage for IK rotation	2017-02-27 16:38:57 -08:00
Atlante45	d9e2b3a20d	Remove lower spine constrain while sitting, losen head	2017-02-27 16:38:56 -08:00
Atlante45	b82817e54c	Alternative sit script	2017-02-27 16:38:56 -08:00
Atlante45	fcc924ce8e	Add downward force on the hips to strech the spine.	2017-02-27 16:38:56 -08:00
Atlante45	36dc2dc49d	Compute spine length on skeleton load	2017-02-27 16:38:56 -08:00
Atlante45	e9316d30d0	More IK smoothing experimentation	2017-02-27 16:38:56 -08:00
Atlante45	834755588a	Reset sensors and body	2017-02-27 16:38:56 -08:00
Atlante45	68e3e23bfc	Remove Avatar parenting to chair	2017-02-27 16:38:56 -08:00
Atlante45	cbaaaa21c6	Use head orientation for sitting	2017-02-27 16:38:56 -08:00
Atlante45	0629c6dbf7	Cancel body pitch/roll when getting out of the chair.	2017-02-27 16:38:56 -08:00
Atlante45	e503542b6a	Fix transform computation	2017-02-27 16:38:55 -08:00
Atlante45	0440e2fd60	Set higher tolerance	2017-02-27 16:38:55 -08:00
Ryan Huffman	f5f7cc5266	Fix teleport seat beam color to match model	2017-02-27 16:38:55 -08:00
Ryan Huffman	aa94106229	Update teleport to sit in invisible seats	2017-02-27 16:38:55 -08:00
Atlante45	8c232b5abb	Initialize max offset to infinity	2017-02-27 16:38:55 -08:00
Atlante45	bf3a69a0b3	Add 2D UI when close to the seat	2017-02-27 16:38:55 -08:00
Atlante45	187cd0d5cf	Get IK error and stand up based on it	2017-02-27 16:38:55 -08:00
Atlante45	8e9fc83759	Fix sit anim reference	2017-02-27 16:38:55 -08:00
Atlante45	69ce0a383e	Add sitting animations	2017-02-27 16:38:54 -08:00
Atlante45	53948b8547	Check other avatar, disable movement in edit mode	2017-02-27 16:38:54 -08:00