3906 commits

Author	SHA1	Message	Date
Anthony Thibault	eae5215d94	Merge pull request #13206 from ctrlaltdavid/21872-c ... JSDoc fixes	2018-05-24 16:44:55 -07:00
Andrew Meadows	885c7bc97d	bump protocol for extra byte in collisionMask	2018-05-24 11:28:52 -07:00
John Conklin II	3e665fb616	Merge pull request #13179 from dback2/cloneables ... Server-Managed Cloneables + Cloneable Properties	2018-05-23 12:40:27 -07:00
Liv Erickson	56493346c1	fix permissions check	2018-05-22 15:41:48 -07:00
Liv Erickson	0ebd13b3e6	cannot edit origin from client / fix ICE issue	2018-05-22 13:17:23 -07:00
David Rowe	fa54461788	Update some recent JSDoc additions	2018-05-22 08:52:39 +12:00
John Conklin II	168edb1cde	Merge pull request #13192 from druiz17/fix-spaming-set-host ... fix case sensitive comparison in AddressManager::setHost	2018-05-21 11:16:18 -07:00
David Rowe	e44e7ca35f	Fix up Resource and resource cache APIs' JSDoc	2018-05-21 11:57:16 +12:00
David Rowe	6d4f704279	Regularize some JSDoc usage	2018-05-21 09:32:10 +12:00
Dante Ruiz	027d1ed50b	making requested changes	2018-05-18 11:07:11 -07:00
Liv Erickson	de05388ebf	Merge branch 'master' of github.com:highfidelity/hifi into clone-server	2018-05-18 10:42:26 -07:00
Dante Ruiz	48404d811c	fix case sensitive comparison	2018-05-17 16:34:52 -07:00
David Rowe	2669a39e0f	Deprecate Agent API items that shouldn't be exposed in the API	2018-05-18 07:32:25 +12:00
David Rowe	6db4dd8673	Merge branch 'master' into 21872-b ... # Conflicts: # interface/src/ui/Snapshot.h	2018-05-17 20:11:14 +12:00
David Back	f8fc7bedd7	Merge branch 'master' of https://github.com/highfidelity/hifi into cloneables	2018-05-15 17:31:43 -07:00
John Conklin II	aca261af3e	Merge pull request #12939 from Cristo86/android_places_goto ... Android Search & Go To	2018-05-15 16:43:38 -07:00
David Rowe	1ca6bd2f0b	location getter/setter JSDoc	2018-05-15 17:37:45 +12:00
David Rowe	8ea3a733ca	Resource API JSDoc stub	2018-05-15 10:32:36 +12:00
David Rowe	b445371ad8	Resources API JSDoc stubs	2018-05-12 16:24:34 +12:00
David Back	3031bb05be	Merge branch 'master' of https://github.com/highfidelity/hifi into cloneables	2018-05-11 17:54:20 -07:00
David Rowe	cf9053c873	Merge branch 'master' into 21872-b	2018-05-12 10:50:31 +12:00
Gabriel Calero	9b5da09dc7	Fix connection issue syncing two AccountManagers	2018-05-11 18:08:56 -03:00
Stephen Birarda	4f7ce7345d	Merge pull request #13045 from SimonWalton-HiFi/domain-checkins-tweak ... Reset pending domain check-in count more frequently	2018-05-11 13:31:03 -07:00
David Back	65bda27ae3	Merge branch 'master' of https://github.com/highfidelity/hifi into cloneables	2018-05-11 13:03:27 -07:00
David Rowe	3891ebe703	Agent API JSDoc stubs	2018-05-11 20:20:07 +12:00
John Conklin II	bc9e403ab9	Merge pull request #13005 from SimonWalton-HiFi/hmac-auth2 ... Use HMAC authentication for network packets - 2nd attempt	2018-05-10 14:38:18 -07:00
David Back	3241c18271	first pass cloneables WIP	2018-05-09 18:10:40 -07:00
Simon Walton	9b6225db40	Bump default packet version 20 -> 21	2018-05-09 14:29:10 -07:00
Simon Walton	0349847857	Add comment re threading issues	2018-05-08 17:46:25 -07:00
Clement	da9fb9c751	Fix non self-sufficient headers	2018-05-04 16:26:41 -07:00
Stephen Birarda	ec354620db	Merge pull request #12956 from huffman/feat/client-texture-selection-baking ... Add support for client texture selection	2018-05-04 16:14:43 -07:00
Clément Brisset	39e2a78b1a	Merge pull request #13074 from Atlante45/fix/spec-cam-punchlist ... Multifrustum queries punchlist	2018-05-04 15:50:44 -07:00
Simon Walton	00d2f9494b	Change HMACAuth::calculateHash to just call existing methods	2018-05-04 15:07:20 -07:00
Ryan Huffman	e1d218bb57	Bump asset packet version for texture meta	2018-05-04 11:25:11 -07:00
Stephen Birarda	8ded6c76ec	Merge pull request #13069 from ctrlaltdavid/21729-a ... Remove deprecated location.domainId from API	2018-05-04 10:35:41 -07:00
Stephen Birarda	8c6d83ad67	Merge pull request #13023 from SimonWalton-HiFi/connection-stats-dump ... Add a utility function to dump ConnectionStats	2018-05-04 10:19:25 -07:00
Clement	d7e9fdc6a4	Bump Avatar Query packet version	2018-05-03 18:19:29 -07:00
Clement	67c119cd2e	Send Entity Query via conical frustums	2018-05-03 18:19:29 -07:00
Clement	e400eb4ed2	Rename ViewFrustum packets to AvatarQuery	2018-05-03 18:19:29 -07:00
Stephen Birarda	21396287a4	Merge pull request #12990 from Atlante45/fix/spec-cam-av ... Add support for multifrustum avatar queries	2018-05-03 18:18:51 -07:00
Stephen Birarda	31d5633b4a	Merge pull request #12930 from Atlante45/fix/spec-cam ... Add support for multifrustum entity queries	2018-05-03 18:13:51 -07:00
John Conklin II	7d424edd9b	Merge pull request #13092 from Atlante45/fix/asan-warning ... Fix uninitialized boolean (asan warning)	2018-05-03 15:46:37 -07:00
Clement	cefb8457ea	Fix uninitialized boolean	2018-05-03 11:17:31 -07:00
David Rowe	e95c38d939	Merge branch 'master' into 21856-g ... # Conflicts: # libraries/model-networking/src/model-networking/TextureCache.h	2018-05-03 21:03:14 +12:00
MiladNazeri	8e214d8ee8	Merge pull request #13049 from ctrlaltdavid/21856-d ... List which contexts each namespace and class is available in	2018-05-03 01:29:14 -07:00
Ryan Huffman	697fde4a1a	Cleanup meta texture related changes	2018-05-02 13:31:32 -07:00
Gabriel Calero	c15ef56d90	Merge remote-tracking branch 'upstream/master' into android_goto_splash	2018-05-02 14:38:10 -03:00
Ken Cooke	a4105f1081	Merge pull request #13052 from kitely/fix-gcc-warnings ... Eliminated warnings in gcc	2018-05-02 06:43:32 -07:00
Oren Hurvitz	26ffb3213c	Changed "[[gnu::fallthrough]]" to "// FALLTHRU"	2018-05-02 07:06:47 +01:00
David Rowe	48632be3c2	Fix up cache APIs' JSDoc	2018-05-02 16:12:48 +12:00