3669 commits

Author	SHA1	Message	Date
David Rowe	bc00bcd02c	For development testing, apply physics to the entity intersected	2017-08-12 16:59:28 +12:00
David Rowe	a5407398e7	Fix Group tool highlights not being cleared when switch to other tools	2017-08-12 16:21:55 +12:00
David Rowe	c281d5f94b	Highlight and color single entities with Color tool	2017-08-12 15:46:53 +12:00
David Rowe	541402b559	Distinguish properly between intersected and root entities	2017-08-12 14:56:22 +12:00
David Rowe	2bf0ea1dff	Fix display artifact that occurs when overlay dimension is 0	2017-08-11 22:31:04 +12:00
David Rowe	a96d9ab85b	Apply physics toggle button values	2017-08-11 22:11:34 +12:00
David Rowe	ee225e6a8d	Implement toggle buttons	2017-08-11 18:23:20 +12:00
David Rowe	401a00441a	Merge branch 'master' into vr-edit-a	2017-08-11 15:26:20 +12:00
David Rowe	c82a4d6d56	Layout mockup of Physics options	2017-08-11 13:15:07 +12:00
David Rowe	0b063926b6	Move image slider to Color options	2017-08-11 11:41:33 +12:00
David Rowe	821f5de3e3	Further reduce number of Entites.getEntityProperties() calls	2017-08-11 10:20:36 +12:00
David Rowe	c34344161e	Improve App object handling	2017-08-11 10:09:52 +12:00
David Rowe	37f57852da	Set hand highlight sphere size from grab radius	2017-08-11 09:56:47 +12:00
David Rowe	badd57c165	Tidying	2017-08-11 09:26:05 +12:00
Sam Gateau	79f3be1efe	Merge pull request #11021 from Zvork/fade2 ... Fade dissolve effect JUST AVATARS	2017-08-10 13:48:30 -07:00
howard-stearns	ca13d58b0b	blance and inventory stubs	2017-08-10 12:44:50 -07:00
David Rowe	6977c35b6e	Reduce number of Entities.getEntityProperties() calls	2017-08-10 22:17:46 +12:00
David Rowe	6d61c188f8	Tighten up grabbing created entity	2017-08-10 21:22:11 +12:00
David Rowe	20c7e17fb6	Tidy up logging	2017-08-10 21:13:40 +12:00
David Rowe	b58cac1c56	Tidying	2017-08-10 17:28:43 +12:00
David Rowe	4b3f7d6614	Reorient Tools menu and slightly adjust Create palette position	2017-08-10 16:46:39 +12:00
David Rowe	a6af6e0bff	Add extra color swatches for user tests	2017-08-10 16:27:19 +12:00
David Rowe	594d144210	Finesse sliders to produce values that fully got to 0.0 and 1.0	2017-08-10 15:45:05 +12:00
David Rowe	9442a667b4	Raise sliders on hover	2017-08-10 15:32:48 +12:00
David Rowe	cc64644946	Don't press sliders down when click on them	2017-08-10 15:02:19 +12:00
David Rowe	e1adb3a20e	Add image slider (for H, S, V or similar values)	2017-08-10 12:44:30 +12:00
Zach Fox	2d256a62a9	Fix marketplaces message passing	2017-08-09 17:04:36 -07:00
David Rowe	397527d3f3	Add image UI element	2017-08-10 10:23:13 +12:00
David Rowe	1aeaee8153	Rename slider to barSlider	2017-08-10 09:04:28 +12:00
Zach Fox	65f9b0052f	Working buy button	2017-08-09 13:59:21 -07:00
Howard Stearns	cc634a2d1b	Merge pull request #11148 from zfox23/commerce_singleSetting ... New commerce mode now depends on 1 setting; bugfixes; Tablet -> TAB key	2017-08-09 13:25:10 -07:00
howard-stearns	1cf81495ab	basic commerce infrastructure	2017-08-09 11:50:52 -07:00
Zach Fox	33fa8c4f86	Fix bugs and also change to single setting	2017-08-09 11:44:09 -07:00
Zach Fox	61526256bc	Remove personalized comment	2017-08-09 09:30:18 -07:00
David Rowe	1c2d3ced89	Add some further entities to the Create palette	2017-08-09 17:28:28 +12:00
David Rowe	c19ec58220	Halve hand highlight and grab sphere radius	2017-08-09 15:51:37 +12:00
David Rowe	938b09c1a4	Slider display per intersection value	2017-08-09 15:19:25 +12:00
David Rowe	3d4cec63cd	Calculate slider value from laser intersection	2017-08-09 14:36:17 +12:00
Zach Fox	9d60d5153f	Clarifying comment and turn setting off first	2017-08-08 18:00:17 -07:00
Zach Fox	4f85923517	Tons of fixes and improvements!	2017-08-08 17:58:41 -07:00
Zach Fox	b2c5a1f899	Fancy MutationObserver!	2017-08-08 17:12:06 -07:00
David Rowe	c79931106d	Add basic element of slider	2017-08-09 12:06:35 +12:00
David Rowe	28f9f9e4d0	Add a "Physics" button and panel	2017-08-09 11:02:33 +12:00
Zach Fox	871a5ff1ab	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_CheckoutQMLInvestigation	2017-08-08 15:53:22 -07:00
Zach Fox	69fc69cffb	Comment fix and overlay click fix	2017-08-08 15:52:59 -07:00
Andrew Meadows	71ba6ba10a	Merge pull request #10807 from jmo7/21356 ... 21356 - Reorder Edit.js	2017-08-08 15:15:37 -07:00
Zach Fox	7d26d2d88b	Switch and fix overlay clicks	2017-08-08 14:29:44 -07:00
David Rowe	22432671ca	Fix newly created entity not being grabbed	2017-08-09 09:26:33 +12:00
David Rowe	046ce353fd	Fix highlight overlay getting deleted	2017-08-08 21:56:01 +12:00
David Rowe	42284796a1	Remember swatch colors	2017-08-08 21:44:54 +12:00