6245 commits

Author	SHA1	Message	Date
David Back	e8068fea0a	block selecting overlays with other hand	2018-07-31 17:18:35 -07:00
David Back	ad9ec26781	print	2018-07-31 11:53:17 -07:00
David Back	7bf7663f09	Merge branch 'master' of https://github.com/highfidelity/hifi into editHandleTriggerValues	2018-07-31 11:51:26 -07:00
David Back	4a722a62f7	use click handler only, remove triggerClicked	2018-07-31 11:51:16 -07:00
Ryan Huffman	431cbf2694	Merge pull request #13699 from thoys/fix/create/triggerable ... MS16809: handle both triggerable and wantsTrigger in CreateApp	2018-07-31 10:34:31 -07:00
John Conklin II	8e277758ad	Merge pull request #13700 from danteruiz/fix-grabbing-problem ... Impove the way we checkForChildTooFarAway in nearParentGrabEntity.js	2018-07-31 09:46:57 -07:00
David Back	03f0116b79	Merge branch 'master' of https://github.com/highfidelity/hifi into editHandleTriggerValues	2018-07-31 09:28:14 -07:00
John Conklin II	bd2ab38bfe	Merge pull request #13701 from ElderOrb/FB16702 ... FB16702 - Avatar App does not save Animation JSON Override URL	2018-07-30 14:51:32 -07:00
John Conklin II	6d7116fad7	Merge pull request #13676 from thoys/fix/api/agent ... MS15184: Remove deprecated functions in Agent API	2018-07-30 14:48:10 -07:00
John Conklin II	200292c18e	Merge pull request #13675 from howard-stearns/forget-you ... pal refresh fixes	2018-07-30 14:38:24 -07:00
David Back	b420ef8cf2	fix trigger clicks on vive	2018-07-30 13:21:09 -07:00
David Back	bec54cc182	Merge branch 'master' of https://github.com/highfidelity/hifi into editHandleTriggerValues	2018-07-30 12:26:48 -07:00
Sam Gondelman	8201997a16	Merge pull request #13660 from SamGondelman/parabolic ... Parabolic Picking + Pointers	2018-07-30 10:49:02 -07:00
Thijs Wenker	d486a0721d	Merge pull request #13698 from dback2/resetPropertiesNoSelection ... Reset entity property fields when no selection	2018-07-30 19:37:12 +02:00
Dante Ruiz	0f46001f9a	remove redundent variable	2018-07-30 10:29:53 -07:00
Dante Ruiz	4caf613269	making requested changes	2018-07-30 10:19:27 -07:00
David Back	398c530214	Merge branch 'master' of https://github.com/highfidelity/hifi into editHandleTriggerValues	2018-07-30 10:18:19 -07:00
Dante Ruiz	cf6850de48	better stuff	2018-07-27 17:53:21 -07:00
Dante Ruiz	887a416656	Merge branch 'master' of github.com:highfidelity/hifi into fix-grabbing-problem	2018-07-27 17:50:12 -07:00
Dante Ruiz	6320401308	somewhat better distance from bounding box	2018-07-27 17:49:49 -07:00
SamGondelman	1ef54b2fe6	back to ray teleport	2018-07-27 14:58:56 -07:00
John Conklin II	fc88165e23	Merge pull request #13696 from SamGondelman/particleRot ... Particles don't spin with head roll, new spin + rotateWithEntity properties	2018-07-27 14:54:48 -07:00
Thijs Wenker	9dce1b64b6	Merge pull request #13695 from huffman/fix/create-focus-on-create ... Fix edit.js not being able to delete after creating entity	2018-07-27 22:43:34 +02:00
Dante Ruiz	30b4815bf9	Merge branch 'master' of github.com:highfidelity/hifi into fix-grabbing-problem	2018-07-27 13:13:10 -07:00
David Rowe	3bfdd3ff58	Maintain virtual and real world orientations when teleport	2018-07-27 15:18:40 +12:00
David Back	cd842afc1c	prevent both hands triggering same time, allow one to trigger after other	2018-07-26 17:52:25 -07:00
David Back	dcdf734114	remove unneeded	2018-07-26 16:43:07 -07:00
David Back	82e5d6ad29	use triggerClicks from controllers for edit handles	2018-07-26 16:38:25 -07:00
Alexander Ivash	29f7cab7df	FB16702 - Avatar App does not save Animation JSON Override URL ... note: PR also changes logic of 'hint' - previously it showed hard-coded senseless text, now - current value of 'animation URL'	2018-07-27 02:08:44 +03:00
Dante Ruiz	74bb2301b0	minimize diff	2018-07-26 16:05:56 -07:00
Dante Ruiz	31d31af941	minimize diff	2018-07-26 16:05:18 -07:00
David Back	ff6ed971d8	comments, re-org, submesh number	2018-07-26 15:40:27 -07:00
Dante Ruiz	02232daa58	Merge branch 'master' of github.com:highfidelity/hifi into fix-grabbing-problem	2018-07-26 15:26:24 -07:00
Dante Ruiz	6edd109dfe	revert back to the old way we checkForChildTooFarAway	2018-07-26 15:23:54 -07:00
SamGondelman	74b3143bc3	remove scaling from teleport script	2018-07-26 12:23:14 -07:00
howard-stearns	699d1647ca	typo, and more conservative item limit	2018-07-26 12:01:56 -07:00
howard-stearns	9b61e8c4ad	Merge branch 'master' of github.com:highfidelity/hifi into forget-you	2018-07-26 11:50:15 -07:00
SamGondelman	1c1b68ee66	emitterShouldTrail fix, review comments, rotateWithEntity	2018-07-26 11:41:16 -07:00
Thijs Wenker	6e23caca0d	handle both wantsTrigger and triggerable in CreateApp	2018-07-26 20:25:42 +02:00
David Back	cb8e9f218b	reset all property fields when no selection	2018-07-26 11:23:28 -07:00
Zach Fox	cc921ed9c4	Merge pull request #13685 from zfox23/MS16820_rateLimitPolaroids ... Fix MS16820: Rate limit Snapshot Polaroids	2018-07-25 15:45:51 -07:00
SamGondelman	9b41cb5554	improve model picking performance, scale parabola v/a with avatar, improve followNormal behavior, turn off followNormal on teleport, remove 1 m no teleport spot	2018-07-25 15:19:25 -07:00
Ryan Huffman	0e0966004c	Fix edit.js not being able to delete after creating entity ... This fix puts focus back on the main window when creating an entity so that the user can use shortcuts like 'f' and 'delete'	2018-07-25 14:52:56 -07:00
Sam Gondelman	2aeef2e016	min spinSpread is 0	2018-07-25 09:40:52 -07:00
Sam Gondelman	b4cc9c8004	typo	2018-07-25 09:36:43 -07:00
SamGondelman	4750611af9	particles don't spin with head roll, add particle spin properties, negative emitSpeed	2018-07-24 23:47:58 -07:00
Zach Fox	04754d0dab	Fix MS16820: Rate limit Snapshot Polaroids	2018-07-24 15:28:37 -07:00
Alexander Ivash	6db46e84ff	FB17036 Avatar App causes error on cache reload (CTRL+R)	2018-07-25 01:11:26 +03:00
SamGondelman	fbcddf1445	test gradual normal interpolation	2018-07-24 14:15:49 -07:00
Thijs Wenker	b7d12c6b1c	Merge pull request #13656 from huffman/fix/create-selection-box ... Fix the Create selection box not always matching outline	2018-07-24 19:49:20 +02:00