81208 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Andrew Meadows	03db88009f	simplify add/removal to EntitySimulation	2019-10-07 14:38:36 -07:00
Andrew Meadows	c8e875ff72	remove cruft	2019-10-07 14:35:28 -07:00
Andrew Meadows	72ba94f2cd	unravel more spaghetti into PhysicalEntitySimulation	2019-10-07 14:35:28 -07:00
Andrew Meadows	86c60204fd	move entity Action serialization to PhysicalEntitySimulation	2019-10-07 14:35:28 -07:00
Sam Gateau	42bc91b389	Merge branch 'master' of github.com:highfidelity/hifi into instancing	2019-10-07 09:42:14 -07:00
Shannon Romano	3db915c432	Merge pull request #16275 from dooglifeSF/sit_variants_and_fidgets ... Sit variants and fidgets	2019-10-07 09:14:38 -07:00
Shannon Romano	5bbe271c7a	Merge pull request #16299 from ctrlaltdavid/DOC-187 ... DOC-187: Mat4 JSDoc	2019-10-07 09:11:32 -07:00
Simon Walton	f020ab83c8	Merge pull request #16295 from SimonWalton-HiFi/ess-send-stats ... DEV-2309: Report ESS stats to domain server	2019-10-06 01:48:27 -07:00
Brad Davis	b2bcf54b5b	Removing frame converter	2019-10-04 19:52:55 -07:00
Brad Davis	d69a83a2f2	fix warnings	2019-10-04 18:20:10 -07:00
Sam Gateau	09a8d69555	landing on the new code base	2019-10-04 18:02:45 -07:00
Zach Fox	5e7bb4be91	Merge pull request #16221 from zfox23/handleHrefBetter ... DEV-611: Ensure that entities with the link property set can be clicked in Desktop and VR modes	2019-10-04 17:36:56 -07:00
Shannon Romano	921cec872b	Merge pull request #16300 from hyperlogic/bug-fix/mat4-forward-right-up-fixes ... Fix for Mat4.getForward, getRight and getUp	2019-10-04 17:00:43 -07:00
David Rowe	70577b8f34	Remove "not working" warnings in anticipation of fix	2019-10-05 12:13:57 +13:00
Simon Walton	67d80cdd15	Add per-Node & ESS-specific stats	2019-10-04 15:38:05 -07:00
dooglifeSF	387f0a3f10	add isInput* and isNotInput vars for use in json, and edit json to use them	2019-10-04 15:28:35 -07:00
jennaingersoll	aab66a2675	Merge pull request #16266 from ctrlaltdavid/DOC-107 ... DOC-107: Fix description of entity acceleraton property and deprecate	2019-10-04 15:17:21 -07:00
Shannon Romano	f797f714bd	Merge pull request #16298 from luiscuenca/addisSeatedAPImethod ... DEV-2011: Add MyAvatar::isSeated API method	2019-10-04 15:06:46 -07:00
Shannon Romano	85c79e7931	Merge pull request #16246 from ctrlaltdavid/BUGZ-711 ... BUGZ-711: Clarify frustum property values used by Entities.findEntitiesInFrustum()	2019-10-04 15:05:52 -07:00
Brad Davis	243120b95c	Even better frame capture	2019-10-04 14:57:39 -07:00
Anthony J. Thibault	521f64f152	normalize axes returned by Mat4.getForward getUp and getRight	2019-10-04 14:10:28 -07:00
Shannon Romano	24dc4b19ae	Merge pull request #16285 from SimonWalton-HiFi/domain-server-logging-for-paging ... DEV-2292: Alerting requirements for domain-server failure cases	2019-10-04 14:01:56 -07:00
Anthony J. Thibault	e3f799d039	Fix for Mat4.getForward, getRight and getUp ... It should match the results from the same methods on the Quat class.	2019-10-04 13:59:38 -07:00
luiscuenca	07080f0138	Clarify jdocs	2019-10-04 13:47:20 -07:00
David Rowe	6e6d438d36	Tidying	2019-10-05 09:34:31 +13:00
David Rowe	a56f82c1ba	Mat4 JSDoc	2019-10-05 09:27:31 +13:00
Shannon Romano	f09aa80977	Merge pull request #16278 from huffman/fix/mac-launcher-audio-entitlement ... DEV-2291: Add audio input entitlement to mac launcher	2019-10-04 12:19:20 -07:00
Shannon Romano	0b5299162b	Merge pull request #16283 from luiscuenca/fixInAirWhileSitting ... DEV-2217: Fix MyAvatar::isInAir() so takes into account the new seated state	2019-10-04 11:56:02 -07:00
Shannon Romano	15394f7a6b	Merge pull request #16284 from roxanneskelly/dev653 ... DEV-653 - give warning not to change address for cloud domains	2019-10-04 11:54:30 -07:00
Shannon Romano	12a81c41c2	Merge pull request #16293 from roxanneskelly/dev-2044 ... DEV-2044 - add notification that temporary domains won't show up in domain list	2019-10-04 11:51:50 -07:00
luiscuenca	3a9c829c95	Add MyAvatar::isSeated API method	2019-10-04 11:07:49 -07:00
dooglifeSF	37afabe866	Merge branch 'master' into sit_variants_and_fidgets	2019-10-04 10:29:15 -07:00
Sam Gateau	c7ca431296	Merge branch 'master' of github.com:highfidelity/hifi into instancing	2019-10-04 10:00:41 -07:00
Simon Walton	db14cdbd22	Tweak 'critical' status for some logging	2019-10-04 09:56:35 -07:00
Seth Alves	fc0874a182	new version of webrtc library for osx	2019-10-04 09:42:36 -07:00
Brad Davis	88514540d1	Fixing tools build	2019-10-04 09:26:33 -07:00
Shannon Romano	5d20baa4d0	Merge pull request #16291 from luiscuenca/fixBlinkAsync ... DEV-2202: Apply same random factors to both eyes blink	2019-10-04 09:26:19 -07:00
Brad Davis	cc1be64850	Fixing build issues	2019-10-04 09:20:02 -07:00
Brad Davis	3c6e98f16b	New format for captured GPU frames	2019-10-04 08:34:06 -07:00
Simon Walton	6a4406ad12	Put generic stats in sendStatsPacket() stub	2019-10-03 17:46:52 -07:00
Simon Walton	d5d1c08da0	Adjust some of the logging	2019-10-03 16:50:24 -07:00
Sabrina Shanman	fd9e355f02	Merge pull request #16279 from sabrina-shanman/instancing_fbx ... (DEV-559) Update FBXSerializer to reference shapes (deformers WIP)	2019-10-03 16:48:30 -07:00
sabrina-shanman	b15771e9fe	Fix build warnings and wrong use of indexOf	2019-10-03 16:47:41 -07:00
Roxanne Skelly	38afa6b5c2	Move to correct place	2019-10-03 16:47:09 -07:00
Roxanne Skelly	8940d990ec	DEV-2044 - add notification that temporary domains won't show up in ... domain list	2019-10-03 16:17:08 -07:00
Roxanne Skelly	607828d630	Merge pull request #16273 from roxanneskelly/dev1836 ... DEV-1836 - handle urls in the form 'hifi://<domain>:<port>	2019-10-03 16:01:46 -07:00
sabrina-shanman	41de373570	Fix not allocating shapeVerticesPerJoint in CollectShapeVerticesTask.cpp	2019-10-03 15:17:26 -07:00
sabrina-shanman	e47078727c	Merge branch 'instancing' into instancing_fbx	2019-10-03 14:54:19 -07:00
sabrina-shanman	e8d421fa35	Fix transforms and other issues with FBXSerializer	2019-10-03 14:46:21 -07:00
luiscuenca	f7a5895cf3	Apply same random factors to both eyes blink	2019-10-03 14:42:58 -07:00