62519 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Stephen Birarda	8a2c31d342	only de-activate the SendQueue when it has nothing to send	2017-12-14 16:41:20 -08:00
Stephen Birarda	cf28fdf188	fix message erase in conn, SendQueue ctor order	2017-12-14 16:41:20 -08:00
Atlante45	34c1c27455	Keep track of message numbers	2017-12-14 16:41:20 -08:00
Atlante45	702d2c34a5	Reset ACK in ctor	2017-12-14 16:41:20 -08:00
Atlante45	b2beeae6b1	Keep connection alive as long as the node is connected	2017-12-14 16:41:20 -08: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
NissimHadar	df34103895	Merge pull request #11980 from NissimHadar/crashFix10537 ... Protect against use of null HazePointer.	2017-12-14 11:45:49 -08:00
Stephen Birarda	fa75320acf	Merge pull request #11984 from birarda/bug/macdeployqt-for-oven ... fix rpath for oven on OS X	2017-12-14 10:26:13 -08:00
Stephen Birarda	88831ff08a	don't trigger unix step on apple for oven	2017-12-13 18:39:19 -08:00
Stephen Birarda	0b598ea948	fix RPATH for oven so it loads things from macdeployqt	2017-12-13 18:39:19 -08:00
Zach Fox	ed5082e5d4	Merge pull request #11974 from birarda/feat/staging-env-or-cl ... allow custom metaverse URL to be used with env var	2017-12-13 17:29:45 -08:00
Nissim Hadar	79f0124244	Protect against use of null HazePointer.	2017-12-13 15:02:03 -08:00
Zach Fox	f0507e1608	Merge pull request #11972 from zfox23/commerce_fixWalletStatus1 ... Set Wallet Status to 'Ready' after correctly authenticating wallet	2017-12-13 13:19:54 -08:00
Nissim Hadar	b4df115507	Protect against use of null HazePointer.	2017-12-13 12:53:01 -08:00
Zach Fox	efd5c0ccb7	Add comment as per CR	2017-12-13 11:53:26 -08: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
Sam Gateau	4e68663cfc	Merge pull request #11970 from SamGondelman/circleFix ... Fix Circle3DOverlays uninitialized member variables, cloning, getProperty	2017-12-14 00:30:18 +07:00
Seth Alves	d3e24d3629	Merge pull request #11960 from ElderOrb/FB10334 ... 10334 Unable to type in Go To app search bar after UI reappears from …	2017-12-13 09:06:53 -08: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
Olivier Prat	19e240460d	Slightly optimized matrix operations in LightStage as samcake's remark	2017-12-13 15:30:57 +01:00
MiladNazeri	8a28d04322	Merge pull request #11885 from ctrlaltdavid/21624 ... Overlays JSDoc	2017-12-12 17:04:46 -08:00
Seth Alves	4956978c76	Merge pull request #11973 from luiscuenca/webPrivacyFix ... Fix web entities accessing the webcam	2017-12-12 17:01:38 -08:00
Stephen Birarda	7a81c3e8e7	allow passing of custom URL on env	2017-12-12 16:32:43 -08:00
Stephen Birarda	139976d8bb	allow staging METAVERSE_SERVER_URL to be toggled by env	2017-12-12 16:22:08 -08:00
Ken Cooke	55ad42c40b	Merge pull request #11967 from ctrlaltdavid/21638 ... Reduce communications load of making user connection	2017-12-12 16:03:28 -08:00
luiscuenca	2d21f4d364	Fix web entities accessing the webcam	2017-12-12 16:00:17 -07:00
Sam Gondelman	e5a4f077c9	Merge pull request #11964 from SamGondelman/memFix ... Remove unneeded getDedicatedMemory	2017-12-12 14:43:15 -08:00
David Rowe	92be33da31	Web3d overlay's "resolution" property has been removed	2017-12-13 11:40:44 +13:00
David Rowe	650e7e1922	Document that getProperty() only works for 3D overlays	2017-12-13 10:34:33 +13:00
SamGondelman	16f545a9e8	fix circle3d overlays	2017-12-12 13:25:47 -08:00
Zach Fox	623e6395be	Set Wallet Status to 'Ready' after correctly authenticating wallet	2017-12-12 13:01:14 -08:00
Seth Alves	3a00d31c15	oops	2017-12-12 12:59:35 -08:00
David Rowe	578c42b4ea	Merge branch 'master' into 21624	2017-12-13 09:41:09 +13:00
Seth Alves	dba05ae8e2	try harder to keep setTimeout loop going in controller-dispatcher	2017-12-12 12:38:01 -08:00
MiladNazeri	cf3e9f78c9	Merge pull request #11884 from ctrlaltdavid/21603 ... Quat JSDoc	2017-12-12 12:20:23 -08:00
MiladNazeri	16e16501cd	Merge pull request #11791 from ctrlaltdavid/21602 ... JSDoc updates	2017-12-12 12:18:02 -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	b2c4cdc613	Merge pull request #11962 from AndrewMeadows/fix-avatar-mixer-crash-on-sort ... fix avatar-mixer crash during sort	2017-12-11 15:36:33 -08:00
SamGondelman	ae625306ff	remove getDedicatedMemory	2017-12-11 14:54:29 -08:00
Andrew Meadows	db6505493f	fix avatar-mixer crash: don't use global callback	2017-12-11 14:04:39 -08:00
David Rowe	58fa8b9fbf	Miscellaneous fixes	2017-12-12 10:49:05 +13:00
Howard Stearns	8e36228c12	Merge pull request #11948 from MandatoryMania/noFundsSymbol ... Provides a nice alert in case of insufficient funds to make a purchase	2017-12-11 11:45:27 -08:00
Sam Gateau	0ff91e5926	Merge pull request #11952 from samcake/light ... Exposing multi highlight and selection feature to js api	2017-12-12 01:09:15 +07:00
Zach Fox	006ea3342c	Merge pull request #11959 from zfox23/commerce_removeBuyEndpoint ... Remove useless Wallet.buy() scripting endpoint	2017-12-11 09:33:18 -08:00
samcake	63fb9b5503	fix float literal syntax	2017-12-11 09:30:31 -08:00
Clément Brisset	833f98b98b	Merge pull request #11920 from Atlante45/feat/reduce-memory-usage ... Reduce Image library memory usage	2017-12-11 09:29:22 -08:00
samcake	1008175a92	Removing commented code	2017-12-11 09:28:33 -08:00