81085 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Shannon Romano	1e67f1e914	Merge pull request #16249 from roxanneskelly/bugz1381 ... BUGZ-1381 - domain server creates blank/undefined group when adding groups	2019-09-26 12:28:39 -07:00
Simon Walton	85c9f4d95f	Use the FCDEBUG mechanism to throttle udt::Socket log-spam	2019-09-26 12:10:59 -07:00
Sam Gateau	675dbc3f7f	Merge branch 'master' of github.com:highfidelity/hifi into yellow	2019-09-26 12:06:09 -07:00
Sam Gateau	9d999baab2	FIrst pass to clean up before pushing a pr:	2019-09-26 11:59:01 -07:00
Simon Walton	bbf43050b1	Merge pull request #16244 from SimonWalton-HiFi/connection-class-ignored-unused ... BUGZ-1503: Don't move unused Connection class upon address change	2019-09-26 11:42:50 -07:00
Ken Cooke	6e54ff30bd	Bugfix	2019-09-26 11:36:23 -07:00
dooglifeSF	a6bedf7174	Merge branch 'master' into sit_variants_and_fidgets	2019-09-26 11:23:37 -07:00
Ken Cooke	3f686be7ab	Add all Objective-C sources in CMakeLists.txt	2019-09-26 10:50:00 -07:00
Ken Cooke	ae62b96f67	On Mac OS, disable App Nap to prevent audio glitches while running in the background	2019-09-26 08:52:35 -07:00
Sam Gateau	ba11c3e702	Merge branch 'master' of github.com:highfidelity/hifi into yellow	2019-09-25 17:54:21 -07:00
Sam Gateau	dc40c530a3	INstrumenting the code more...	2019-09-25 17:53:59 -07:00
Amer	1e94a82ee6	Merge pull request #16196 from amerhifi/dev469 ... DEV-469: Default Audio device	2019-09-25 16:28:00 -07:00
Howard Stearns	d507c06a3b	Merge pull request #16250 from Atlante45/fix/account-settings ... DEV-648: Limit the amount of account settings pull retries	2019-09-25 15:55:08 -07:00
David Rowe	8b2d9427bb	Update description of the entities available to the Entities API	2019-09-26 10:54:12 +12:00
David Rowe	0cafae2422	EntityViewer JSDoc	2019-09-26 10:54:12 +12:00
dooglifeSF	0fa7220750	tilt head down slightly to minimize crazy eyes	2019-09-25 15:27:11 -07:00
Atlante45	ff3f26eeae	Limit the amount of account settings pull retries	2019-09-25 14:55:44 -07:00
dooglifeSF	a8fa3a136c	emote revisions, json tuning	2019-09-25 14:47:07 -07:00
dooglifeSF	54ce9be9df	Merge branch 'master' of https://github.com/highfidelity/hifi into emotes_revisions_per_feedback	2019-09-25 14:45:28 -07:00
Roxanne Skelly	434c63b7e3	BUGZ-1381 - domain server creates blank/undefined group when adding ... groups	2019-09-25 14:14:29 -07:00
luiscuenca	d7fc4e905c	fix function on jsdoc	2019-09-25 14:02:43 -07:00
amer cerkic	73f14d812f	addressing cr comments	2019-09-25 13:22:50 -07:00
Simon Walton	6ccfc37f27	Merge remote-tracking branch 'upstream/master' into connection-class-ignored-unused	2019-09-25 13:06:32 -07:00
luiscuenca	0aab2ed07f	Disable head look at when pointing	2019-09-25 12:37:24 -07:00
MiladNazeri	7d7024f5eb	Merge pull request #16247 from MiladNazeri/DEV-148/add-mirror-mode-to-settings ... Dev 148/add mirror mode to settings	2019-09-25 12:08:09 -07:00
Brad Hefta-Gaub	06c7a92c27	Merge pull request #16243 from Atlante45/fix/account-settings ... DEV-648: Add flag for account settings feature	2019-09-25 11:20:14 -07:00
milad	aba6a28d54	updated camera modes	2019-09-25 11:05:32 -07:00
Brad Hefta-Gaub	068fb0e177	Merge pull request #16240 from ctrlaltdavid/BUGZ-577 ... BUGZ-577: Implement Recording.setPlayerVolume()	2019-09-25 10:31:57 -07:00
Simon Walton	6d7f711990	Remove typo that somehow got into a comment	2019-09-25 09:33:49 -07:00
milad	39d96b76a6	fixed help text	2019-09-25 08:41:38 -07:00
David Rowe	16c33ebbec	Clarify frustum property values used by Entities.findEntitiesInFrustum()	2019-09-25 19:29:20 +12:00
Sam Gateau	3e3c4c2e70	Merge branch 'master' of https://github.com/highfidelity/hifi into yellow	2019-09-24 18:58:29 -07:00
luiscuenca	7c4fe39918	Add point directional blending node to animation json	2019-09-24 18:24:27 -07:00
Sam Gateau	0d9cd69d94	SImplifying Page.js, and adding a REsourceInspector	2019-09-24 18:10:57 -07:00
luiscuenca	ad79393e1f	Implement point at directional blend and API	2019-09-24 17:55:38 -07:00
Clement	5067729c52	Add flag for account settings feature	2019-09-24 17:40:34 -07:00
milad	103b10e2f9	restored modified file	2019-09-24 16:52:37 -07:00
milad	af5e01f96b	restored modified file	2019-09-24 16:51:35 -07:00
Clement	96b58756b1	Add flag for account settings feature	2019-09-24 16:50:10 -07:00
milad	677dbe59cc	fixed qml typo	2019-09-24 16:47:07 -07:00
milad	edb135776a	Added selfie view and updated help	2019-09-24 16:44:34 -07:00
Simon Walton	4f11e46b5e	Don't move Connection class to changed address until it's used	2019-09-24 16:39:59 -07:00
milad	e275fe1da8	Merge branch 'master' of github.com:highfidelity/hifi	2019-09-24 16:07:04 -07:00
milad	b8e7b23ba3	Merge branch 'master' of github.com:MiladNazeri/hifi	2019-09-24 16:06:51 -07:00
Shannon Romano	73c558bc51	Merge pull request #16237 from dooglifeSF/emotes_interrupt_settle ... Transition between walk/emote should be faster	2019-09-24 15:49:31 -07:00
Shannon Romano	0c2ca7500d	Merge pull request #16241 from RebeccaStankus/removeInspect ... Undo removal of User Inspection	2019-09-24 15:41:35 -07:00
amer cerkic	9daf670678	Merge branch 'master' into dev469	2019-09-24 15:38:07 -07:00
amer cerkic	20045836aa	Merge branch 'master' of https://github.com/highfidelity/hifi	2019-09-24 15:35:32 -07:00
Sam Gateau	2a78fc7b38	Remove the auto refresh list of resource because it takes too much time, instead user has to press refresh button	2019-09-24 14:29:09 -07:00
Andrew Meadows	50f0c90519	don't forget to cleanup expired mortal entities	2019-09-24 14:00:21 -07:00