1527 commits

Author	SHA1	Message	Date
David Rowe	6a8d0b1064	Refactor some tablet dialog headers	2017-03-11 16:55:22 +13:00
David Rowe	327e3c9973	Don't expand height of higlighted row	2017-03-11 15:46:43 +13:00
David Rowe	0a2976deab	Add tablet keyboard	2017-03-11 15:43:33 +13:00
David Rowe	ffbb04d3bc	Tablet and desktop versions of attachment model browser dialog	2017-03-11 15:38:21 +13:00
David Rowe	d261e48b9d	Use existing model browser dialog as base content	2017-03-11 14:33:03 +13:00
David Rowe	25364c0628	Make dropdown scrollbar wider	2017-03-11 12:59:15 +13:00
David Rowe	713c50f2e8	Fix attachments dialog joint dropdown in tablet	2017-03-11 12:52:22 +13:00
David Rowe	189eee01a6	Refactor TabletComboBox.qml into ComboBox.qml	2017-03-11 11:02:09 +13:00
David Rowe	71713b10f3	Merge remote-tracking branch 'upstream/tablet-ui' into 21209 ... # Conflicts: # interface/src/ui/overlays/Web3DOverlay.cpp	2017-03-11 09:14:06 +13:00
Vladyslav Stelmakhovskyi	e27ccab2f4	Eliminate pathToFonts not found errors at startup. Change TableFiledialog folder on click	2017-03-10 19:53:20 +01:00
David Rowe	7af9f879dd	Fix scrollbar and keyboard behavior	2017-03-10 21:44:20 +13:00
David Rowe	9291d272fe	Add scrollbar	2017-03-10 18:25:16 +13:00
David Rowe	b539c55c02	Scroll and snap to attachment with focus	2017-03-10 14:33:51 +13:00
David Rowe	c7d1aa8ff4	Make attachments list flickable	2017-03-10 08:26:00 +13:00
druiz17	0069569e96	Merge branch 'tablet-ui' into 21197	2017-03-09 09:31:15 -08:00
David Rowe	53dcf80cc0	Add dialog title	2017-03-09 22:38:49 +13:00
David Rowe	4be106cbae	Remove obsolete rounded border	2017-03-09 18:20:26 +13:00
David Rowe	66dded5e28	Scroll attachments if necessary when raise keyboard to keep focus	2017-03-09 18:13:26 +13:00
David Rowe	1fc6d82456	Tablet and desktop versions of avatar attachments dialog	2017-03-09 13:04:57 +13:00
David Rowe	22e5229036	Use existing attachments dialog as base dialog content	2017-03-09 09:57:45 +13:00
Dante Ruiz	74fe3da035	Merge branch 'tablet-ui-edit-js' of github.com:sethalves/hifi into menuFix	2017-03-08 16:28:24 +00:00
David Rowe	950f91965d	Merge branch 'tablet-ui-edit-js' into 21197	2017-03-08 17:35:58 +13:00
Seth Alves	509ce3f2d2	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js	2017-03-07 18:41:36 -08:00
howard-stearns	cb41b9135b	fix broken merge	2017-03-07 12:10:52 -08:00
howard-stearns	8a489f36f4	Merge branch 'master' of https://github.com/highfidelity/hifi into fix-ban-remove-from-pal	2017-03-07 10:49:53 -08:00
Seth Alves	df2e73c2f0	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js	2017-03-07 09:44:41 -08:00
David Kelly	b760e86226	rest of cr feedback	2017-03-07 10:17:32 -07:00
David Kelly	c6dbfc85f0	cr feedback	2017-03-07 09:54:00 -07:00
David Rowe	fb1ff5be89	Port Developer > Network > Networking to tablet	2017-03-07 17:02:29 +13:00
David Kelly	3d39aae35b	minor tweak - just in case	2017-03-06 15:52:33 -07:00
David Kelly	e14a1ad1af	minor cleanup	2017-03-06 15:26:03 -07:00
David Kelly	db036d997c	first pass	2017-03-06 15:18:35 -07:00
David Rowe	af4bdd5943	Port Developer > Audio > Buffers to tablet	2017-03-07 09:57:02 +13:00
Vladyslav Stelmakhovskyi	6d9e7de6dc	Implemented AssetBrowser in Tablet view	2017-03-06 21:45:55 +01:00
David Rowe	09ecb12510	Merge branch 'tablet-ui-edit-js' into 21197 ... # Conflicts: # interface/src/ui/overlays/Web3DOverlay.cpp	2017-03-07 08:59:40 +13:00
howard-stearns	632cdc1b38	semicolons and whitespace per coding standard	2017-03-06 11:04:12 -08:00
David Rowe	0333122b23	Make Save and Cancel buttons close preferences dialog	2017-03-04 15:27:31 +13:00
howard-stearns	a715a694f0	fix 'banned user doesn't disappear from pal until refresh'	2017-03-03 16:27:38 -08:00
David Rowe	53cfad65cd	Add keyboard to preferences dialogs	2017-03-04 13:01:02 +13:00
Dante Ruiz	88c0db969c	added tabletComboBox to tabletFileDialog	2017-03-03 17:14:00 +00:00
Dante Ruiz	f867f4e739	Merge branch 'tablet-ui-edit-js' of github.com:sethalves/hifi into menuFix	2017-03-03 15:40:41 +00:00
David Rowe	9384dfd89c	Merge branch 'tablet-ui-edit-js' into 21197	2017-03-03 18:05:18 +13:00
David Rowe	4d624ad256	Merge branch 'menuFix' into 21199	2017-03-03 09:42:16 +13:00
Seth Alves	cf37845f9e	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js	2017-03-02 10:06:38 -08:00
Dante Ruiz	5ba89e67af	fixed message dialog bug	2017-03-02 16:50:42 +00:00
David Kelly	79e440be81	fix unmute when ignoring in PAL (you can't)	2017-03-02 08:36:58 -07:00
David Rowe	62f91b4af6	Work around MyAvatar not being available in avatar preference control	2017-03-02 15:01:31 +13:00
David Rowe	ebe41bb443	Add a title to the tablet settings dialogs	2017-03-02 14:11:56 +13:00
Dante Ruiz	58c1a2fb99	Merge branch 'master' into menuFix	2017-03-02 00:55:18 +00:00
David Rowe	b9869264ba	Display avatar settings dialog in tablet	2017-03-02 13:16:23 +13:00