2133 commits

Author	SHA1	Message	Date
Dante Ruiz	58c1a2fb99	Merge branch 'master' into menuFix	2017-03-02 00:55:18 +00:00
David Kelly	45293ab130	Merge branch 'master' of https://github.com/highfidelity/hifi into dk/palVolumeSorting	2017-03-01 12:55:54 -07:00
David Kelly	efe44425a6	cr feedback, plus something I missed	2017-03-01 09:26:03 -07: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
Seth Alves	c2085ebb6e	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js	2017-02-28 13:33:51 -08:00
David Kelly	1fc57ce9a6	alan's feedback	2017-02-28 11:51:40 -07: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	d5714bfa6e	Merge branch 'master' into menuFix	2017-02-28 16:55:44 +00:00
Atlante45	38317a23c9	Keep orientation while seated	2017-02-27 17:33:26 -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	40fdc4ea41	Remove extra script	2017-02-27 16:38:57 -08:00
Atlante45	b82817e54c	Alternative sit script	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	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	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	53948b8547	Check other avatar, disable movement in edit mode	2017-02-27 16:38:54 -08:00
Atlante45	1dbc133f12	Add animation state handler to the script	2017-02-27 16:38:54 -08:00
Atlante45	9033242584	More sit script work	2017-02-27 16:38:54 -08:00
Atlante45	1b2120d7e1	Sit script first draft	2017-02-27 16:38:54 -08:00
Ryan Huffman	40b238c12e	Add new teleport seat model + beam	2017-02-27 16:38:53 -08:00
Ryan Huffman	c632884aac	Update teleport script to handle detecting seats	2017-02-27 16:38:53 -08:00
Ryan Huffman	9197819291	Cleanup teleport to make use of new TARGET	2017-02-27 16:38:53 -08:00
Ryan Huffman	b8c7905fa4	Cleanup some duplication of code in teleport.js	2017-02-27 16:38:53 -08:00
Dante Ruiz	21c15927cf	Homebutton dimension and position scales with tablet	2017-02-27 19:33:52 +00:00
Dante Ruiz	19110ecfee	Merge branch 'tablet-ui-edit-js' of github.com:sethalves/hifi into menuFix	2017-02-27 16:00:08 +00:00
Seth Alves	34c5d480c4	Merge branch 'tablet-ui-tablet-is-overlay' of github.com:sethalves/hifi into tablet-ui-edit-js	2017-02-27 06:35:50 -08:00
Seth Alves	1864975c51	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-tablet-is-overlay	2017-02-27 06:35:22 -08:00
Philip Rosedale	4925b3c47c	Merge pull request #9756 from ctrlaltdavid/21122 ... Point index finger and raise thumb if not touching controller	2017-02-25 14:59:48 -08:00
Seth Alves	6a7e04f052	Merge pull request #9733 from hyperlogic/bug-fix/script-engine-double-destroy ... Make Debug defaultScripts.js option less error prone.	2017-02-25 08:57:23 -08:00
David Kelly	baa7f81d79	Merge branch 'master' of https://github.com/highfidelity/hifi into dk/palVolumeSorting	2017-02-24 18:38:57 -08:00
David Rowe	0cc499b08b	Point index fingers and raise thumbs if not touching controls	2017-02-25 14:20:23 +13:00
Dante Ruiz	73c337efd0	Merge branch 'tablet-ui-edit-js' of github.com:sethalves/hifi into menuFix	2017-02-25 00:42:22 +00:00
Dante Ruiz	835b23832f	some modal clean up	2017-02-25 00:40:38 +00:00
David Rowe	a205d2a00c	Use animation for pointing index finger instead of setting joint angles	2017-02-25 11:36:06 +13:00
Seth Alves	fcd3c09404	Merge branch 'tablet-ui-tablet-is-overlay' of github.com:sethalves/hifi into tablet-ui-edit-js-tablet-as-overlay	2017-02-24 14:27:30 -08:00
Seth Alves	b2a35f45db	when tablet is an overlay, use the model-fbx from the distribution (local disk copy) rather than the one on s3	2017-02-24 13:04:43 -08:00
Seth Alves	eedc5c1647	don't allow tablet to get stuck to a hand when passing it back and forth between hands	2017-02-24 12:10:52 -08:00
Seth Alves	71ab6a1a84	fix a couple of problems related to grabbing tablet while edit.js is active ... Conflicts: scripts/system/controllers/handControllerGrab.js	2017-02-24 11:38:42 -08:00
Seth Alves	70060eb464	in 2d mode, clicks on tablet don't get used for other things ... Conflicts: scripts/system/libraries/entitySelectionTool.js	2017-02-24 11:37:04 -08:00
Seth Alves	73774a6590	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-tablet-is-overlay	2017-02-24 11:34:59 -08:00
Seth Alves	f208f5e2d1	fix a couple of problems related to grabbing tablet while edit.js is active	2017-02-24 11:34:10 -08:00