18574 commits

Author	SHA1	Message	Date
howard-stearns	ef02c84759	further simplification of letterbox, and use for selection failures	2017-01-05 14:46:32 -08:00
howard-stearns	0cdeac8736	abstract out letterbox message	2017-01-05 14:32:31 -08:00
howard-stearns	0670a4689f	Merge branch 'master' of https://github.com/highfidelity/hifi into edit-button-to-select-in-pal	2017-01-05 13:57:44 -08:00
Howard Stearns	bbf7d16537	process consistent select message	2017-01-05 13:45:03 -08:00
Howard Stearns	28326ff47a	Merge pull request #9306 from zfox23/PALVisualUpdates ... Fix PAL scrollbar; add helper popup to ADMIN tab	2017-01-05 13:29:21 -08:00
Zach Fox	b5713656be	Minor language changes on Admin help text	2017-01-05 09:27:12 -08:00
Brad Hefta-Gaub	368f48f0a7	Merge pull request #9247 from huffman/feat/tutorial-touch-grip ... Add support for new Touch grip mappings to tutorial	2017-01-04 17:58:05 -08:00
Clément Brisset	e34ecac843	Merge pull request #9299 from Atlante45/settings ... Fix settings hitch	2017-01-04 17:19:44 -08:00
howard-stearns	9709bedca7	checkpoint	2017-01-04 16:55:58 -08:00
Zach Fox	0c77ff2556	Fix silly quotation bug	2017-01-04 16:28:23 -08:00
Zach Fox	083bf95917	Fix PAL scrollbar; add helper popup to ADMIN tab	2017-01-04 16:25:13 -08:00
Brad Hefta-Gaub	f9ca41e89c	Merge pull request #9302 from jherico/expose_dropped_count ... Expose dropped frames count to stats UI	2017-01-04 16:12:35 -08:00
Howard Stearns	3d8da683db	Merge pull request #9290 from zfox23/PersonalMute ... Personal mute; Quasi-ignore; Reversible PAL actions	2017-01-04 14:37:09 -08:00
Zach Fox	675159be45	Last commit to fix final bugs	2017-01-04 14:33:02 -08:00
Zach Fox	ac41e8abc4	Bugfix re: population; remove user image for now	2017-01-04 14:06:51 -08:00
Zach Fox	c695878025	Clear local ignored list upon domain change	2017-01-04 13:31:16 -08:00
Brad Davis	3f2fdd1915	Expose dropped frames count to stats UI	2017-01-04 13:20:58 -08:00
Zach Fox	dde5f69ac9	More CR & simplifications	2017-01-04 12:41:30 -08:00
Atlante45	56a25dfdee	Check setting value changed	2017-01-04 11:56:24 -08:00
Zach Fox	14def61eb8	More CR comments; 1 bug remaining re: sig slot	2017-01-03 17:32:47 -08:00
Zach Fox	899dd21328	Lots of CR feedback	2017-01-03 15:43:30 -08:00
Zach Pomerantz	26cfc83e20	Merge branch 'master' into graphics/fetch-cull-sort	2017-01-03 14:04:39 -05:00
Zach Fox	4a21eaa33f	Cleanup before PR	2016-12-30 15:18:01 -08:00
Zach Fox	951db2e2da	Bugs fixed!	2016-12-30 15:12:17 -08:00
Zach Fox	ea40582afb	Remaining bug: Hover when sort	2016-12-30 12:55:46 -08:00
Zach Fox	f26b7c0134	Checkpoint	2016-12-30 09:51:43 -08:00
Brad Hefta-Gaub	84eca0159e	Merge branch 'master' of https://github.com/highfidelity/hifi into improveInterval ... Conflicts: tests/networking/src/ResourceTests.cpp	2016-12-29 16:42:52 -08:00
Brad Hefta-Gaub	0c22fcb5c4	better handling of timers	2016-12-29 16:41:14 -08:00
Zach Pomerantz	0e9da87549	FetchSortCull->FetchCullSort	2016-12-29 19:27:37 -05:00
Zach Fox	3bd68f5e3e	Checkpoint for removing userData	2016-12-29 16:09:31 -08:00
Zach Fox	be4050aa78	One bug down!	2016-12-29 15:43:42 -08:00
Zach Fox	f96508e197	Gotta fix these bugs...	2016-12-29 14:19:40 -08:00
Zach Fox	10b5b957f2	Ahh...It's beautiful and simple now.	2016-12-29 13:09:40 -08:00
Zach Fox	24eac77115	I'm about to refactor this.	2016-12-29 11:57:51 -08:00
Zach Fox	bb2b48d424	Getting very close.	2016-12-29 11:35:20 -08:00
Brad Hefta-Gaub	a72f60152b	audit use of QTimer intervals to make sure we're using Qt::PreciseTimer when appropriate	2016-12-29 08:53:37 -08:00
Zach Fox	af1c67a252	Progress!	2016-12-28 17:23:56 -08:00
Zach Fox	d3700fc922	Fix merge errors	2016-12-28 15:47:28 -08:00
Zach Fox	46e8bf5283	First steps, holding off til Howard finishes	2016-12-28 15:12:21 -08:00
Zach Fox	800389cf20	Remove HRS logging	2016-12-28 14:37:19 -08:00
Atlante45	f79c6e08f5	Track dropped frames as reported by the Oculus SDK	2016-12-28 14:18:23 -08:00
howard-stearns	7faa689d1d	avatar body goes away when ignored, and comes back when unignored	2016-12-27 10:17:39 -08:00
howard-stearns	768b747b3a	Make avatar go away when ignored, even when pal is up. (But currently, it ... comes back!)	2016-12-27 10:17:39 -08:00
Anthony Thibault	9128d4b140	Merge pull request #9255 from AndrewMeadows/benji-002 ... optimization of incoming avatar joint data in interface client	2016-12-26 11:34:15 -08:00
Brad Davis	5b30f5da1b	Merge pull request #9259 from zfox23/FixRunningScripts ... Fix "Running Scripts" window being inaccessible	2016-12-23 15:37:24 -08:00
Zach Fox	72da05bb30	Merge pull request #9268 from zfox23/PalRefresh ... Add PAL refresh button	2016-12-23 15:16:51 -08:00
David Kelly	68fb81902b	Merge pull request #9261 from davidkelly/dk/workingVUMetersInPal ... Working VU meters in PAL	2016-12-23 13:24:38 -08:00
Zach Pomerantz	ca1a14e5b0	add RenderFetchSortCull task	2016-12-23 15:54:22 -05:00
Zach Fox	5490dddbbf	Cool style changes!	2016-12-23 12:22:33 -08:00
David Kelly	9eed430f49	CR feedback	2016-12-22 18:09:19 -08:00