62814 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Zach Fox	7113a72f2e	Bugfixes	2017-12-12 18:04:20 -08:00
luiscuenca	a1f1e7b587	Fix web entities accessing the webcam RC61	2017-12-12 18:20:29 -07: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
Zach Fox	bced55801d	ABC ORDER!	2017-12-12 15:52:35 -08:00
Zach Fox	f5df83667f	Add getStaticCertificateJSON() to Entity Scripting Interface	2017-12-12 15:50:04 -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
Andrew Meadows	87fa919ac8	save files to Documents by default	2017-12-12 14:11:25 -08: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
Zach Fox	1bd12857ef	Add static certificate JSON versioning; add serverScripts to cert JSON	2017-12-12 12:07:08 -08:00
David Rowe	25214aad23	Code review	2017-12-13 08:56:36 +13:00
Seth Alves	7d2d8e7c05	Merge branch 'master' of github.com:highfidelity/hifi into scale-wearables-with-avatar-3	2017-12-12 09:25:44 -08:00
amantley	079d9639e4	Got rid of the while loop in updateFrameCount in ModelEntityItem_cpp	2017-12-12 09:12:11 -08:00
amantley	29538851b6	Made the changes from the latest code review, except getting rid of the ... while loop.	2017-12-12 09:06:43 -08: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
SamGondelman	ce96fa7078	change hysteresis values based on testing	2017-12-11 17:32:58 -08:00
Zach Fox	2225352b1e	Fix wallet setup	2017-12-11 17:15:15 -08: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
Andrew Meadows	74a1f5de96	remove bullet stats when physics stats disabled	2017-12-11 11:31:00 -08:00
Andrew Meadows	406bf7898d	cleanup prof stats and trace context names	2017-12-11 11:31:00 -08:00
Andrew Meadows	2538204b1e	expose physics simulation stats to Test JS API	2017-12-11 11:31:00 -08:00
Andrew Meadows	4540e9e483	add ability to save simulation stats to file	2017-12-11 11:31:00 -08:00
Andrew Meadows	fcff9d7e36	use class hierarchy instead of lambdas	2017-12-11 11:31:00 -08:00
Andrew Meadows	068d04c58d	abstraction of recursion through bullet perf stats	2017-12-11 11:31:00 -08:00
amantley	65bb896450	Merge remote-tracking branch 'origin/master' into character_entity_fixes	2017-12-11 10:55:54 -08:00
Zach Fox	2d786451c2	Add comment	2017-12-11 10:50:24 -08:00
Seth Alves	2cd64ccd2c	merge from upstream	2017-12-11 10:14:30 -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	b81cdf49ef	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist	2017-12-11 09:52:32 -08: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