344 commits

Author	SHA1	Message	Date
druiz17	6799b9ca13	fix stylus	2017-10-13 09:34:08 -07:00
druiz17	67944c40a1	Merge branch 'master' of github.com:highfidelity/hifi into fix-release-grab	2017-10-11 09:13:01 -07:00
Atlante45	6dd49f5c32	Merge branch 'stable' of https://github.com/highfidelity/hifi into new-master	2017-10-10 16:53:34 -07:00
Sam Gateau	f143c28625	Merge pull request #11542 from SamGondelman/bubbleBoy ... Move HUD and HUD overlay rendering out of display plugin	2017-10-10 14:26:20 -07:00
druiz17	e77ac9fd10	include release message	2017-10-10 13:47:33 -07:00
druiz17	013e15c9a2	made requested changes	2017-10-10 10:54:56 -07:00
druiz17	d0eb6a3ad0	remove comments	2017-10-10 09:45:41 -07:00
druiz17	003395b256	removing whitespace	2017-10-10 09:43:02 -07:00
druiz17	fc41155ce1	saving work	2017-10-10 09:17:01 -07:00
Thijs Wenker	77a36bf788	Merge pull request #10892 from ctrlaltdavid/vr-edit-a ... VR edit app	2017-10-07 02:19:00 +02:00
SamGondelman	7e6d5d9d98	merge with master	2017-10-06 14:57:08 -07:00
druiz17	3139f5ef2a	improve mouseHMD exit logic	2017-10-05 15:12:58 -07:00
druiz17	ba50fcc509	fix mouse dissapearing in desktop mode	2017-10-05 15:07:49 -07:00
druiz17	347645329e	fixing laser staying on in edit mode	2017-10-05 09:11:02 -07:00
David Rowe	b526ec0d93	Code review	2017-10-05 18:21:04 +13:00
David Rowe	63e7521711	Merge branch 'master' into vr-edit-a	2017-10-05 11:29:49 +13:00
Clément Brisset	74fd69ac2d	Merge pull request #11523 from Atlante45/new-master ... RC56 into Master	2017-10-04 15:17:52 -07:00
druiz17	9de1ca4e1a	allow farGrab module to run when stylus is visible	2017-10-04 15:04:27 -07:00
Brad Hefta-Gaub	a1979a2600	Merge branch 'master' into RC-56	2017-10-03 18:16:21 -07:00
druiz17	13feec89c2	remove update stylus	2017-10-03 16:12:37 -07:00
druiz17	ad9677f63e	fixing grabbing and tablet bugs	2017-10-03 16:11:51 -07:00
SamGondelman	fa838e4715	merge from master	2017-10-03 15:53:33 -07:00
druiz17	6b3d89d18f	fix hudlaser module	2017-10-03 14:13:37 -07:00
druiz17	33e9a71000	grab attachments	2017-10-03 12:51:51 -07:00
Howard Stearns	22f0ef33ed	Merge pull request #11496 from howard-stearns/certificate-properties ... Certificate properties	2017-10-03 10:06:48 -07:00
David Rowe	5145107f8c	2D overlays can no longer be lasered	2017-10-03 21:36:40 +13:00
David Rowe	a59d590111	ESLint	2017-10-03 13:33:20 +13:00
druiz17	8a0ecf4e6f	propertly determine is laser intersects with HUD UI	2017-10-02 16:46:43 -07:00
druiz17	20918641f4	saving work	2017-09-29 16:48:25 -07:00
Howard Stearns	73c8da99dc	Merge branch 'master' of https://github.com/highfidelity/hifi into certificate-properties	2017-09-29 16:46:43 -07:00
David Rowe	75365847a1	Merge branch 'master' into vr-edit-a	2017-09-30 09:30:38 +13:00
SamGondelman	b59ec07171	move hud rendering to render thread, still need to separate out hud overlays	2017-09-29 09:49:08 -07:00
Howard Stearns	d1350a03c2	working checkpoint, but with a lot of debug/development stuff	2017-09-28 17:06:07 -07:00
druiz17	1947f2ba99	remove update stylus	2017-09-28 13:23:28 -07:00
druiz17	3b05317db6	fixing grabbing and tablet bugs	2017-09-28 11:18:40 -07:00
Daniela	13eb7db462	Change teleport.js to update render state more frequently.	2017-09-28 16:12:20 +01:00
David Rowe	30c4a22441	Merge branch 'master' into vr-edit-a	2017-09-28 16:10:26 +13:00
Seth Alves	3016ce0a2b	Merge pull request #11470 from sethalves/fix-grab-vs-trigger ... set grabbable and other checkboxes correctly if userData is blank	2017-09-27 15:24:37 -07:00
druiz17	cea3c002dd	improving far rotate	2017-09-27 11:47:26 -07:00
Seth Alves	eb6c99456d	Merge branch 'master' of github.com:highfidelity/hifi into fix-grab-vs-trigger	2017-09-27 10:01:24 -07:00
David Rowe	6b3b2beae0	Merge branch 'master' into vr-edit-a	2017-09-27 15:34:52 +13:00
Seth Alves	ae42d56cd6	Merge pull request #11465 from hyperlogic/bug-fix/teleporter-near-scale ... Teleport.js: can now teleport small distances with small avatar scale	2017-09-26 19:05:14 -07:00
Seth Alves	ce3e5eb1a3	set grabbable and other checkboxes correctly if userData is blank or malformed. near-trigger blocks near-grab	2017-09-26 18:56:27 -07:00
Seth Alves	f384cde471	Merge pull request #11467 from sethalves/fix-near-trigger ... Fix near trigger	2017-09-26 17:27:05 -07:00
Seth Alves	8180acbffc	use same trigger test as in isReady	2017-09-26 16:29:22 -07:00
Seth Alves	a478506da3	Merge branch 'master' of github.com:highfidelity/hifi into fix-near-trigger	2017-09-26 15:52:22 -07:00
Seth Alves	644532dd59	only send startNearTrigger once	2017-09-26 15:17:23 -07:00
druiz17	5a1242a1ac	fix spelling error	2017-09-26 15:06:31 -07:00
druiz17	76c1fe688c	fix auto dropping	2017-09-26 14:52:01 -07:00
Anthony J. Thibault	a7cfb5d635	teleport.js: fix for TELEPORT_CANCEL_RANGE with large/small avatar scale	2017-09-26 14:21:25 -07:00
Anthony J. Thibault	c26d04dca1	Teleport.js: Fix message bugs, and made eslint clean ... * 'Hifi-Teleport-Ignore-Add' and 'Hifi-Teleport-Ignore-Remove' messages should now should work * 'Hifi-Teleport-Disabler' message should now work	2017-09-26 13:58:00 -07:00
Seth Alves	a871a6db1d	Merge pull request #11430 from sethalves/fix-parent-grab ... Fix parent grab	2017-09-26 13:00:16 -07:00
Seth Alves	81f74f9297	Merge pull request #11444 from druiz17/module-handcontrollerPointer ... Made handControllerPointer into modules in hope of preventing mouse cursor interference with tablet	2017-09-26 12:21:03 -07:00
druiz17	2cc8a55151	fix cloning equiping	2017-09-26 10:37:36 -07:00
druiz17	6332a53ee2	able to grab tablet in 3rd person	2017-09-25 16:36:29 -07:00
Seth Alves	5da5b24894	unmangle merge	2017-09-25 15:18:22 -07:00
David Rowe	428efa571e	Merge branch 'master' into vr-edit-a	2017-09-26 10:40:07 +13:00
druiz17	ec40df711d	fix tablet grabbing and eslint changes	2017-09-25 14:31:13 -07:00
druiz17	b1b31444f0	fix mouse visiblity	2017-09-25 11:34:18 -07:00
druiz17	dda20c1ef5	fixing merge conflict	2017-09-25 09:45:29 -07:00
Seth Alves	5741782f45	merge from upstream	2017-09-25 09:16:43 -07:00
Brad Hefta-Gaub	030da7d850	Merge pull request #11401 from druiz17/module-scale-entities ... ScaleEntity Module	2017-09-25 09:10:32 -07:00
Seth Alves	90954a4e4f	Merge branch 'master' of github.com:highfidelity/hifi into fix-parent-grab	2017-09-25 09:09:58 -07:00
Zach Fox	921ebc221e	Merge pull request #11431 from zfox23/contextOverlayInterface_fixEnabled ... Enable Inspection Mode for all; change Commerce setting name	2017-09-22 17:52:27 -07:00
druiz17	2c7b8cdb4f	fixing script issues	2017-09-22 16:26:41 -07:00
druiz17	28d8af0b44	Merge branch 'master' of github.com:highfidelity/hifi into module-handcontrollerPointer	2017-09-22 15:33:17 -07:00
druiz17	e965b7fff1	hand controller pointer	2017-09-22 15:32:40 -07:00
Zach Fox	0eafdeab14	Fix hover -> unhover overlay behavior	2017-09-22 13:32:11 -07:00
Zach Fox	bb9db3ef6d	Updates to behavior and shader appearance	2017-09-22 11:24:30 -07:00
David Rowe	e0658c7a2f	Merge branch 'master' into vr-edit-a	2017-09-22 15:18:14 +12:00
druiz17	53efe6bfb2	working on fix	2017-09-21 18:17:05 -07:00
Seth Alves	3c22c9ea3a	back out bad change	2017-09-21 11:39:14 -07:00
Seth Alves	24bfb3f3b9	oops	2017-09-21 11:16:00 -07:00
Seth Alves	363a2a3a7a	merge from upstream	2017-09-21 11:08:29 -07:00
Seth Alves	473db92a8e	fix some parent-grab bugs, re-enable adjusting equipped entities, don't trigger guns right when they are equipped	2017-09-21 11:07:47 -07:00
Seth Alves	61efaf7fc2	Merge pull request #11420 from druiz17/fix-parenting-overlay-module ... nearParentGrab module now sets the correct previous parent id when switching grabbed overlays from one hand to another	2017-09-21 09:44:07 -07:00
druiz17	65e0c99618	small change	2017-09-21 09:07:49 -07:00
druiz17	2d7d6f85ba	fixing merge conflicts	2017-09-21 09:04:13 -07:00
David Rowe	c05ccd2ed5	Merge branch 'master' into vr-edit-a	2017-09-21 14:08:16 +12:00
Anthony Thibault	03e278c5ae	Merge pull request #11416 from druiz17/stylus-pos ... Pull back the stylus position in hand.	2017-09-20 17:40:22 -07:00
druiz17	949c343604	fixing nearGrabParentModule switching grabbed overlays	2017-09-20 15:34:01 -07:00
druiz17	92f3dfe2ab	move the stylus back a bit	2017-09-20 14:23:43 -07:00
druiz17	c20c5ee2b5	fixed tablet grabbing issue	2017-09-20 14:10:10 -07:00
druiz17	2ce6dcf89d	fixing spelling error	2017-09-20 11:45:42 -07:00
druiz17	5d87036f32	make changes requests and slight fixes	2017-09-20 11:41:31 -07:00
druiz17	9c66a25d83	fixing and cleanup tablet inputs	2017-09-19 17:03:53 -07:00
druiz17	e2921661e9	scaling entities	2017-09-19 09:35:22 -07:00
David Rowe	c56fda88fa	Merge branch 'master' into vr-edit-a	2017-09-19 16:17:04 +12:00
Anthony J. Thibault	0757f513af	Merge branch 'master' into feature/ant-man	2017-09-18 11:36:39 -07:00
Seth Alves	095cd03ee2	Merge pull request #11380 from ctrlaltdavid/fix-controller-typos ... Fix typos in controller modules disabler	2017-09-16 11:13:15 -07:00
David Rowe	6c5a1c0460	Address laser and controller interactions with HUD overlays and tablet	2017-09-16 15:45:44 +12:00
David Rowe	18b71f0c0f	Fix typos in controller modules disabler	2017-09-16 15:34:53 +12:00
Seth Alves	0816a8af27	fix grab entity methods	2017-09-15 12:07:50 -07:00
Seth Alves	b67c571aaa	fix grab entity methods	2017-09-15 12:05:49 -07:00
Seth Alves	df80b7ecfa	stopNearTrigger, not end	2017-09-15 11:16:54 -07:00
Seth Alves	39e6605f6f	fix grab entity methods + jshint cleanups	2017-09-15 10:50:46 -07:00
Anthony J. Thibault	7c725756f1	IPD Fixes for controllerDispatcher and controllerModules	2017-09-14 10:36:05 -07:00
Anthony J. Thibault	9a9f4a0d24	Fix controllerModules with appropriate IPD scale changes	2017-09-13 18:23:54 -07:00
Anthony J. Thibault	8fb69a9867	Merge branch 'master' into feature/ant-man	2017-09-13 18:23:11 -07:00
druiz17	b3ff5c86f7	fixed secondary triggers and chest lid	2017-09-12 14:43:06 -07:00
druiz17	b634292261	fixing some small issues	2017-09-12 10:53:04 -07:00
druiz17	684aef23dc	Merge branch 'controller-dispatcher-1' of github.com:druiz17/hifi into controller-dispatcher-1	2017-09-11 15:08:37 -07:00
druiz17	a46e41607c	fixed teleport, added avatar scaling, allow laser to be used on tablet when stylus is shown	2017-09-11 15:07:14 -07:00
Seth Alves	9c098f1a0c	Merge branch 'controller-dispatcher-1' of github.com:druiz17/hifi into controller-dispatcher-1	2017-09-08 17:10:02 -07:00
druiz17	405d8c3afc	fixing cloning and laser	2017-09-08 17:07:27 -07:00
Seth Alves	a1ffc7abd0	distance from controller to object is sometimes decided by pickray	2017-09-08 17:04:09 -07:00
druiz17	e33012e522	laser on tablet update	2017-09-08 13:30:30 -07:00
druiz17	f0c12e50dd	some small bug fixes	2017-09-08 11:50:19 -07:00
druiz17	ef050a09f9	made requested changes and also allow entities/overlays to be grabbed by the grip button	2017-09-07 14:42:46 -07:00
druiz17	cc7a222374	fixing Hifi-Hand-Drop for equipEntity	2017-09-06 17:15:05 -07:00
druiz17	0d66bfca05	added far trigger	2017-09-06 14:58:04 -07:00
Dante Ruiz	cefa65de5e	some more small changes	2017-09-05 12:06:32 -07:00
Dante Ruiz	28694dcf8a	small change to contextOVerlays in farActionGrab	2017-09-05 11:46:06 -07:00
Dante Ruiz	3b357ad61e	finshed handControllerGrab refactoring	2017-09-01 17:07:26 -07:00
druiz17	2948061904	code cleanup	2017-08-31 22:30:30 -07:00
Dante Ruiz	7cf27c18d3	code cleanup and fix broken features	2017-08-31 18:06:55 -07:00
Dante Ruiz	47699d4439	fixed edit.js	2017-08-30 16:52:59 -07:00
Dante Ruiz	3960ec7d5a	finish main handControllerGrab refactoring	2017-08-30 15:20:03 -07:00
Dante Ruiz	ed52136fc5	finished equiping locked clone-able entities	2017-08-29 15:18:28 -07:00
Dante Ruiz	4b592687b7	finished webEntityLaserInput, now working on cloning	2017-08-28 17:35:34 -07:00
Dante Ruiz	0eceb7b382	unviersial web3d vs laser	2017-08-25 17:40:30 -07:00
Dante Ruiz	b3ffa7b6b4	Working laser vs tablet	2017-08-25 14:20:31 -07:00
Dante Ruiz	fa676aaadf	lasers on tablet working	2017-08-24 17:42:27 -07:00
Dante Ruiz	dbe8aa77d7	working on laser v tablet	2017-08-23 17:32:41 -07:00
Dante Ruiz	dc8d0c9604	disable far grab when on hud	2017-08-22 16:51:13 -07:00
Seth Alves	3082c357f9	cloning sort-of works... cloning an equipable doesn't	2017-08-15 17:54:04 -07:00
Seth Alves	4bfbab294d	near-trigger works?	2017-08-15 14:53:58 -07:00
Seth Alves	03977334a0	near-trigger works?	2017-08-15 14:50:39 -07:00
Seth Alves	3b61e8518f	near-trigger works? equip calls its entity methods now	2017-08-15 14:46:48 -07:00
Seth Alves	ddca25672f	trying to get near-triggering working	2017-08-15 14:14:28 -07:00
Seth Alves	1d24523be9	equip drop gesture works	2017-08-15 13:09:17 -07:00
Seth Alves	e6ac07d43d	equipping mostly works	2017-08-15 11:45:45 -07:00
Seth Alves	b2d7eefc97	equip highlight works now	2017-08-15 10:30:47 -07:00
Seth Alves	b52a406ff1	trying to get equipping working	2017-08-14 18:25:57 -07:00
Seth Alves	9015d69c71	fix pop at start of far-grab	2017-08-13 17:21:55 -07:00
Seth Alves	f10dc7cbd5	allow far to near-grab transition	2017-08-13 16:54:37 -07:00
Seth Alves	58b199e9f9	far-grab sort-of works	2017-08-13 15:54:03 -07:00
Seth Alves	c2861d29d2	trying to get highlighting to work	2017-08-13 13:49:17 -07:00
Seth Alves	327bc23b5c	get ready for highlighting	2017-08-13 11:41:12 -07:00
Seth Alves	ec93172676	far-search rays work, but nothing else about far-grab.	2017-08-12 17:27:48 -07:00
Seth Alves	9fb1835a26	grabbing overlays works, again	2017-08-12 12:38:36 -07:00
Seth Alves	7ae41064db	tablet stylus works again	2017-08-12 11:19:39 -07:00
Seth Alves	b4a54b017a	plugins occupy activity-slots and more than one plugin may run at a time, as long as their slots aren't in conflict	2017-08-11 12:15:41 -07:00
Seth Alves	0d0f147056	port action-near-grab to dispatcher	2017-08-09 17:48:35 -07:00