52147 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Dante Ruiz	78da936344	Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-imporove-dialogs	2017-03-10 19:33:51 +00:00
Dante Ruiz	b63ab05eec	improved general settting coloring	2017-03-10 19:33:14 +00:00
Seth Alves	cb1505d51e	Merge pull request #9855 from vladest/ImportEntitiesToTablet ... Eliminate pathToFonts not found errors at startup. Change TableFiledi…	2017-03-10 11:22:40 -08:00
Vladyslav Stelmakhovskyi	e27ccab2f4	Eliminate pathToFonts not found errors at startup. Change TableFiledialog folder on click	2017-03-10 19:53:20 +01:00
Dante Ruiz	9b3810814e	fiexed putting menu items on the hud when tablet not open when on desktop screen	2017-03-10 18:40:18 +00:00
Seth Alves	411ec9a791	Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-ui-fix-edit-props-race	2017-03-10 10:22:10 -08:00
Seth Alves	bc338a0852	Merge pull request #9854 from sethalves/tablet-ui ... Tablet ui	2017-03-10 10:21:45 -08:00
Seth Alves	fffff817a3	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-03-10 10:20:40 -08:00
Seth Alves	494b602d4c	Merge pull request #9850 from druiz17/toolbar-MIA-afetr-snapshot ... toolbar becomes visible after taking a snapshot	2017-03-10 10:20:01 -08:00
Seth Alves	cef4c988c4	Merge pull request #9835 from druiz17/toolbar-window-dont-close ... Close toolbar windows when reloading scripts	2017-03-10 10:19:07 -08:00
Seth Alves	2068b93ccc	Merge pull request #9817 from druiz17/goto-home-bug ... cant call gotohomescreen when tablet is closed	2017-03-10 10:17:23 -08:00
Seth Alves	531b77928a	Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-ui-fix-edit-props-race	2017-03-10 09:59:35 -08:00
Seth Alves	d792559d9a	have edit.js resend properties of selected entity to entityProperties.js once it's ready	2017-03-10 09:59:23 -08:00
Seth Alves	b1079d3719	Merge pull request #9852 from sethalves/tablet-ui ... Tablet ui	2017-03-10 09:55:53 -08:00
Seth Alves	e3f1d80933	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-03-10 09:54:35 -08: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
Dante Ruiz	d54005b62e	no more duplicate snapshot buttons after taking reloading scripts	2017-03-10 00:17:44 +00:00
Dante Ruiz	c6c0c6d382	toolbar becomes visible after taking a snapshot	2017-03-09 22:54:22 +00:00
Anthony J. Thibault	d8f04d90a7	Merge branch 'master' into feature/can-touch-this	2017-03-09 14:24:10 -08:00
Brad Hefta-Gaub	95776c2e51	Merge pull request #9830 from zzmp/fix/audio-silent-check ... better detection of silent samples in audio-mixer	2017-03-09 14:11:46 -08:00
Anthony J. Thibault	6f53aaed5c	Small simplification of building stylusTarget list.	2017-03-09 14:04:13 -08:00
Zach Pomerantz	7e2f1a6455	check for silent samples befor limiting	2017-03-09 14:31:54 -05:00
Zach Pomerantz	e69d6d8b5f	track silent listeners in audio-mixer	2017-03-09 14:31:41 -05:00
David Rowe	c7d1aa8ff4	Make attachments list flickable	2017-03-10 08:26:00 +13:00
Brad Hefta-Gaub	45efb235e3	Merge pull request #9842 from ZappoMan/tellCodecAboutSilence ... improved noise gate	2017-03-09 11:04:22 -08:00
druiz17	8490379517	Merge pull request #9795 from ctrlaltdavid/21197 ... Port avatar settings to tablet	2017-03-09 09:36:24 -08:00
druiz17	0069569e96	Merge branch 'tablet-ui' into 21197	2017-03-09 09:31:15 -08:00
druiz17	8750982567	Merge pull request #9785 from druiz17/menuFix ... More dialog porting to tablet	2017-03-09 09:29:31 -08:00
Seth Alves	d1e54d0838	Merge pull request #9846 from sethalves/tablet-ui-quick-summon-1 ... Tablet ui quick summon 1	2017-03-09 09:18:17 -08:00
Seth Alves	023b01814e	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-quick-summon-1	2017-03-09 09:16:37 -08:00
druiz17	007ed9fe81	Merge pull request #9836 from druiz17/2-tablets-fix ... Fixed having more than one tablet when reloading scripts	2017-03-09 09:13:14 -08:00
druiz17	840e29c8b9	Merge pull request #9840 from druiz17/close-tablet-during-switch ... Close tablet when switching from HMD to desktop and vice versa	2017-03-09 09:12:29 -08:00
Dante Ruiz	b58a27cf10	Merge branch 'tablet-ui-edit-js' of github.com:sethalves/hifi into menuFix	2017-03-09 16:26:28 +00:00
Brad Hefta-Gaub	bdab24d9bf	fix spelling	2017-03-09 08:25:56 -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
Brad Hefta-Gaub	79d8d90581	CR feedback	2017-03-08 20:35:24 -08:00
Brad Hefta-Gaub	2d595c1f87	CR feedback	2017-03-08 20:29:32 -08:00
Anthony J. Thibault	1acc5ea760	Finger now points when near tablet + deadspot added when touching the tablet	2017-03-08 19:03:56 -08:00
Brad Hefta-Gaub	60daaba525	small cleanup	2017-03-08 17:30:44 -08:00
Brad Hefta-Gaub	1bdad89cbe	properly handle silent packet transitions	2017-03-08 17:27:46 -08:00
Andrew Meadows	30d7ffb303	fix warning about signed unsigned compare	2017-03-08 17:17:49 -08:00
Dante Ruiz	2a275a4f4b	removed tab at the end of word	2017-03-09 00:15:02 +00:00
Andrew Meadows	5847f86db8	fix crash when unpacking too many joints	2017-03-08 16:12:03 -08:00
Seth Alves	9435c58c2c	Merge branch 'tablet-ui-edit-js' of github.com:sethalves/hifi into tablet-ui-quick-summon-1	2017-03-08 16:10:38 -08:00
Dante Ruiz	b878f164fb	minimize diff again	2017-03-09 00:10:38 +00:00
Seth Alves	7f47835733	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js	2017-03-08 16:10:18 -08:00