57084 commits

This branch

This branch

All branches

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
Seth Alves	4a35ad105b	Merge pull request #10615 from amvmoody/21358 ... WL 21358 Create a Laser Pointer app	2017-07-10 14:21:54 -07:00
Chris Collins	24edbc5c43	Merge pull request #10934 from Atlante45/new-master ... Stable => Master	2017-07-10 13:46:36 -07:00
Atlante45	d28fc5603d	Merge branch 'stable'	2017-07-10 13:28:25 -07:00
Stephen Birarda	f6d0122550	Merge pull request #10791 from birarda/bug/adding-dead-upstream-agent ... don't add missing replicated node from kill packet	2017-07-10 12:53:21 -07:00
Chris Collins	a1a0e411ce	Merge pull request #10923 from highfidelity/RC-47 ... Beta Release 47 - Includes up to Developer Release 6825	2017-07-10 12:53:20 -07:00
druiz17	78ba2102f4	Merge pull request #10931 from druiz17/fix-goto-hmd-keyboard ... Fixed goto hmd keyboard not entering text	2017-07-10 12:50:01 -07:00
Seth Alves	d957b970dd	Merge pull request #10918 from misslivirose/feat-add-skeleton-changed-signal ... Add signal for avatar skeleton changing	2017-07-10 11:35:24 -07:00
Seth Alves	9b5dfc8d3a	Merge pull request #10929 from druiz17/luanch-crash-fix ... Fixed crash when launching interface from fresh install	2017-07-10 11:31:59 -07:00
Stephen Birarda	98ccfa80a2	don't add node missing from a replicated kill packet	2017-07-10 11:14:13 -07:00
Dante Ruiz	89a072cfee	fixed hmd keyboard for goto	2017-07-10 19:05:07 +01: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
Andrew Meadows	ab6f615f96	Merge pull request #10910 from Atlante45/fix/audio-mixer-crash ... Fix Audio Mixer crash	2017-07-10 09:55:44 -07:00
Dante Ruiz	cc86cda737	Merge branch 'master' of github.com:highfidelity/hifi into luanch-crash-fix	2017-07-10 17:49:20 +01:00
Dante Ruiz	75e1b265d5	comment out code that causes a crash on launch from fresh install	2017-07-10 17:48:53 +01:00
Andrew Meadows	96b88dccd7	Merge pull request #10913 from samcake/orange ... Introducing the Stages to the render::Scene, Better scene update phase and getting away from the singleton model	2017-07-10 09:46:09 -07:00
Sam Gateau	0c3755483b	adding assert or checks whenever getting a scene stage	2017-07-10 12:37:26 +02:00
Sam Gateau	4edea433ce	Rename the _pipeline into _shapePipeline in the render::Args	2017-07-10 12:16:53 +02:00
Brad Davis	ee1f6dfa42	More tweaks for improved script performance	2017-07-09 21:36:46 -07:00