1208 commits

Author	SHA1	Message	Date
Zach Fox	2f176f50fa	Another checkpoint	2017-01-16 10:44:54 -08:00
Zach Fox	6e4a4da92a	Checkpoint	2017-01-16 10:42:29 -08:00
Zach Fox	117e302b2a	First pass	2017-01-16 10:39:11 -08:00
Zach Fox	a5343d9aa9	Final tweaks before PR!	2017-01-13 17:20:29 -08:00
Zach Fox	a89868dcad	Make sliders appear only when row is selected	2017-01-13 15:41:17 -08:00
Zach Fox	8343769352	NameCard improvements & user feedback	2017-01-13 15:25:07 -08:00
Zach Fox	a69a10b8e4	Cleanup after rebase	2017-01-13 13:15:01 -08:00
Zach Fox	a9226e303c	Pull out visual changess & move them to other PR	2017-01-13 13:00:23 -08:00
Zach Fox	b0b6aeac6c	Ken's feedback	2017-01-13 13:00:03 -08:00
Zach Fox	b9cddc31a9	Checkpoint before implementing Ken's suggestions	2017-01-13 13:00:03 -08:00
Zach Fox	503468e49b	Style changes	2017-01-13 12:59:23 -08:00
Zach Fox	dcff873cd4	Modify slider function	2017-01-13 12:57:35 -08:00
Zach Fox	8bb200902f	First pass	2017-01-13 12:57:35 -08:00
Zach Fox	b7e95a3486	Updates from Alan	2017-01-12 14:14:28 -08:00
Zach Fox	8e1a70891d	Checkpoint after cherry-picking from existing PR	2017-01-12 10:59:28 -08:00
Brad Hefta-Gaub	1a7b5ab520	Merge pull request #9326 from jherico/oculus_budget_stats ... Adding tracking of Oculus renders, submits, and frames that are over budget	2017-01-06 18:18:16 -08:00
Brad Davis	15b9e750f9	Adding tracking of Oculus renders, submits, and frames that are over budget	2017-01-06 10:51:26 -08:00
howard-stearns	2f5f53c8e4	cr	2017-01-06 10:28:09 -08:00
howard-stearns	f5c4535115	Merge branch 'master' of https://github.com/highfidelity/hifi into edit-button-to-select-in-pal	2017-01-05 16:29:34 -08:00
Howard Stearns	3f54428744	Merge pull request #9313 from howard-stearns/pal ... People Action List	2017-01-05 15:49:56 -08:00
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
howard-stearns	47aa1e4f8e	add pal to defaultScripts	2017-01-05 12:23:17 -08:00
Zach Fox	b5713656be	Minor language changes on Admin help text	2017-01-05 09:27:12 -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
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
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 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
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
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