29270 commits

Author	SHA1	Message	Date
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
Zach Fox	c57ddf969a	Merge branch 'master' of github.com:highfidelity/hifi into simplifiedUI	2019-05-14 09:32:07 -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
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
jennaingersoll	4c6c0acc56	Merge pull request #15454 from ctrlaltdavid/M22246 ... Case 22246: Picks, PickType, RayPick JSDoc update	2019-05-13 16:16:17 -07:00
Zach Fox	7bb2d6871b	Simlpified Slider (not totally working; position is off)	2019-05-13 15:58:04 -07:00
Simon Walton	305a215d21	Pass a QObject context for the functor	2019-05-13 15:50:04 -07:00
David Rowe	70ec84177a	Doc review	2019-05-14 10:32:28 +12:00
jennaingersoll	712167c623	Merge pull request #15476 from ctrlaltdavid/M22407 ... Case 22407: Quat JSDoc update	2019-05-13 15:17:58 -07:00
Simon Walton	ede8859cc7	Call correct NodeList::reset() from Application	2019-05-13 14:38:34 -07:00
Brad Hefta-Gaub	51f2d1748e	Merge pull request #15544 from sabrina-shanman/bug_avatar_res-state ... (BUGZ-40) Check for possible avatar fade race condition	2019-05-13 13:41:09 -07:00
Shannon Romano	32d3014d0d	Merge pull request #15301 from SaracenOne/disable_away_on_focus_loss_push_2 ... case 22190: Disable triggering away state when interface focus lost	2019-05-13 13:22:28 -07:00
Shannon Romano	8aee64c102	Merge pull request #15540 from jherico/fix/gl_crash ... BUGZ-125: Error message instead of crash if the GL version is too low	2019-05-13 13:12:30 -07:00
Shannon Romano	46d75a61b3	Merge pull request #15541 from SimonWalton-HiFi/clear-connections-on-NodeID-change ... Clear any reliable connection state upon Node ID change	2019-05-13 13:11:05 -07:00
Zach Fox	f799f96fba	simplifiedUI UIT switch	2019-05-13 13:04:12 -07:00
Sam Gondelman	4c4589271c	Merge pull request #15469 from SamGondelman/switch ... Case 22379: Run-time switch for deferred/forward rendering	2019-05-13 11:14:26 -07:00
Zach Fox	feb5021372	UIT RadioButton	2019-05-13 11:07:39 -07:00
SamGondelman	eb8c722080	fix runtime switch	2019-05-13 09:58:55 -07:00
sabrina-shanman	736c7a9736	Change logging from 'fade-out animation' to 'fade-out transition'	2019-05-10 15:18:52 -07:00
sabrina-shanman	6f5bf01f2b	Add sanity check and logging for possible avatar fade lambda race condition	2019-05-10 14:33:25 -07:00
Shannon Romano	5c9570cffb	Merge pull request #15539 from jherico/fix/watchdog_spam ... BUGZ-131: Reduce spam from watchdog thread	2019-05-10 14:24:15 -07:00
Simon Walton	4b51d81b42	Clear any reliable connection state upon Node ID change	2019-05-10 12:06:38 -07:00
Zach Fox	112e13383b	Dock it!	2019-05-10 12:03:29 -07:00
Brad Davis	0f8ddae9df	Reduce spam from watchdog thread	2019-05-10 12:01:07 -07:00
Shannon Romano	0d28932181	Merge pull request #15529 from Atlante45/feat/more-ice-logging ... Add instrumentation to help track down connection issues	2019-05-10 11:57:24 -07:00
Brad Davis	db88f14e13	Error message instead of crash if the GL version is too low	2019-05-10 11:51:50 -07:00
Zach Fox	314c04ab96	Simplified UI v1	2019-05-10 10:49:25 -07:00
Clement	0a7352074c	Fix android build	2019-05-09 17:17:43 -07:00
Shannon Romano	930032bcc6	Merge pull request #15511 from AndrewMeadows/build-shapes-off-mainloop ... case 22166: Build complex shapes in ThreadPool instead of MainLoop	2019-05-09 17:14:50 -07:00
Shannon Romano	6aa8dc7c42	Merge pull request #15534 from kencooke/audio-PTT-output-ducking ... Reduce echo when push-to-talk is used	2019-05-09 15:54:15 -07:00
Andrew Meadows	a0b34e4f15	more correct clearing of dirty flags for AvatarMotionState	2019-05-09 14:45:36 -07:00
Andrew Meadows	c7432ffe5f	also update easy flags when rebuilding avatar shape	2019-05-09 13:48:07 -07:00
Ken Cooke	1b733d3fb3	While PTT is active, duck the audio output by 20dB to reduce echo	2019-05-09 12:56:07 -07:00
SamGondelman	59e7db2d6b	Merge remote-tracking branch 'upstream/master' into switch	2019-05-09 11:42:05 -07:00
danteruiz	0fae615cb4	fix dock widget context	2019-05-09 09:20:50 -07:00
Clement	b3d0705e39	Extend ICE logging + make it more searchable	2019-05-08 18:38:00 -07:00
Anthony Thibault	4ee39355f1	Merge pull request #15525 from hyperlogic/feature/backtrace-gpu-ident ... Add gpu_name, gpu_driver & gpu_memory to crash annotations	2019-05-08 16:09:13 -07:00
Anthony Thibault	78403e4436	Add gpu_name, gpu_driver & gpu_memory to crash annotations ... This may help us identify the hardware causing early gl initialization errors.	2019-05-08 13:33:45 -07:00
David Rowe	c3730e41f7	Typos	2019-05-09 08:33:37 +12:00
Shannon Romano	15484436ca	Merge pull request #15507 from danteruiz/dockable-windows ... case LILY-30: Dockable Interactive Windows	2019-05-08 12:16:04 -07:00
danteruiz	3806631bf1	dockable window	2019-05-08 10:04:31 -07:00
Shannon Romano	e90f91f109	Merge pull request #15488 from sethalves/fix-indep-camera ... case 22412: allow independent camera to be set by scripts 👍 by QL for pre-merge testing in the manu ticket	2019-05-07 09:38:54 -07:00
Andrew Meadows	f6916edac4	cleanup and removing some accidental C++-20-isms	2019-05-06 17:37:35 -07:00
Andrew Meadows	e770bd6142	build CollisionShapes and load RigidBodies even when not yet stepping	2019-05-06 17:37:35 -07:00