1884 commits

Author	SHA1	Message	Date
Brad Hefta-Gaub	b7f48644af	Merge pull request #9955 from druiz17/tablet-edit-selecting ... Fix edit.js from deselecting an object when trying to delete it	2017-03-21 09:27:30 -07:00
Seth Alves	bc90e9081b	Merge pull request #9957 from hyperlogic/bug-fix/tablet-scale ... Tablet scale settings now take effect soon after they are changed.	2017-03-20 15:05:47 -08:00
Anthony J. Thibault	f5c3d41f2c	Tablet scale settings now take effect soon after they are changed.	2017-03-20 14:51:47 -07:00
Dante Ruiz	de24023a21	Fix edit.js from deselecting an object when trying to delete it	2017-03-20 20:43:32 +01:00
Seth Alves	8988110c3b	Merge pull request #9953 from fayeli/edit-export-entities ... Adding Export Entities Functionality in Tablet Edit	2017-03-20 11:35:18 -08:00
Faye Li	f57905fbb3	remove code for jump to selection	2017-03-20 10:23:55 -07:00
Seth Alves	2e29ff3114	Merge pull request #9934 from fayeli/edit-import-entities ... Adding Import Entities button on the Create tab of Edit	2017-03-20 09:13:08 -08:00
Faye Li	197a06c423	changes in TWO entityList.js to register the export event	2017-03-17 16:17:21 -07:00
Faye Li	1a46f18aa3	adding export button + hiding jump to selection	2017-03-17 15:56:55 -07:00
Faye Li	6531efffbc	hook up qml button to edit.js	2017-03-17 11:22:07 -07:00
Seth Alves	df84ff27e9	Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-ui	2017-03-17 07:52:22 -07:00
Seth Alves	a5d19439f9	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-03-16 16:32:07 -07:00
Seth Alves	31e0cfe296	Merge pull request #9825 from thoys/record-fixes ... Avatar Recorder and Playback Fixes	2017-03-16 07:27:42 -08:00
Dante Ruiz	a5f1fb9e9a	fixed notification spelling error	2017-03-15 19:45:30 +01:00
Dante Ruiz	dac16af1df	Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-notifcation	2017-03-15 19:27:11 +01:00
Dante Ruiz	4bc050e583	added tablet notification	2017-03-15 19:26:50 +01:00
Seth Alves	96a3e2a6d3	Merge pull request #9898 from ctrlaltdavid/21214 ... Load controller scripts in their own script engine	2017-03-15 08:42:20 -08:00
Seth Alves	b5919d89a5	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-03-15 08:26:10 -08:00
David Rowe	cb4bd58381	Load controller scripts in their own script engine	2017-03-15 14:31:13 +13:00
Seth Alves	524e4bdfbc	Merge pull request #9853 from sethalves/tablet-ui-fix-edit-props-race ... Tablet ui fix edit props race	2017-03-13 08:56:56 -08:00
Brad Hefta-Gaub	23e47f2fdc	added icons to the audioScope app	2017-03-10 18:13:35 -08:00
Brad Hefta-Gaub	b8a2525f9e	add auto pause/resume to the Audio Scope App	2017-03-10 17:38:00 -08:00
Anthony J. Thibault	3abc78e7d3	Fix for finger/sytlus on invisible/hidden tablet.	2017-03-10 17:18:13 -08:00
Brad Hefta-Gaub	5f3ee2e98f	add a basic tablet app for the audio scope	2017-03-10 17:08:54 -08:00
Anthony J. Thibault	07e10ae862	Merge branch 'tablet-ui' into feature/can-touch-this	2017-03-10 17:05:26 -08:00
Seth Alves	2098cd5b5e	remove stylus and search-beams when grab script is shut down	2017-03-10 13:02:16 -08:00
Seth Alves	88e74251a1	cleanups	2017-03-10 12:51:34 -08: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	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	d792559d9a	have edit.js resend properties of selected entity to entityProperties.js once it's ready	2017-03-10 09:59:23 -08: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
Anthony J. Thibault	6f53aaed5c	Small simplification of building stylusTarget list.	2017-03-09 14:04:13 -08:00
druiz17	0069569e96	Merge branch 'tablet-ui' into 21197	2017-03-09 09:31:15 -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
Anthony J. Thibault	1acc5ea760	Finger now points when near tablet + deadspot added when touching the tablet	2017-03-08 19:03:56 -08:00
Dante Ruiz	2a275a4f4b	removed tab at the end of word	2017-03-09 00:15:02 +00: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
Dante Ruiz	f6d799c048	minimize diff	2017-03-09 00:09:32 +00:00
Dante Ruiz	561bd27c38	minimize diff	2017-03-09 00:08:50 +00:00
Dante Ruiz	5f7a0ea8fc	Close tablet when switching form HMD to desktop and vice versa	2017-03-09 00:05:26 +00:00
Seth Alves	6aac2eb338	for overlay tablets, precreate them so that they show up quickly when summoned	2017-03-08 15:31:24 -08:00
Seth Alves	de2dd7383d	didn't need invis flag, after all	2017-03-08 15:30:49 -08:00
Dante Ruiz	ce105e0329	fix double tablets when reloading scripts	2017-03-08 22:21:57 +00:00
Dante Ruiz	881213259d	Merge branch 'master' of github.com:highfidelity/hifi into toolbar-window-dont-close	2017-03-08 21:44:20 +00:00