4125 commits

Author	SHA1	Message	Date
David Rowe	76889d1b67	Improve handle scaling of entity with near-zero dimension	2017-09-27 12:04:05 +13:00
David Rowe	0f5adb488c	Merge branch 'vr-edit-footer' into vr-edit-a ... # Conflicts: # scripts/vr-edit/modules/toolsMenu.js	2017-09-27 10:04:31 +13:00
David Rowe	8bd0e464aa	Merge branch 'vr-edit-group-box' into vr-edit-a	2017-09-27 08:48:44 +13:00
David Rowe	9b7197cf3f	Don't highlight entity you're inside unless you laser it	2017-09-26 15:36:40 +13:00
David Rowe	d64e3aca55	Polyvoxels don't have a color property	2017-09-26 11:10:05 +13:00
David Rowe	428efa571e	Merge branch 'master' into vr-edit-a	2017-09-26 10:40:07 +13:00
Brad Hefta-Gaub	030da7d850	Merge pull request #11401 from druiz17/module-scale-entities ... ScaleEntity Module	2017-09-25 09:10:32 -07:00
Andrew Meadows	cf0dd6f8c3	Merge pull request #11371 from cain-kilgore/21542 ... WL 21542 - Allow Scripts to change Avatar Gravity [Experimental]	2017-09-23 22:20:52 -07:00
David Rowe	bbc6e5d1b5	Fix bounding box isn't cleared when exit tool with header or grip click	2017-09-24 17:06:42 +13:00
David Rowe	4e0efdaa1a	Automatically add entities in bounding box to currently selected groups	2017-09-24 16:55:15 +13:00
David Rowe	2afc84cf0b	Display bounding box of currently selected groups	2017-09-24 12:06:04 +13:00
David Rowe	8976befaeb	Use emissive FBX model for highlighted Tools menu header	2017-09-23 14:20:53 +12:00
David Rowe	64acc0d0a3	Press undo/redo and menu buttons when click them	2017-09-23 13:01:38 +12:00
Zach Fox	921ebc221e	Merge pull request #11431 from zfox23/contextOverlayInterface_fixEnabled ... Enable Inspection Mode for all; change Commerce setting name	2017-09-22 17:52:27 -07:00
David Rowe	bc5cd7415b	Use emissive FBX models for header bars	2017-09-23 11:56:42 +12:00
David Rowe	f53f8c14fc	Update wrist tool icon	2017-09-23 11:34:57 +12:00
Zach Fox	0eafdeab14	Fix hover -> unhover overlay behavior	2017-09-22 13:32:11 -07:00
Zach Fox	bb9db3ef6d	Updates to behavior and shader appearance	2017-09-22 11:24:30 -07:00
David Rowe	edd6310a07	Move undo/redo buttons to footer area and make persistent	2017-09-22 21:46:33 +12:00
David Rowe	ca000acf2a	Add space for a footer to put undo/redo buttons in	2017-09-22 17:40:34 +12:00
David Rowe	e0658c7a2f	Merge branch 'master' into vr-edit-a	2017-09-22 15:18:14 +12:00
David Rowe	959d497079	Change group tool's "Cancel" button to "Clear"	2017-09-22 12:00:12 +12:00
David Rowe	e4a126461b	Add extra Create palette items	2017-09-22 10:53:06 +12:00
David Rowe	a757012c10	Change default color to 100% white	2017-09-22 08:17:35 +12:00
Zach Fox	57b5a23373	Enable Inspection Mode for all; change Commerce setting name	2017-09-21 11:18:21 -07:00
Seth Alves	61efaf7fc2	Merge pull request #11420 from druiz17/fix-parenting-overlay-module ... nearParentGrab module now sets the correct previous parent id when switching grabbed overlays from one hand to another	2017-09-21 09:44:07 -07:00
druiz17	65e0c99618	small change	2017-09-21 09:07:49 -07:00
druiz17	2d7d6f85ba	fixing merge conflicts	2017-09-21 09:04:13 -07:00
David Rowe	f58b2a3bed	Add group selection logic	2017-09-21 21:59:19 +12:00
David Rowe	2f9a314aa9	Implement group selection box button states	2017-09-21 19:07:13 +12:00
David Rowe	a56a155cc3	Add group selection box buttons	2017-09-21 17:31:32 +12:00
David Rowe	906595e4fa	Automatically return to Tools menu after grouping or ungrouping	2017-09-21 16:15:06 +12:00
David Rowe	c05ccd2ed5	Merge branch 'master' into vr-edit-a	2017-09-21 14:08:16 +12:00
Anthony Thibault	03e278c5ae	Merge pull request #11416 from druiz17/stylus-pos ... Pull back the stylus position in hand.	2017-09-20 17:40:22 -07:00
druiz17	2c55419c60	change tablet forward offset	2017-09-20 16:49:45 -07:00
Seth Alves	90c97319ea	Merge pull request #11408 from druiz17/fix-tablet-input ... fixing/improving and cleanup tablet inputs	2017-09-20 16:36:07 -07:00
druiz17	949c343604	fixing nearGrabParentModule switching grabbed overlays	2017-09-20 15:34:01 -07:00
Cain Kilgore	a4655b9c73	Merge branch 'master' of https://github.com/highfidelity/hifi into 21542	2017-09-20 23:25:26 +01:00
Cain Kilgore	796e9e7ab3	Fixed things	2017-09-20 23:23:30 +01:00
Thijs Wenker	7ea1968b33	Tip, Code Writer which comes standard with Windows 10, does enter tabs by default when using the tab key. >=)	2017-09-20 14:59:15 -07:00
Thijs Wenker	60a566768a	removed debug spam from makeUserConnection, to reactivate it set Settings.setValue('MAKE_USER_CONNECTION_DEBUG', true); and reload the script	2017-09-20 14:39:13 -07:00
druiz17	92f3dfe2ab	move the stylus back a bit	2017-09-20 14:23:43 -07:00
druiz17	c20c5ee2b5	fixed tablet grabbing issue	2017-09-20 14:10:10 -07:00
druiz17	2ce6dcf89d	fixing spelling error	2017-09-20 11:45:42 -07:00
druiz17	5d87036f32	make changes requests and slight fixes	2017-09-20 11:41:31 -07:00
druiz17	e78d8bc132	tablet on wiki planet	2017-09-20 09:11:06 -07:00
druiz17	9c66a25d83	fixing and cleanup tablet inputs	2017-09-19 17:03:53 -07:00
David Rowe	41647305ed	Rename selection manager object to avoid name clash with new API object	2017-09-20 11:11:18 +12:00
druiz17	e2921661e9	scaling entities	2017-09-19 09:35:22 -07:00
David Rowe	c56fda88fa	Merge branch 'master' into vr-edit-a	2017-09-19 16:17:04 +12:00