3364 commits

Author	SHA1	Message	Date
David Rowe	3d69e240a9	Fix entity losing previous scale when resume direct scaling	2017-07-18 20:29:41 +12:00
David Rowe	485190456d	Update handles when scale	2017-07-18 20:29:02 +12:00
David Rowe	718d7a1120	Scale with handles first pass	2017-07-18 16:59:54 +12:00
David Rowe	74dccace6a	Grab handles state while scaling with handles	2017-07-17 21:57:32 +12:00
David Rowe	22422f3059	Scaling with handles state and transitions	2017-07-17 21:29:37 +12:00
David Rowe	cb894ccbcb	Display and hover sizing handles	2017-07-17 18:02:35 +12:00
David Rowe	1ad3041bae	Direct scaling	2017-07-17 15:33:39 +12:00
David Rowe	7b3956df28	Grabbing state	2017-07-17 12:05:36 +12:00
David Rowe	cb827d9e85	Idle, searching, and highlighting states	2017-07-17 11:10:50 +12:00
David Rowe	ae1b6e20f2	Clear out state code for rework	2017-07-17 09:20:38 +12:00
David Rowe	c422eaec11	Move laser functionality into Laser object	2017-07-14 18:12:13 +12:00
David Rowe	35e8e7762f	Move hand intersection into Hand object	2017-07-14 15:35:03 +12:00
David Rowe	2acb7335f1	Move hand functionality into new Hand object	2017-07-14 14:37:54 +12:00
David Rowe	0506f516d4	Rename Hand to Editor	2017-07-14 12:54:08 +12:00
David Rowe	85c5b8778a	Simplify left/right side value handling	2017-07-14 12:45:19 +12:00
David Rowe	ee21797fcd	Simplify scale-with-handles state handling	2017-07-14 12:22:21 +12:00
David Rowe	7933280d03	Clear highlights etc. when turn application off	2017-07-14 12:08:22 +12:00
David Rowe	ab6e278a48	Intersect and hover overlay handles with laser	2017-07-13 17:01:56 +12:00
David Rowe	9cbde6d99e	Hover intersected handle	2017-07-13 15:05:04 +12:00
David Rowe	e644aabaf7	Intersect overlays with hands	2017-07-13 15:04:25 +12:00
David Rowe	23ebb791e8	Fix don't scale with hands if scaling multiple entities with handles	2017-07-12 19:22:08 +12:00
David Rowe	1fc2d7ed1b	Display corner scale handles	2017-07-12 18:44:08 +12:00
David Rowe	972cf1a1be	Size handles to compensate for physical distance	2017-07-12 16:11:59 +12:00
David Rowe	2c3cd53f8d	Display face scale handles only for single entities	2017-07-12 15:30:13 +12:00
David Rowe	850b94220f	Display face scale handles	2017-07-12 15:22:44 +12:00
David Rowe	196f5a43b1	Don't scale with hands if scaling with handles	2017-07-12 12:18:59 +12:00
David Rowe	db37417ccd	Tidying	2017-07-12 11:15:55 +12:00
David Rowe	68cdc23530	Display selection bounding box for scaling with handles	2017-07-12 11:04:02 +12:00
David Rowe	657ac1aaeb	Fix enumeration of entity tree	2017-07-11 21:16:21 +12:00
David Rowe	3450d64bed	Hover with "scale" color if in scale-with-handles mode	2017-07-11 17:37:09 +12:00
David Rowe	ed3c0cdced	Use grip click to toggle scale-with-hands / scale-with-handles	2017-07-11 17:16:38 +12:00
David Rowe	283976fd87	Merge branch 'master' into vr-edit-a	2017-07-11 14:51:25 +12:00
Brad Hefta-Gaub	121cf76ee3	Merge pull request #10914 from sethalves/dont-think-during-mouse-move ... Dont think during mouse move	2017-07-10 10:36:03 -07:00
David Rowe	a447e07ba5	Merge branch 'master' into vr-edit-a	2017-07-08 12:33:55 +12:00
David Rowe	e8d8a5c0a2	Rotate entity selection while scaling	2017-07-08 12:27:48 +12:00
David Rowe	73c6414f93	Natural scale of entity selection with hands / lasers	2017-07-08 12:07:20 +12:00
Andrew Meadows	57842ce5a5	Merge pull request #10878 from mnafees/21355 ... CR for Job #21355 - Clean up and remove menu hotkeys	2017-07-07 14:01:21 -07:00
Zach Fox	e222753aac	Merge pull request #10911 from zfox23/PAL_adminFix2 ... Set admin status even if QML can't find user in PAL	2017-07-07 10:24:53 -07:00
Seth Alves	e4aa4823f9	Merge branch 'master' of github.com:highfidelity/hifi into dont-think-during-mouse-move	2017-07-07 08:51:38 -07:00
Zach Fox	ea77557e38	Correctly close PAL when switching domains	2017-07-07 08:09:19 -07:00
David Rowe	a35d5fe128	Different color highlight for about-to-scale	2017-07-07 15:49:52 +12:00
David Rowe	5da8fe19de	Fix highlights not moving when entities being moved by other hand	2017-07-07 15:10:07 +12:00
David Rowe	998d27d66d	Logic and stub for grab versus scale	2017-07-07 15:06:18 +12:00
David Rowe	0ba11ffdc9	Make each hand aware of other	2017-07-07 14:51:20 +12:00
David Rowe	cab2caaf27	Apply edit and highlight after calculating both hands' inputs	2017-07-07 14:45:49 +12:00
Zach Fox	8945b75cda	Merge pull request #10903 from zfox23/PAL_fixAdminColumn ... Ensure admins see PAL admin column	2017-07-06 13:38:10 -07:00
Zach Fox	a5c7324ec5	Ensure admins see PAL admin column	2017-07-06 12:15:44 -07:00
ZappoMan	c3c9df0cd0	restore old camera state	2017-07-06 10:41:46 -07:00
ZappoMan	10341af819	Merge branch 'master' of https://github.com/highfidelity/hifi into godview	2017-07-06 09:39:33 -07:00
David Rowe	c2159bc52a	Fix laser not disappearing when lose hand tracking	2017-07-06 16:44:58 +12:00