3483 commits

Author	SHA1	Message	Date
David Rowe	37c1060080	Fix button highlighting and clicking	2017-08-03 11:06:51 +12:00
David Rowe	25bbdba987	Add Tool menu options panels, in particular grouping buttons	2017-08-02 22:17:02 +12:00
David Rowe	83f580c514	Generalize Tool menu UI	2017-08-02 19:07:11 +12:00
David Rowe	fb1284ad61	Clear grouping selection when choose another tool	2017-08-02 16:12:49 +12:00
David Rowe	53d755d8da	Clear grouping selection when drop tool	2017-08-02 14:45:19 +12:00
David Rowe	26a14d0934	Swap button and tool icon colours to match grouping highlights	2017-08-02 14:41:42 +12:00
David Rowe	65e57a9262	Highlight grouping entities	2017-08-02 14:38:26 +12:00
David Rowe	c686cef4a0	Collect grouping data	2017-08-02 13:15:53 +12:00
David Rowe	7e1584a43e	Add grouping state	2017-08-02 12:27:02 +12:00
David Rowe	6d90b6d0fd	Simplify trigger click usage	2017-08-02 11:49:10 +12:00
David Rowe	a94b2b367b	Simplify grip click handling	2017-08-02 09:16:24 +12:00
David Rowe	12d911f290	Add "group" bool button and icon	2017-08-02 08:41:53 +12:00
David Rowe	f2cf2cab6e	Generalize tool selected	2017-08-01 16:02:04 +12:00
David Rowe	ca7c747c96	Create entities at hand position rather than in front of avatar	2017-08-01 11:46:22 +12:00
David Rowe	59dc5ec3b8	Refactor tool buttons	2017-08-01 10:20:55 +12:00
David Rowe	ab8bccf16b	Implement cloning action	2017-07-30 11:03:19 +12:00
David Rowe	48ee7a3b1a	Add icon for clone tool	2017-07-29 17:39:23 +12:00
David Rowe	18a9dad918	Add button for clone tool	2017-07-29 17:15:33 +12:00
David Rowe	676deb8a5c	Make grip naming consistent with trigger naming	2017-07-29 16:16:48 +12:00
David Rowe	1d500dd3aa	Use dominant hand setting and handle setting changes	2017-07-29 16:10:48 +12:00
David Rowe	30595c78a0	Fix button not unpressing when cursor moves off it	2017-07-29 14:51:58 +12:00
David Rowe	52a2538d73	Fix scale handles not displaying after delete entity	2017-07-29 14:41:58 +12:00
David Rowe	9f90960a12	Make grip press discard tool	2017-07-29 13:31:08 +12:00
David Rowe	f4b2e399ef	Fix multiple and malingering tool icons	2017-07-29 12:54:21 +12:00
David Rowe	c201e7b65a	Display placeholder for tool icon on dominant hand	2017-07-29 10:59:15 +12:00
David Rowe	2a654b3657	Merge branch 'master' into vr-edit-a	2017-07-29 08:34:58 +12:00
Andrew Meadows	d4e72df928	Merge pull request #10711 from burtsloane/midi ... Midi support for Entities	2017-07-28 10:51:43 -07:00
David Rowe	64f5fe4009	Make Create palette a separate object	2017-07-28 10:36:54 +12:00
David Rowe	9fe3a823ee	Fix unexpectedly deleting multiple entities	2017-07-28 09:35:29 +12:00
David Rowe	21c15120ba	Raise Tool menu up a little to accommodate wooden mannequin's hand	2017-07-28 09:24:15 +12:00
David Rowe	01f37b53e9	Fix non-dominant hand ciursor dot showing when it shouldn't	2017-07-28 09:20:21 +12:00
David Rowe	52bb4a0f77	Merge branch 'master' into vr-edit-a	2017-07-27 20:37:46 +12:00
Chris Collins	ef67029837	Merge pull request #10912 from amvmoody/21374 ... WL 21374: Allow lights/particles to be dragged by icon	2017-07-26 22:07:36 -07:00
David Rowe	86f33727eb	Add prototype Create palette	2017-07-27 16:53:15 +12:00
David Rowe	e8c5e1c2d5	Make the button move down when pressed	2017-07-27 16:05:32 +12:00
David Rowe	3b111b85ef	Move UI to hand	2017-07-27 15:56:42 +12:00
David Rowe	573a49853a	Tidying	2017-07-27 15:09:22 +12:00
David Rowe	136ea78873	Use overlays instead of entities	2017-07-27 13:47:35 +12:00
burtsloane	d4ae298a8d	Merge branch 'master' into midi	2017-07-26 13:59:07 -07:00
Burt Sloane	4f7243e444	Merge branch 'master' of https://github.com/burtsloane/hifi into midi	2017-07-26 13:30:57 -07:00
utkarshgautamnyu	71ddf1e7c1	Removed Compound Collision type	2017-07-26 10:20:17 -07:00
David Rowe	6203a1ad68	Wire up button to toggle scale-with-hands / scale-with-handles	2017-07-26 22:41:38 +12:00
David Rowe	d4b872d9e1	Detect button press	2017-07-26 22:30:52 +12:00
David Rowe	3566609173	Highlight button as it is hovered	2017-07-26 21:34:13 +12:00
David Rowe	52759be618	Don't transition laser length when start intersecting UI	2017-07-26 20:40:12 +12:00
David Rowe	8dceb3cc6c	Show laser dot on UI even if trigger isn't squeezed	2017-07-26 17:26:43 +12:00
David Rowe	194a82974b	Make laser dot a minimum size commensurate with near laser beam width	2017-07-26 15:53:34 +12:00
David Rowe	0f2176127e	Fix locations of dominant hand settings and update setup	2017-07-26 15:41:16 +12:00
David Rowe	bf69402219	Laser intersect but don't highlight non-editable entities	2017-07-26 15:31:54 +12:00
utkarshgautamnyu	65192aa620	added additional collision types to asset browser and new model dialog	2017-07-25 17:12:13 -07:00