4928 commits

Author	SHA1	Message	Date
Brad Hefta-Gaub	a7b56da570	Merge pull request #12103 from ZappoMan/emoteApp ... first cut at an emote app	2018-01-09 15:23:14 -08:00
ZappoMan	4f1dc2f184	fix CR comments	2018-01-09 13:42:51 -08:00
Zach Fox	0bc483f7a6	Merge pull request #12096 from ElderOrb/FB5648 ... 5648 play audio notification to confirm purchase upon rezzing	2018-01-09 12:32:28 -08:00
Thijs Wenker	88d353a642	Merge pull request #12105 from misslivirose/feat/make-zones-lights-not-grabbable ... Make zones, lights, and particles not grabbable when created in edit.js	2018-01-09 18:26:13 +01:00
Alexander Ivash	7e87cb38e1	adjusted code to PR comments	2018-01-09 11:10:23 +03:00
ZappoMan	1fd9eae2b5	make second click stop animation if still playing, and shrink animation files	2018-01-08 17:57:12 -08:00
ZappoMan	0d1b34f487	make animation 60fps	2018-01-08 17:32:22 -08:00
Anthony Thibault	f4c38b91b3	Merge pull request #12071 from luiscuenca/handTouch ... Touch feeling for near grab	2018-01-08 12:50:30 -08:00
Liv Erickson	d1e176ee9d	Update menu to reflect non-grabbable entity types, include particles	2018-01-08 11:31:09 -08:00
Dante Ruiz	fd83e00df4	fix tablet interaction and far grab functionallity	2018-01-08 11:30:21 -08:00
Alexander Ivash	9a63fc94f0	5648 play audio notification to confirm purchase upon rezzing	2018-01-08 21:14:44 +03:00
ZappoMan	1dc24072dc	cleanup a few things in emote App	2018-01-08 09:04:07 -08:00
ZappoMan	c4d0872bbf	first cut at an emote app	2018-01-07 22:28:50 -08:00
luiscuenca	8a7c68829d	Optimizations, cleanings and globals	2018-01-07 11:56:30 -07:00
Liv Erickson	4e582975b6	cleanup	2018-01-05 18:03:20 -08:00
Liv Erickson	f563b8ca2e	Make zones and lights not default grabbable	2018-01-05 17:49:43 -08:00
Zach Fox	0c38a5598f	Merge pull request #12085 from zfox23/commerce_fixHandControllerInspection ... Fix bugs related to inspecting entities with hand controllers	2018-01-05 15:50:00 -08:00
luiscuenca	4f6a804fd1	Fix magic numbers	2018-01-05 16:27:48 -07:00
Andrew Meadows	b28684f15e	Merge pull request #12087 from ctrlaltdavid/21661 ... Laser auto-on with tablet and Web overlays	2018-01-05 14:08:01 -08:00
David Rowe	5431b7137b	Code review	2018-01-06 08:27:24 +13:00
luiscuenca	d0bc881bb2	Load script manually	2018-01-05 12:20:41 -07:00
Melissa Brown	933720fb10	Merge pull request #12012 from Delanir/Case10633 ... Cases 10632 and 10633 Particle Explorer UI	2018-01-05 10:46:41 -08:00
luiscuenca	108748ca96	smooth transitions and slower back to default	2018-01-05 09:55:50 -07:00
David Rowe	69dff9ac09	Remove unused code	2018-01-05 16:16:55 +13:00
David Rowe	4b2ed44322	Reduce incidence of tablet screen being rotated w.r.t. model	2018-01-05 16:16:42 +13:00
David Rowe	936b5f3571	Laser on tablet bezel as well as screen and "x" button	2018-01-05 16:15:59 +13:00
David Rowe	67eb282815	Don't swap hands if both triggers are squeezed	2018-01-05 12:12:36 +13:00
David Rowe	27bed8d1f1	Tidying	2018-01-05 11:05:49 +13:00
David Rowe	fb09a9724e	Change laser hand with trigger squeeze	2018-01-05 11:04:09 +13:00
David Rowe	9f7a2b18e6	Use laser from dominant hand if both hands are pointing at the tablet	2018-01-05 10:04:39 +13:00
David Rowe	02f4085368	Fix magic number	2018-01-05 09:00:53 +13:00
luiscuenca	367e2266f7	Fix eslint	2018-01-04 12:04:52 -07:00
luiscuenca	ef0164c272	Fix tabs	2018-01-04 11:43:51 -07:00
luiscuenca	28d9409bf0	Fix default hand poses	2018-01-04 11:37:37 -07:00
David Rowe	6095a90e69	Don't display default lasers when Shapes app is active	2018-01-04 21:09:38 +13:00
David Rowe	6c16fcfe65	Fix tablet laser when Shapes app is running	2018-01-04 16:37:20 +13:00
David Rowe	7236ac17e2	Merge branch 'master' into 21661	2018-01-04 15:21:00 +13:00
David Rowe	efa6f1f02f	Use "Prefer Stylus Over Laser" setting	2018-01-04 15:00:17 +13:00
Zach Fox	ff4f582c7d	Thanks Howard	2018-01-03 17:23:35 -08:00
Zach Fox	8d4a6f01cb	Fix bugs related to inspecting entities with hand controllers	2018-01-03 16:03:37 -08:00
David Rowe	6e43497e14	Merge tag 'RELEASE-7602' into 21661 ... Jenkins Git plugin tagging with RELEASE-7602	2018-01-03 16:46:10 +13:00
Zach Fox	917db14879	Add a link to My Purchases from Wallet Home	2018-01-02 15:26:11 -08:00
Zach Fox	47a209dc4c	Make things slightly better?	2018-01-02 13:11:00 -08:00
Zach Fox	25e76c668b	Fix marketplacesInject.js for local Metaverse	2018-01-02 12:22:40 -08:00
luiscuenca	47dbb0c168	load script manually	2017-12-29 15:35:44 -07:00
luiscuenca	49bd62ca29	Touch feeling for near grab	2017-12-29 14:04:36 -07:00
Seth Alves	96197e66bb	Merge branch 'master' of github.com:highfidelity/hifi into scale-wearables-with-avatar-3	2017-12-22 15:13:02 -08:00
Seth Alves	897b96d092	Merge branch 'master' of github.com:highfidelity/hifi into scale-wearables-with-avatar-3	2017-12-22 07:36:26 -08:00
Zach Fox	618e5c9032	Commerce Data Tracking: Iteration 3 (Purchases)	2017-12-21 15:46:01 -08:00
Zach Fox	08edc52932	Merge pull request #12025 from zfox23/commerce_fixWalletSetupCancel ... Commerce: Fix the behavior of the 'cancel' button in Wallet Setup	2017-12-20 09:18:10 -08:00