4877 commits

Author	SHA1	Message	Date
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
Brad Davis	9f7b6f543d	Merge remote-tracking branch 'upstream/master' into HEAD	2017-12-18 11:17:07 -08: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
Sam Gateau	a75010fb94	Merge pull request #11938 from Zvork/csm ... Cascaded Shadow Maps and bug fix	2017-12-14 00:32:43 +07: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
Seth Alves	3a00d31c15	oops	2017-12-12 12:59:35 -08:00
Seth Alves	dba05ae8e2	try harder to keep setTimeout loop going in controller-dispatcher	2017-12-12 12:38:01 -08:00
David Rowe	25214aad23	Code review	2017-12-13 08:56:36 +13:00
David Rowe	380cd7aac6	Tune particle effects to be similar to before	2017-12-12 17:35:37 +13:00
David Rowe	4327906630	Reduce communications load when making a user connection	2017-12-12 16:39:49 +13:00
Seth Alves	2cd64ccd2c	merge from upstream	2017-12-11 10:14:30 -08:00
Zach Fox	b81cdf49ef	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist	2017-12-11 09:52:32 -08:00
Sam Gateau	cc4b266647	Add names to objects of the selection, remove comments in shader and fix one more warning on linux	2017-12-11 00:31:54 -08:00
Olivier Prat	a679dc6705	Merge branch 'master' of git://github.com/highfidelity/hifi into csm	2017-12-11 08:48:48 +01:00
Sam Gateau	bb888f2d4c	Replace the name opacity for alpha	2017-12-10 23:07:06 -08:00
Sam Gateau	eec4e966a7	Fix the linux build and correct the name of the property Intensity to Opacity	2017-12-10 10:13:49 -08:00
Sam Gateau	429d54d65d	Merge branch 'master' of https://github.com/highfidelity/hifi into light	2017-12-10 09:53:22 -08:00
Zach Fox	b5899f7a00	Merge pull request #11957 from zfox23/commerce_fixEditDependencies ... Further remove dependencies of marketplaces.js on edit.js	2017-12-08 16:48:37 -08:00
Dante Ruiz	f4a9acab92	Merge pull request #11833 from druiz17/controllerDispatcher-interval ... change controllerDispatcher to setTimeOut update	2017-12-08 16:36:46 -08:00
Zach Fox	a99072622a	Fix Create mode :|	2017-12-08 15:41:47 -08:00
Zach Fox	be737af79d	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_fixEditDependencies	2017-12-08 14:08:35 -08:00
Zach Fox	a81a981676	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist	2017-12-08 09:44:52 -08:00
samcake	9a4f667059	Merge branch 'master' of https://github.com/highfidelity/hifi into light	2017-12-08 08:50:33 -08:00
Seth Alves	edd6c0ee76	Merge branch 'scale-wearables-with-avatar-3' of github.com:sethalves/hifi into scale-wearables-with-avatar-3	2017-12-08 07:19:45 -08:00
Seth Alves	d095d4ef44	Merge branch 'master' of github.com:highfidelity/hifi into scale-wearables-with-avatar-3	2017-12-08 07:19:33 -08:00
Seth Alves	a7a6dee8e0	Merge pull request #11950 from hyperlogic/bug-fix/hand-scaling ... Fix for hand controller avatar scaling.	2017-12-08 07:17:59 -08:00
Seth Alves	91b2d8df8a	Merge pull request #11874 from luiscuenca/audioscope ... Improve Audio Scope	2017-12-08 07:15:28 -08:00
Seth Alves	86a1bc75c9	Merge pull request #11897 from Delanir/Gizmos ... IPD Secondary Task List: edit.js arrow orientation: Yaw, Pitch, Roll tools	2017-12-08 07:09:09 -08:00
Seth Alves	dfbd6bcd8d	Merge pull request #11933 from druiz17/fix-far-to-equip ... fix far grab to equip transition	2017-12-08 07:04:54 -08:00