19358 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
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
David Rowe	1e3c717fd4	Method to show appropriate desktop or tablet dialog	2017-03-09 09:55:47 +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
Howard Stearns	f0fd29abd3	Merge pull request #9815 from davidkelly/dk/3377 ... Retain selection in PAL when sorting or reloading	2017-03-07 09:38:07 -08:00
Seth Alves	f594689fa8	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js	2017-03-07 09:24:50 -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
Vladyslav Stelmakhovskyi	2d2b2094fd	Adding ability for QML/JS file to be visible in QtCreator. Also changed files will be installed to destination	2017-03-07 10:11:09 +01:00
Brad Hefta-Gaub	b111bcb826	Merge pull request #9818 from ctrlaltdavid/21205 ... Remove Developer > Network > Bandwith Details dialog	2017-03-06 22:02:33 -08:00
David Rowe	51739f2f99	Remove Developer > Network > Bandwith Details dialog	2017-03-07 15:02:26 +13:00
David Kelly	3d39aae35b	minor tweak - just in case	2017-03-06 15:52:33 -07:00
David Kelly	f23f882595	Merge branch 'master' of https://github.com/highfidelity/hifi into dk/3377	2017-03-06 15:26:21 -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
Zach Fox	5223f872c1	Merge pull request #9753 from zfox23/FB_3234_TakeTwo ... Optimize AvatarMixer with respect to Identity and Avatar Data	2017-03-06 13:37:29 -08:00
Andrew Meadows	1b8f6b9835	Merge pull request #9784 from samcake/blue ... Fixing Emissive on overlay for models (opaque and transparent)	2017-03-06 13:24:00 -08:00
Seth Alves	4886f1cbfc	don't run stylus-on-overlay code unless the overlay is a web3d overlay	2017-03-06 12:38:19 -08:00
Seth Alves	08e2e421e4	Merge branch '21199' of github.com:ctrlaltdavid/hifi into tablet-ui-edit-js	2017-03-06 11:08:27 -08:00
Seth Alves	4b02e550db	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js	2017-03-06 11:07:12 -08:00
Andrew Meadows	6ea6477c73	Merge pull request #9683 from jherico/cache_flush ... Clear caches on domain switch	2017-03-06 11:05:44 -08:00
howard-stearns	632cdc1b38	semicolons and whitespace per coding standard	2017-03-06 11:04:12 -08:00
Zach Fox	c9c07c4269	Basically rebase and squash	2017-03-06 10:03:41 -08:00
Seth Alves	93246b24b0	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js	2017-03-06 08:54:49 -08:00
sam	cffd838d1d	merging with master	2017-03-05 12:57:13 -08:00
Ken Cooke	50f92cb934	redo unsafe optimization	2017-03-04 15:29:23 -08:00
Ken Cooke	46c5f96113	redo unsafe optimization	2017-03-04 15:24:03 -08:00
Ken Cooke	117bba8b6a	redo unsafe optimization	2017-03-04 15:17:09 -08:00
howard-stearns	a715a694f0	fix 'banned user doesn't disappear from pal until refresh'	2017-03-03 16:27:38 -08:00
Anthony J. Thibault	e56f02d94f	Changed default for preferFingerOverStylus to false.	2017-03-03 14:12:04 -08:00
David Rowe	6403e51d20	Merge branch 'tablet-ui-edit-js' into 21199	2017-03-04 09:00:49 +13:00
Anthony J. Thibault	45febe8565	Merge branch 'master' into feature/fingers-on-tablet	2017-03-03 09:04:43 -08:00
Seth Alves	40caa1ea49	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js	2017-03-03 09:01:57 -08:00
David Rowe	854292b193	Merge branch 'tablet-ui-edit-js' into 21199	2017-03-03 17:51:12 +13:00
David Rowe	b31cf23c8d	Fix tablet QML fonts path ... This is the path for running scripts from build/install directory rather than from source directory.	2017-03-03 17:45:23 +13:00
David Rowe	3285816fca	Fix up audio stats displayed in tablet	2017-03-03 16:45:35 +13:00
Seth Alves	807e15ade9	Merge pull request #9798 from AndrewMeadows/faster-avatar-updates-2 ... avoid animation blending for other avatars	2017-03-02 18:37:18 -08:00
Brad Hefta-Gaub	e655e442a0	Merge pull request #9799 from sethalves/steady-hand-lasers ... Steady hand lasers	2017-03-02 18:27:39 -08:00
Seth Alves	f055711c76	refix	2017-03-02 16:47:19 -08:00
Seth Alves	3b581a8dfe	merge from upstream	2017-03-02 16:35:44 -08:00
Seth Alves	10cb7aab06	Merge pull request #9684 from Menithal/parent-hotkey ... WL#20856 Added Parenting Hotkeys to Edit.js Among Visual tweaks	2017-03-02 16:30:43 -08:00