29329 commits

Author	SHA1	Message	Date
Andrew Meadows	9b78edd062	more correct qt.conf for Linux and MacOS dev environment	2019-05-20 11:50:09 -04:00
Andrew Meadows	c660ddd1af	Merge master into 22007-hifiQtBuildv2	2019-05-16 12:31:39 -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
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	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
Andrew Meadows	4cf9673dbb	Merge master into 22007-hifiQtBuildv2	2019-05-15 14:10:30 -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
Andrew Meadows	9884d390b8	fix qt.conf location for MacOS	2019-05-15 09:34:08 -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
amerhifi	a5f4664001	Merge branch 'master' into feature/platform	2019-05-14 09:27:15 -07:00
Shannon Romano	8597a51657	Merge pull request #15556 from jherico/fix/watchdog_spam ... BUGZ-131: Additional silencing of watchdog spam	2019-05-14 08:10:02 -07:00
amerhifi	2a6dc53395	Merge branch 'master' into feature/platform	2019-05-14 06:18:37 -07:00
Howard Stearns	33f1bd965e	Merge pull request #15549 from SimonWalton-HiFi/call-reset-in-NodeList ... Call correct NodeList::reset() from Application	2019-05-13 19:49:41 -07:00
Brad Davis	7d8e14f510	Additional silencing of watchdog spam	2019-05-13 18:19:29 -07:00
Seth Alves	8b2d12e2f7	when an avatar entity is deleted, also delete its descendants	2019-05-13 17:33:10 -07:00
Zach Fox	89006cd9c5	Hide controls in top left; don't remove certain menus; fixup slider UIT	2019-05-13 17:26:19 -07:00
Roxanne Skelly	aa16430cf4	add a comment and kick build servers	2019-05-13 17:25:06 -07:00
jennaingersoll	4c6c0acc56	Merge pull request #15454 from ctrlaltdavid/M22246 ... Case 22246: Picks, PickType, RayPick JSDoc update	2019-05-13 16:16:17 -07:00
Roxanne Skelly	0319e8cc4d	Merge branch 'master' of https://github.com/highfidelity/hifi into queueDepthDebug	2019-05-13 16:01:39 -07:00
Zach Fox	7bb2d6871b	Simlpified Slider (not totally working; position is off)	2019-05-13 15:58:04 -07:00
Roxanne Skelly	72fe3a66f5	Debugging code to monitor the queue depth for a few critical threads	2019-05-13 15:56:55 -07:00
Simon Walton	305a215d21	Pass a QObject context for the functor	2019-05-13 15:50:04 -07:00
amerhifi	9652d412ac	Merge branch 'master' into feature/platform	2019-05-13 15:39:55 -07:00