5982 commits

Author	SHA1	Message	Date
Shannon Romano	895619c71f	Merge pull request #16461 from ctrlaltdavid/DEV-2649 ... DEV-2649: Fix entities list "filter to frustum" eye button	2019-11-08 10:28:24 -08:00
Shannon Romano	79df071c23	Merge pull request #16468 from RebeccaStankus/webEntities ... Made web entities not grabbable by default	2019-11-08 10:27:44 -08:00
Sabrina Shanman	9180a639df	Merge pull request #16440 from ctrlaltdavid/DEV-2648 ... DEV-2648: Fix Cmd-click multi-select in entity list on Mac	2019-11-07 14:06:39 -08:00
Sabrina Shanman	deceb16a9b	Merge pull request #16451 from ctrlaltdavid/DEV-2650 ... DEV-2650: Remove "user" icon from Entities List	2019-11-07 13:59:28 -08:00
Rebecca Stankus	4173cc46e2	Made web entities not grabbable by default	2019-11-06 14:11:17 -08:00
Zach Fox	a2f784d225	DEV-2695: Update Zone Haze floor and ceiling mins and maxes in the UI	2019-11-06 11:26:10 -08:00
David Rowe	eeceec35d6	Fix entities list "filter to frustum" button	2019-11-06 12:22:45 +13:00
David Rowe	a8173e9477	Remove "user" icon from Entity List	2019-11-05 13:55:31 +13:00
David Rowe	4e12750255	Typo	2019-11-02 11:00:16 +13:00
David Rowe	3bb65edafb	Fix Cmd-click multi-select in entity list on Mac	2019-11-02 09:51:21 +13:00
luiscuenca	63c2b41929	Restate legacy first person camera mode	2019-10-17 13:26:42 -07:00
dooglifeSF	589d4e992c	Change away anim to hosted afk_texting animation.	2019-10-14 16:48:45 -07:00
Zach Fox	3f00c524fb	DEV-2379: Modify Shadow-related tooltips in Create	2019-10-10 11:47:40 -07:00
RebeccaStankus	092424569d	Added flag to ensure mouse event signals are not connected twice	2019-10-08 12:01:47 -07:00
dante ruiz	fe2a4c3600	fix fix-snap-html-issue	2019-09-19 18:20:08 -07:00
Ryan Huffman	609b533cf2	Fix create duplication key conflicting with camera orbit	2019-08-06 17:23:13 -07:00
Shannon Romano	b799abdac1	Merge pull request #15967 from sabrina-shanman/picks_too-many_grab-enabled ... (BUGZ-955) Disable unnecessary picking (conservative subset)	2019-07-23 14:57:19 -07:00
sabrina-shanman	d48c8d897c	Clarify that a Grabber member function toggles both picks and pointers	2019-07-23 12:58:07 -07:00
sabrina-shanman	abac1787a6	Fix using invalid pick API functions on HMD ray pointer	2019-07-23 12:58:07 -07:00
sabrina-shanman	79d09f68fd	Disable grab.js picks when in HMD	2019-07-23 12:58:07 -07:00
Ryan Huffman	8b2c935f92	Merge pull request #15921 from ctrlaltdavid/ctrl-duplicate ... Make Create app use Ctrl key to duplicate entities instead of Alt	2019-07-23 08:52:22 -07:00
Simon Walton	8fb28bf4e8	Whitespace changes per code review	2019-07-22 10:36:57 -07:00
Simon Walton	63c3452cf2	Restore avatar theft functionality; banner-click to appropriate menu	2019-07-19 16:35:07 -07:00
sabrina-shanman	fcaa64b9ef	Fix teleport collision picks always enabled if user never enters HMD	2019-07-16 17:46:59 -07:00
sabrina-shanman	e043d181cd	Disable picks in controllerDispatcher when not in HMD	2019-07-16 17:46:54 -07:00
Shannon Romano	53a67dcfa9	Merge pull request #15872 from SamGondelman/bias ... DEV-202: Expose shadow bias and max distance to Zone Entity	2019-07-16 15:22:37 -07:00
PrestonB1123	526b210fcd	remembered that macs exist	2019-07-12 12:39:58 -07:00
PrestonB1123	aaf10cec39	added conditionals to shortcuts to remove overlap	2019-07-12 12:37:40 -07:00
David Rowe	f2d591dbe9	Take no action if Alt is pressed at mouse-down	2019-07-12 21:28:44 +12:00
David Rowe	db1137fa0f	Use Ctrl to duplicate entities instead of Alt	2019-07-12 21:27:33 +12:00
PrestonB1123	07c71cbadb	disabled P shortcut and re-enabled in metaverse	2019-07-11 12:05:15 -07:00
SamGondelman	6ce809fb2a	merge with master	2019-07-11 09:01:30 -07:00
Zach Fox	4dfbc489e8	Merge branch 'master' of github.com:highfidelity/hifi into SUI/emoteAppPrototype	2019-07-09 15:40:16 -07:00
SamGondelman	29dbbc49ad	Merge remote-tracking branch 'upstream/master' into bias	2019-07-09 15:38:13 -07:00
RebeccaStankus	714a3f6b08	Fixed path to tabletAssetServer in HMD, simplifiedUI system folder	2019-07-09 13:02:54 -07:00
Zach Fox	d622e53458	Some comments; changed the code to be backwards compatible	2019-07-08 17:10:11 -07:00
RebeccaStankus	352f9590b1	Fixed Qt.resolvedUrl format	2019-07-05 16:23:29 -07:00
SamGondelman	72f52b069e	cleanup, fix shadow qml	2019-07-03 16:21:47 -07:00
Sam Gondelman	0d9f639331	Merge branch 'master' into bias	2019-07-03 10:20:16 -07:00
Sam Gateau	1a71a63a8b	Merge pull request #15867 from SamGondelman/unlit ... BUGZ-661: Add unlit property to text entities	2019-07-03 18:43:26 +02:00
SamGondelman	692c776be5	expose shadow bias and max distance wip	2019-07-02 15:18:28 -07:00
RebeccaStankus	d840723fe3	Fixed space before function params	2019-07-02 15:08:34 -07:00
RebeccaStankus	0670147bf8	Fixed paths to included files and collision with 'clamp'	2019-07-02 14:24:02 -07:00
SamGondelman	fa416adaf6	adding unlit property to text, fixing transparency, normals, other cleanup	2019-07-02 10:28:36 -07:00
Shannon Romano	89f654175c	Merge pull request #15856 from PrestonB1123/defaultShortcuts ... DEV-173: Re-enable shortcuts	2019-06-28 15:29:53 -07:00
Preston Bezos	1315677aec	fixed doc and removed log spam	2019-06-28 15:02:33 -07:00
Preston Bezos	b9deb7bb58	formatting	2019-06-28 14:42:48 -07:00
Preston Bezos	09830dd40c	removed white space	2019-06-28 14:41:07 -07:00
Preston Bezos	d1470d3323	readded ctrl+n and ctrl+b as shortcuts with a default script	2019-06-28 14:33:03 -07:00
RebeccaStankus	d8daee49a8	Fixed bad path to gridControls	2019-06-25 16:31:21 -07:00