1566 commits

Author	SHA1	Message	Date
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
David Rowe	9f56d2f6f6	Make tablet general settings dialog naming more consistent with desktop	2017-03-02 12:30:36 +13:00
howard-stearns	5be952c4e8	persist sort info for tablet re-opening, and start with column 1	2017-03-01 14:51:48 -08:00
David Rowe	6fafc829e1	Merge branch 'menuFix' into tablet-ui	2017-03-02 09:28:35 +13:00
David Rowe	f60c2f8ec9	Merge branch 'tablet-ui-edit-js' into tablet-ui	2017-03-02 09:27:09 +13:00
David Kelly	45293ab130	Merge branch 'master' of https://github.com/highfidelity/hifi into dk/palVolumeSorting	2017-03-01 12:55:54 -07:00
David Kelly	55d049ff5c	style updates	2017-03-01 12:43:45 -07:00
David Kelly	efe44425a6	cr feedback, plus something I missed	2017-03-01 09:26:03 -07:00
Dante Ruiz	e2479a78bd	Merge branch 'tablet-ui-edit-js' of github.com:sethalves/hifi into menuFix	2017-03-01 16:04:12 +00:00
David Kelly	678020fed6	now use it (plus a bit of cleanup)	2017-02-28 15:03:45 -07:00
Dante Ruiz	16d3f22e77	remove uncommented code	2017-02-28 21:39:33 +00:00
Dante Ruiz	f0f2b8c4da	fix comboBox and PushOntoStack	2017-02-28 21:30:25 +00:00
howard-stearns	c04fd0ec66	smaller glyph size	2017-02-27 16:07:05 -08:00
David Kelly	3bf3f16a6a	whitespace	2017-02-27 12:56:03 -07:00
David Kelly	e7c8085bc8	switch to using glyph button	2017-02-27 12:44:23 -07:00
David Kelly	baa7f81d79	Merge branch 'master' of https://github.com/highfidelity/hifi into dk/palVolumeSorting	2017-02-24 18:38:57 -08:00
Dante Ruiz	73c337efd0	Merge branch 'tablet-ui-edit-js' of github.com:sethalves/hifi into menuFix	2017-02-25 00:42:22 +00:00
Dante Ruiz	835b23832f	some modal clean up	2017-02-25 00:40:38 +00:00
Seth Alves	fcd3c09404	Merge branch 'tablet-ui-tablet-is-overlay' of github.com:sethalves/hifi into tablet-ui-edit-js-tablet-as-overlay	2017-02-24 14:27:30 -08:00
David Kelly	d6f0d8c960	styling changes, first pass	2017-02-24 11:45:03 -08:00
Howard Stearns	a9b8045697	Merge pull request #9720 from howard-stearns/filter-pal-by-view-distance ... Filter pal by view distance	2017-02-24 11:10:13 -08:00
David Kelly	d399f648d5	Merge branch 'master' of https://github.com/highfidelity/hifi into dk/palVolumeSorting	2017-02-24 10:32:43 -08:00
Dante Ruiz	89f5e5112f	Merge branch 'tablet-ui-edit-js' of github.com:sethalves/hifi into menuFix	2017-02-24 15:25:32 +00:00
David Kelly	4a4c914ca8	First cut at new styling	2017-02-23 18:53:22 -08:00
Seth Alves	610c20e01a	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js	2017-02-23 17:41:38 -08:00
Seth Alves	57ab2ba7ca	Merge pull request #7 from fayeli/edit-js-create-tab ... Create Tab and Tab Bar QML Styling	2017-02-23 17:40:48 -08:00
Faye Li	c60360b6e0	particle explorer icon	2017-02-23 16:34:10 -08:00
Dante Ruiz	4a5be4238e	messages and file dialogs in tablet	2017-02-24 00:19:32 +00:00
Faye Li	80c3c00398	switch to properties tab when you create an entity	2017-02-23 14:48:06 -08:00
Faye Li	d4ea0c116d	asset server button	2017-02-23 14:36:39 -08:00
Faye Li	3850bc35a9	icons on new entity buttons	2017-02-23 13:31:03 -08:00
Faye Li	bd834097d5	tab bar styling	2017-02-23 12:36:27 -08:00
Faye Li	8e89e07732	text choose an entity type to create	2017-02-23 11:50:39 -08:00
Faye Li	88318c1911	create tab background and new entity buttons	2017-02-23 11:40:26 -08:00
Howard Stearns	cddba43837	Merge branch 'master' into filter-pal-by-view-distance	2017-02-23 08:25:16 -08:00
Dante Ruiz	93ae93a45a	Merge branch 'tablet-ui-edit-js' of github.com:sethalves/hifi into menuFix	2017-02-23 15:43:24 +00:00
Andrew Meadows	6ac33dbf61	count avatar joint updates and non-updates	2017-02-22 17:23:36 -08:00
Dante Ruiz	3ba605bf23	saving work	2017-02-23 00:28:30 +00:00
howard-stearns	de3a0d3d0c	button styling	2017-02-22 13:02:05 -08:00
howard-stearns	023a32563c	work around .qml settings issues	2017-02-22 12:59:40 -08:00
Seth Alves	5bff2034c3	cleanups, attempt to get particle explorer to work right	2017-02-22 12:07:18 -08:00
Seth Alves	84b93826d0	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js	2017-02-22 09:30:16 -08:00
Anthony J. Thibault	379b7bc56d	Fix for system toolbar hiding when scripts are reloaded	2017-02-21 17:24:22 -08:00
howard-stearns	a20590a2f9	fixed myCard width in all cases (admin or not)	2017-02-21 16:03:59 -08:00
howard-stearns	1ddc7de581	remove debugging (and fix missing brace)	2017-02-21 15:41:17 -08:00
howard-stearns	f21e17d512	new buttons	2017-02-21 15:32:41 -08:00
howard-stearns	aff44d682e	Merge branch 'master' of https://github.com/highfidelity/hifi into filter-pal-by-view-distance	2017-02-21 13:45:25 -08:00
howard-stearns	15d8041683	snapshot working, before button change	2017-02-21 13:14:45 -08:00
David Kelly	76229905f2	Merge branch 'master' of https://github.com/highfidelity/hifi into dk/palVolumeSorting	2017-02-21 09:24:22 -08:00
Seth Alves	43f47c1106	merge from upstream	2017-02-20 12:45:39 -08:00
Dante Ruiz	3f8ea4ac54	fixed merge conflict	2017-02-17 23:33:39 +00:00
Anthony J. Thibault	5963c6ddc3	Fix for toolbar visibility after snapshots.	2017-02-17 11:04:04 -08:00
Dante Ruiz	dedd85d296	saving work	2017-02-17 18:47:59 +00:00
David Kelly	d938c70b48	volume goes 0-9 now	2017-02-17 11:11:08 -07:00
Seth Alves	0d10667bb4	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js	2017-02-17 09:58:33 -08:00
David Kelly	51246a2e45	first cut, pretty ugly	2017-02-17 10:24:01 -07:00
Dante Ruiz	08ffa18008	Merge branch 'master' into menuFix	2017-02-17 15:53:33 +00:00
Dante Ruiz	3189b44612	refreshing with master	2017-02-17 15:50:08 +00:00
Anthony J. Thibault	cffdecbf68	Merge branch 'master' into feature/toolbar-tablet-switcheroo	2017-02-16 16:28:43 -08:00
Dante Ruiz	628b97bfc6	fixed merge issues	2017-02-17 00:08:31 +00:00
Dante Ruiz	afd56bbbbe	fixed qml font path issue for desktop and tablet	2017-02-17 00:01:12 +00:00
Anthony J. Thibault	8ccca86dee	Settings for Tablet Becomes Toolbar	2017-02-16 15:57:36 -08:00