3636 commits

Author	SHA1	Message	Date
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
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
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
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
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
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
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
Zach Fox	297a3df63c	Merge pull request #11815 from zfox23/commerce_QmlWhitelist ... QML Whitelisting + Commerce Integration	2017-12-19 18:07:14 -08:00
Zach Fox	a72ed27a25	CR feedback	2017-12-19 16:57:48 -08:00
Zach Fox	5da49d156e	Commerce: Fix the behavior of the 'cancel' button in Wallet Setup	2017-12-19 16:26:58 -08:00
Zach Fox	ed5da4f83b	Fix bug preventing 'get' buttons from working in marketplace	2017-12-19 15:07:50 -08:00
Zach Fox	18d5be147c	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist	2017-12-19 09:48:15 -08:00
David Kelly	4fc69f8067	Merge pull request #11988 from davidkelly/dk/soldOut ... Handle sold out items a bit better	2017-12-19 07:43:57 -07:00
Brad Davis	2fcf11455b	Fixing edit state detection	2017-12-18 14:03:13 -08:00
Daniela Fontes	b392bafc5a	Merge Case 10632 and 10633.	2017-12-18 21:12:18 +00:00
Daniela Fontes	9381d21767	Merge branch 'Case10632' into Case10633	2017-12-18 21:08:30 +00:00
Brad Davis	9f7b6f543d	Merge remote-tracking branch 'upstream/master' into HEAD	2017-12-18 11:17:07 -08:00
Artur Gomes	80898d9336	Fix sections styling for Particle Explorer tab.	2017-12-18 18:36:32 +00:00
Daniela Fontes	fcdb9b6cbe	Particle Emitter 'Show Properties' button now changes to 'Hide Properties' when properties are already visible	2017-12-18 15:21:23 +00:00
David Rowe	5e19410293	Fix handshake satyhing on when release "x" if Ctrl or similar pressed	2017-12-17 15:23:40 +13:00
Brad Hefta-Gaub	95bfacb850	Merge pull request #11977 from ctrlaltdavid/21643 ... Enable user connection with "x" key when capslock is on	2017-12-15 15:22:00 -08:00
Brad Hefta-Gaub	6aebfd61c5	Merge pull request #11999 from luiscuenca/laserScaleFix ... Make lasers scale with avatar	2017-12-15 15:21:01 -08:00
luiscuenca	53e1c57e3b	Make lasers scale with avatar	2017-12-15 13:46:15 -07:00
Zach Fox	94bd8d8673	Merge pull request #11991 from zfox23/commerce_fixBrokenBuyButtons ... Fix broken Buy buttons on main Marketplace page	2017-12-14 12:48:09 -08:00
Zach Fox	74a5f0881f	Fix broken Buy buttons on Marketplace	2017-12-14 11:56:36 -08:00
David Kelly	a49ee46f54	Handle sold out items a bit better	2017-12-14 11:52:56 -07:00
Zach Fox	3764445272	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist	2017-12-13 14:12:08 -08:00
David Rowe	627ce8ab87	Enable user connection with "x" key when capslock is on	2017-12-14 08:52:21 +13:00
Brad Hefta-Gaub	9bbe696a87	Merge pull request #11971 from sethalves/possible-fix-for-tablet-freezing ... possible fix for tablet freezing	2017-12-13 08:59:17 -08:00