7938 commits

Author	SHA1	Message	Date
milad	f87e306ad4	adding extra padding to the initial textbox calculation	2019-07-25 16:35:30 -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
MiladNazeri	25fc4fbb8f	Merge pull request #15937 from MiladNazeri/sessionDisplayNameChange ... [BUGZ-537] :: removed session display name from nametag	2019-07-16 18:06:05 -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
milad	77ec048947	added change to the statusIndicator for the same thing	2019-07-16 12:23:32 -07:00
milad	53ec19dd57	removed session display name from nametag	2019-07-16 10:27:56 -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	712d608c15	Better logic in bootstrapper to not load alread running scripts	2019-07-10 13:23:50 -07:00
Zach Fox	85b563461a	DEV-165: Move Simplified UI scripts around; remove extra copy of scripts; never pause other scripts	2019-07-10 12:06:08 -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
SamGondelman	8fd2251612	mostly working equation?	2019-07-09 13:34:33 -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
Zach Fox	5048b8bd89	Implement DEV-218 & DEV-219 and commit a starting point for the Emote app	2019-07-08 16:46:58 -07:00
Shannon Romano	cc57e92a81	Merge pull request #15890 from zfox23/SUI/noAutoLOD ... BUGZ-930: No more auto-LOD adjustment for SimplifiedUI users	2019-07-08 07:57:55 -07:00
Sam Gateau	f2cda426d8	Merge pull request #15884 from samcake/nut ... BUGZ-736 / BUGZ-914 : Improve the enumeration of the platform and profiler / apply a specific PPI per Tier	2019-07-06 02:18:11 +02:00
RebeccaStankus	352f9590b1	Fixed Qt.resolvedUrl format	2019-07-05 16:23:29 -07:00
Zach Fox	eb79752455	BUGZ-930: No more auto-LOD adjustment for SimplifiedUI users	2019-07-05 12:00:17 -07:00
Samuel Gateau	28fddc2fb3	full stack for windows	2019-07-04 18:13:08 +02:00
Samuel Gateau	12cc69e41c	Merge branch 'master' of github.com:highfidelity/hifi into nut	2019-07-04 01:56:06 -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
Samuel Gateau	3be8b80eff	Merge branch 'master' of github.com:highfidelity/hifi into nut	2019-07-03 01:01:26 -07:00
Zach Fox	ba7ed32135	Merge pull request #15874 from MiladNazeri/nameTagInBodyFix ... [Bugz-893] :: Name tag in body fix	2019-07-02 16:56:46 -07:00
milad	c7f5a5064d	removed bad log	2019-07-02 16:41:24 -07:00
milad	83546de9da	removed distance check for redraw to prevent nametag in user's body	2019-07-02 16:40:23 -07: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
milad	ccc4b0d9e1	added unlit property	2019-07-02 10:33:19 -07:00
SamGondelman	fa416adaf6	adding unlit property to text, fixing transparency, normals, other cleanup	2019-07-02 10:28:36 -07:00
Sam Gateau	2c412808e7	More information from the platform on mac	2019-07-02 14:48:25 +02: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