27 commits

Author	SHA1	Message	Date
Brad Davis	1167be4102	Reverting tablet API rename, cleaning up duplicated code	2017-11-15 11:52:55 -08:00
Brad Davis	7bf1b176d7	Renaming Tablet API to Tablets, supporting dev-mode QML loading from filesystem	2017-11-10 14:21:24 -08:00
vladest	fa349a694c	Code style fixes	2017-10-20 15:12:09 +02:00
vladest	e26118254f	Implemented Audio injector in Tablet scripting interface. Added missed sound events	2017-09-18 19:40:06 +02:00
Zach Fox	f6583a1b87	Use correct text color for checkboxes	2017-07-05 14:46:59 -07:00
Dante Ruiz	729065749f	fixed merge conficts	2017-06-21 16:59:53 +01:00
Zach Pomerantz	1f7e1e8287	add level to active input selection	2017-06-20 17:04:54 -07:00
Dante Ruiz	da29157a3c	fixed merge conflict'	2017-06-17 00:40:50 +01:00
Zach Pomerantz	b37a0239b0	up to reverb (needs cherry-picking)	2017-06-12 18:00:52 -04:00
Dante Ruiz	bb7c424d47	get ui working	2017-06-06 21:09:09 +01:00
David Kelly	4d6886d1f4	cr feedback, plus changed 'People' to 'Connections' in a couple places	2017-04-03 17:03:14 -07:00
David Kelly	4629accc9c	style updates	2017-04-03 15:35:53 -07:00
Zach Fox	b776f25b3b	Merge branch 'master' of https://github.com/highfidelity/hifi into PAL_v2	2017-03-28 18:09:17 -07:00
Zach Fox	81264c998b	Revert "Merge from upstream/master" ... This reverts commit b5ba4a109d.	2017-03-28 17:39:45 -07:00
Zach Fox	b5ba4a109d	Merge from upstream/master	2017-03-28 17:37:34 -07:00
Zach Fox	beb848373b	Update from zfox23/PALv2 branch	2017-03-13 10:15:06 -07:00
David Rowe	b539c55c02	Scroll and snap to attachment with focus	2017-03-10 14:33:51 +13:00
Zach Fox	8e1a70891d	Checkpoint after cherry-picking from existing PR	2017-01-12 10:59:28 -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	f96508e197	Gotta fix these bugs...	2016-12-29 14:19:40 -08:00
Zach Fox	630fb8696f	Lots of progress today	2016-12-21 12:48:26 -08:00
Zach Fox	0be4db1e68	Checkboxes!	2016-12-21 12:48:26 -08:00
Zander Otavka	c27e1d6fdb	Polish dialog behavior and spacing	2016-07-15 17:35:55 -07:00
David Rowe	a51dd43dff	Wrap labels	2016-03-03 01:56:02 +13:00
David Rowe	3cac94ed35	Refactor label style	2016-02-26 17:32:25 +13:00
David Rowe	3dc9d01aab	Style checkbox control	2016-02-26 15:56:19 +13:00