1671 commits

Author	SHA1	Message	Date
Seth Alves	756d96c368	fix search ray getting left on. started adding stylus models	2017-01-16 07:46:12 -08:00
Seth Alves	c2d6bf10d2	hard-code dimensions on home-button so that it doesn't sometimes show-up with the wrong size	2017-01-16 06:47:50 -08:00
Seth Alves	4a451e95dc	don't call release when off state is entered. don't attempt to unhook stylus as a stray child	2017-01-15 11:29:29 -08:00
Seth Alves	b8234ad75c	try a different way of keeping track of original parentIDs of grabbed entities	2017-01-15 10:16:28 -08:00
Seth Alves	e46b40e729	adjust overlay position so that it shows up on new tablet fbx	2017-01-13 16:14:12 -08:00
Seth Alves	e00814dd53	auto-end a near-grab if the parentID is changed to something else	2017-01-13 14:21:44 -08:00
Seth Alves	9430d2a58d	get marketplace-in-tablet working again	2017-01-13 11:03:02 -08:00
Seth Alves	9de8144f0d	merge from upstream	2017-01-13 10:17:03 -08:00
Seth Alves	f9a36d68ad	Merge pull request #9363 from ctrlaltdavid/21127 ... Make Clara.io downloads convert textures to PNG	2017-01-13 10:14:43 -08:00
Seth Alves	208c4686c4	merge from upstream	2017-01-12 15:44:27 -08:00
David Rowe	d7ab7316a8	Tidying	2017-01-13 12:28:53 +13:00
David Rowe	ad5822d96d	Fix first progress message box not closing	2017-01-13 12:26:42 +13:00
David Rowe	632989e031	Fix progress messages not displaying in HMD	2017-01-13 12:09:22 +13:00
Seth Alves	b4870a14fa	Merge pull request #9372 from druiz17/removeHud ... Completely removed HUD	2017-01-12 14:24:40 -08:00
David Rowe	6f2386eabd	Fix processing of Clara.io status messages	2017-01-13 11:20:00 +13:00
Seth Alves	9c148d2be0	Merge pull request #9370 from sethalves/tablet-ui-no-accidental-static-on-release ... make sure dynamic things are moving at least a little upon release	2017-01-12 13:46:50 -08:00
Seth Alves	611a926894	if something dynamic is release and it's not moving, give it a little velocity so that it doesn't end up non-active in bullet	2017-01-12 13:45:03 -08:00
Seth Alves	1a0a013edd	Merge pull request #9369 from hyperlogic/tablet-ui2 ... Tablet springboard can now be scrolled	2017-01-12 13:38:46 -08:00
Anthony J. Thibault	b251dc9ed6	Tablet springboard can now be scrolled	2017-01-12 13:11:27 -08:00
Dante Ruiz	71083645e9	branch update	2017-01-12 20:51:25 +00:00
David Rowe	4dee0efdd3	Use more reliable Clara.io API parameters	2017-01-13 09:12:49 +13:00
Dante Ruiz	a16b229c65	begining to remove hud items	2017-01-12 10:49:45 -08:00
Dante Ruiz	7d84aae670	closing tablet when taking snapshot	2017-01-12 17:29:38 +00:00
David Kelly	e36f6b6521	Merge branch 'master' of github.com:highfidelity/hifi into dk/letsHover	2017-01-12 08:40:04 -07:00
David Rowe	d45e6f00cb	Prepare only one download at a time	2017-01-12 22:35:42 +13:00
David Rowe	288c069687	Make cancelling downloads more robust	2017-01-12 22:31:09 +13:00
David Rowe	6e622b3719	Don't request model be centered as work-around for downloads failing	2017-01-12 21:35:24 +13:00
David Rowe	cbe8ce0c19	Improve handling of zip file generation failing	2017-01-12 21:33:32 +13:00
David Rowe	9587b6a80e	Fix initial marketplace URL	2017-01-12 20:53:57 +13:00
David Rowe	37da800a14	Display Clara model preparation progress	2017-01-12 15:47:41 +13:00
howard-stearns	88c2c534ad	don't set bogus values	2017-01-11 17:01:46 -08:00
howard-stearns	9298bcf628	remove log spam	2017-01-11 16:32:15 -08:00
howard-stearns	5c06841732	use update signal instead of timer	2017-01-11 16:24:05 -08:00
howard-stearns	357b4db1db	fix mouse vs lasers, again	2017-01-11 14:24:24 -08:00
howard-stearns	a808a8c749	revert "fix competition between seek mouse and lasers"	2017-01-11 14:23:18 -08:00
David Kelly	1e3a00d1fb	Enable the LT and RT signals, use them ... A bit cleaner. Still have to keep track of which hand is the mouse, but this removes some of the hacky code.	2017-01-11 14:43:37 -07:00
David Rowe	9bdcdf73c1	User must be logged into Clara.io site to download	2017-01-12 09:15:01 +13:00
Seth Alves	c76987c179	Merge pull request #9351 from sethalves/tablet-ui-show-lasers-when-scrolling ... update lasers when distance-scrolling a web entity/overlay	2017-01-11 10:45:25 -08:00
Seth Alves	bacc796730	Merge branch 'master' of github.com:highfidelity/hifi into update-tablet-ui-again	2017-01-11 09:54:26 -08:00
Dante Ruiz	2d8d5401dc	updated tablet position	2017-01-11 08:41:07 -08:00
David Rowe	71d6a5cb1d	Implement model request and download	2017-01-11 21:33:03 +13:00
David Rowe	530b176d09	Replace Clara download button with own	2017-01-11 16:36:18 +13:00
David Kelly	0a018e133d	Blue laser should be enough to hover	2017-01-10 18:23:39 -07:00
Seth Alves	c93d83dadd	update lasers when distance-scrolling a web entity/overlay	2017-01-10 16:41:07 -08:00
Dante Ruiz	0b3a7d90f1	removed committed code	2017-01-10 23:26:37 +00:00
David Kelly	4fade3a53e	CR feedback	2017-01-10 16:12:02 -07:00
David Kelly	5fd11ade9c	minor tweak to hover color for glow effect	2017-01-10 16:00:19 -07:00
Dante Ruiz	d0baa0e303	home button works with the stylus	2017-01-10 14:51:46 -08:00
David Kelly	2d55ed2658	Fix hover - probably my merge didn't get this line	2017-01-10 15:51:24 -07:00
druiz17	ad48e79053	Merge pull request #9346 from hyperlogic/tablet-ui ... In desktop mode, tablet is in front of camera.	2017-01-10 14:48:15 -08:00