29343 commits

Author	SHA1	Message	Date
Brad Hefta-Gaub	b5da7f00de	Merge pull request #15581 from zfox23/SUI/menuAndVRButton ... Simplified UI V1: Remove some extra menus from top bar; Only show VR button if headset connected at startup	2019-05-17 14:41:04 -07:00
Zach Fox	e40e34856b	Remove some extra menus from top bar; Only show VR button if headset connected	2019-05-17 13:28:59 -07:00
Simon Walton	024dfbf8b7	Merge pull request #15563 from SimonWalton-HiFi/avatar-banner-emissive ... Make avatar-theft banner emissive	2019-05-17 10:03:37 -07:00
David Rowe	4ce2c39d0a	Revise display plugin JSDoc in the Window API	2019-05-17 21:34:36 +12:00
Sam Gateau	ffbe055fa8	Merge pull request #15569 from SamGondelman/switch ... BUGZ-187: Proper Render Scripting Interface with renderMethod property	2019-05-16 18:29:18 -07:00
Zach Fox	c0037c3445	Merge pull request #15576 from zfox23/finishSettings ... Simplified UI v1: Implement Performance settings and VR mode top bar switch	2019-05-16 17:01:04 -07:00
SamGondelman	db813fab6a	threadsafe setRenderMethod	2019-05-16 16:48:23 -07:00
Brad Hefta-Gaub	1ac1735d55	Merge pull request #14533 from SamGondelman/oculusHome ... Case 22439: Fix HMD auto switch detection	2019-05-16 16:26:04 -07:00
Zach Fox	70a4d6e8d5	Implement Performance settings and VR mode top bar switch	2019-05-16 16:15:05 -07:00
SamGondelman	451c52fa47	merge with master	2019-05-16 16:02:52 -07:00
SamGondelman	fee20d9e46	render scripting interface + renderMethod control	2019-05-16 16:01:21 -07:00
Zach Fox	fd5128f40f	Merge pull request #15573 from zfox23/SUI/imagesNoGlyphs ... Simplified UI v1 Improvements	2019-05-16 15:14:03 -07:00
Zach Fox	90a5b25600	A bunch of changes here	2019-05-16 14:18:04 -07:00
Clément Brisset	d8ac589c36	Merge pull request #15570 from SimonWalton-HiFi/avatar-challenge-guard ... Add guard for Client-challenging Node not connected	2019-05-16 13:57:40 -07:00
Simon Walton	e3e2bbc056	Add guard for challenging Node disappearing	2019-05-16 12:36:54 -07:00
Sam Gateau	6b3707873b	Merge pull request #15562 from jherico/bugz-133 ... BUGZ-133: Expose additional functionality to QML/Scripts	2019-05-16 12:03:22 -07:00
Zach Fox	ccaabbd9ae	Merge branch 'master' of github.com:highfidelity/hifi into SUI/imagesNoGlyphs	2019-05-16 10:57:44 -07:00
Brad Davis	6a0b479041	Fix warning and build failures	2019-05-16 10:53:29 -07:00
Brad Davis	9bcc23f0c4	PR comments	2019-05-16 09:40:22 -07:00
Sam Gateau	edbd354760	Instead of returning the main window dimension (modulo the height of the menu bar) let s return the size of the actual 3d viewport widget	2019-05-15 17:57:53 -07:00
Zach Fox	a9bc7c8806	Images, not glyphs	2019-05-15 17:14:02 -07:00
Zach Fox	ee9d3d3ae1	Merge pull request #15567 from zfox23/dockedWindowEventBridge ... Fix JS to QML event bridge messages with Docked Windows	2019-05-15 16:28:43 -07:00
Zach Fox	0400bc6da0	Fix JS to QML event bridge messages with Docked Windows	2019-05-15 15:36:28 -07:00
Sam Gateau	04c139c172	Merge branch 'master' of github.com:highfidelity/hifi into coco	2019-05-15 15:01:46 -07:00
Sam Gateau	4e1b01177f	Capping the LOD MAnager target FPS by the refresh rate current rate	2019-05-15 15:01:13 -07:00
Brad Hefta-Gaub	4e8d3470d6	Merge pull request #15512 from amerhifi/feature/platform ... case lily-29: Feature/platform. Creating a single point api to get system info	2019-05-15 14:04:43 -07:00
Brad Davis	8c375db90f	Add display plugin introspection to the window scripting interface	2019-05-15 12:55:47 -07:00
Brad Davis	5db78ef2e1	Add scripting to set the refresh rate	2019-05-15 12:55:25 -07:00
jennaingersoll	559a39be56	Merge pull request #15513 from ctrlaltdavid/M22147 ... Case 22147: Desktop, Paths, PlatformInfo, Window, and location JSDoc	2019-05-15 12:17:12 -07:00
Simon Walton	9f245b07c9	Make avatar-theft banner emissive	2019-05-15 10:03:31 -07:00
Zach Fox	966965af5b	Merge pull request #15538 from zfox23/simplifiedUI ... Simplified UI v1	2019-05-14 17:45:30 -07:00
Howard Stearns	a9635a2c9a	Merge pull request #15551 from roxanneskelly/queueDepthDebug ... Queue depth debugging code	2019-05-14 17:32:53 -07:00
Howard Stearns	ee97e2faa1	Merge pull request #15559 from SimonWalton-HiFi/avatar-theft-challenge ... Allow for delayed challenges if salt is empty	2019-05-14 16:53:12 -07:00
Zach Fox	971e07c646	update spacing between settings	2019-05-14 16:44:25 -07:00
Zach Fox	bbd3d0fab5	Remove settings subtitles	2019-05-14 16:39:48 -07:00
Roxanne Skelly	a7595496f6	CR fixes	2019-05-14 16:39:39 -07:00
Zach Fox	e3bec7ef2a	CR Round 1 - thanks Milad	2019-05-14 16:29:03 -07:00
Roxanne Skelly	fad7fa4c07	Merge branch 'master' of https://github.com/highfidelity/hifi into queueDepthDebug	2019-05-14 16:25:10 -07:00
Simon Walton	e768beb9b1	Allow for delayed challenges if salt is empty	2019-05-14 15:53:35 -07:00
Brad Hefta-Gaub	7440ef3cf3	Merge pull request #15506 from SaracenOne/unify_primitives ... Case 19510: Unify cube and sphere edit menu entries into one.	2019-05-14 15:31:06 -07:00
Zach Fox	f9b51df296	Reduce size of output muted overlay; restore scroll to 0 on settings tab switch	2019-05-14 15:05:26 -07:00
David Rowe	997dc963d3	Merge branch 'master' into M22147	2019-05-15 07:59:10 +12:00
David Rowe	d5bb7f25e1	Doc review	2019-05-15 07:56:55 +12:00
Zach Fox	f43c376a6a	Tweak top bar	2019-05-14 12:41:56 -07:00
Zach Fox	8724cf4edf	UIT TextField	2019-05-14 12:27:33 -07:00
Zach Fox	2080aa6676	Some fun motion for experimentation	2019-05-14 11:56:07 -07:00
Zach Fox	cf46f3c9d4	CheckBox UIT and CheckBox added to Avatar app	2019-05-14 11:50:07 -07:00
Roxanne Skelly	68fb43ec7f	Merge branch 'master' of https://github.com/highfidelity/hifi into queueDepthDebug	2019-05-14 10:11:02 -07:00
amerhifi	fe6b2fceed	addressing comment in pr. removing extra space added in previous checkin	2019-05-14 09:39:44 -07:00
Zach Fox	c57ddf969a	Merge branch 'master' of github.com:highfidelity/hifi into simplifiedUI	2019-05-14 09:32:07 -07:00