632 commits

Author	SHA1	Message	Date
Seth Alves	c2085ebb6e	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js	2017-02-28 13:33:51 -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
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
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
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
David Rowe	0cc499b08b	Point index fingers and raise thumbs if not touching controls	2017-02-25 14:20:23 +13: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	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	f208f5e2d1	fix a couple of problems related to grabbing tablet while edit.js is active	2017-02-24 11:34:10 -08:00
Seth Alves	e43c4c17f5	in 2d mode, clicks on tablet don't get used for other things	2017-02-23 21:27:25 -08:00
Seth Alves	ce717d04e9	merge in tablet-as-overlay code	2017-02-23 18:40:20 -08:00
Seth Alves	610c20e01a	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js	2017-02-23 17:41:38 -08:00
Seth Alves	b4be942348	trying to get tablet overlay to show up in the right place	2017-02-22 19:18:03 -08:00
Seth Alves	273f0130f3	fix sphere vs box check for grabbing overlays. fix newly introduced equipping bug.	2017-02-22 17:43:09 -08:00
Seth Alves	bfc4853947	make overlays near-grabbable. make tablet be an overlay	2017-02-22 16:50:02 -08:00
Seth Alves	aed1d69377	don't do a haptic pulse when av's hand goes near grabbable tablet	2017-02-22 14:14:10 -08:00
Seth Alves	92580a977b	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js	2017-02-20 13:54:12 -08:00
Philip Rosedale	5c782deb4d	Merge pull request #9701 from ctrlaltdavid/21175 ... Fix laser beam jumping upon grabbing entity	2017-02-20 13:37:11 -08:00
Seth Alves	43f47c1106	merge from upstream	2017-02-20 12:45:39 -08:00
David Rowe	6827a28807	Fix grab position	2017-02-18 16:36:14 +13:00
David Rowe	692fa52aca	Disable drawing pointer lasers while painting	2017-02-18 15:21:48 +13:00
David Rowe	2c5782e4bb	Fix laser beam jumping upon grabbing entity	2017-02-18 09:11:04 +13:00
David Rowe	7b36669d80	Point index finger while painting if tablet not displayed	2017-02-17 19:30:40 +13:00
Seth Alves	3ea0f6d2d2	allow lasers to scroll tablet while in edit-mode	2017-02-15 11:34:48 -08:00
Seth Alves	219e569014	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js	2017-02-15 07:25:39 -08:00
Philip Rosedale	01bdac49d0	Merge pull request #9672 from ctrlaltdavid/21121 ... Fix far grabbing making entity jump upon grab	2017-02-14 17:02:42 -08:00
Seth Alves	3a23ec86d5	handles etc work better	2017-02-14 13:57:48 -08:00
Seth Alves	d40402faae	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js	2017-02-14 06:53:34 -08:00
David Rowe	2672b8d10a	Fix tabs	2017-02-14 17:30:56 +13:00
David Rowe	61f8631a2b	Fix far grabbing making entity jump upon grab	2017-02-14 17:30:20 +13:00
Atlante45	512bb4765f	Add entity clicks capture capabilities	2017-02-13 11:34:30 -08:00
Seth Alves	44aa3e044b	make it so near grabbing while edit is active doesn't select a new entity	2017-02-10 16:56:53 -08:00
Philip Rosedale	e94e41698e	remove debug	2017-02-08 18:04:55 -08:00
Philip Rosedale	dc957d09d8	remove comment	2017-02-08 15:45:29 -08:00
Philip Rosedale	fe92d38b60	Fixed scaling of self	2017-02-08 15:42:10 -08:00
Seth Alves	47976406fc	Merge pull request #9607 from hyperlogic/bug-fix/better-haptics ... More consistent haptics on web overlays and entities	2017-02-08 05:47:05 -08:00
Anthony J. Thibault	244437d971	set WANT_DEBUG_STATE back to false	2017-02-07 23:50:06 -08:00
Anthony J. Thibault	6738c0eade	More consistent haptics on web overlays and entities	2017-02-03 12:05:30 -08:00
Dante Ruiz	2a3d0b6b17	enforce more button clicking logic	2017-02-03 19:13:57 +00:00
Chris Collins	bac5bd5c0e	Merge pull request #9595 from hyperlogic/bug-fix/tablet-ui-bugfixes ... tablet-ui: Bug fixes	2017-02-02 17:53:47 -08:00
Anthony J. Thibault	6bef9e888b	Merge branch 'master' into bug-fix/tablet-ui-no-domain	2017-02-02 17:21:20 -08:00
Dante Ruiz	0ec8071288	better scrolling and fixed button touching	2017-02-02 23:16:39 +00:00