26563 commits

Author	SHA1	Message	Date
Stephen Birarda	769d5677b1	Merge branch 'master' of github.com:highfidelity/hifi into feat/content-settings	2018-02-16 17:41:14 -08:00
Ryan Huffman	27c26bab86	Fix ambiguous int64_t in HTTPConnection	2018-02-16 13:57:38 -08:00
Ryan Huffman	bb8caa0ce3	Update HTTPConnection to not use QIODevice when given a QByteArray	2018-02-16 13:07:45 -08:00
John Conklin II	24a3eb6e80	Merge pull request #12419 from druiz17/fix-edit-avatar-entities ... Don't update avatar entities of the avatars ID is AVATAR_SELF_ID	2018-02-16 09:48:19 -08:00
MiladNazeri	331b253ba0	Merge pull request #12386 from cain-kilgore/21668 ... WL 21668 - Make sure all Prompts are correctly emitting a signal on cancel and that cancellations return null	2018-02-16 06:57:03 -08:00
Sam Gateau	f809862870	Merge pull request #12412 from samcake/blue ... Introduce task abort feature for early exit of task branch	2018-02-15 15:50:43 -08:00
Stephen Birarda	f5cad5683d	make sure backup handlers end up on the correct thread	2018-02-15 15:39:25 -08:00
Dante Ruiz	bbcf865db3	Merge branch 'master' of github.com:highfidelity/hifi into fix-edit-avatar-entities	2018-02-15 15:03:12 -08:00
Dante Ruiz	e4db09fef8	don't update avatar entities if the avatars ID is AVATAR_SELF_ID	2018-02-15 15:02:45 -08:00
samcake	c70b655fbc	A bit more explanations to the Task Flow class	2018-02-15 11:55:16 -08:00
samcake	b21b98c810	Add a way to early abort a task from a Job, apply that to the highlight effect to shave unecessary work	2018-02-15 11:24:20 -08:00
Ryan Huffman	145a8b385b	Move HTTP_RESPONSE_CHUNK_SIZE into lambda for http response	2018-02-15 10:22:35 -08:00
Ryan Huffman	2cfa91be06	Add memory include to HTTPConnection	2018-02-15 10:22:35 -08:00
Ryan Huffman	8a69c69bec	CR	2018-02-15 10:22:35 -08:00
Ryan Huffman	8b07e7e28f	Add backup DS APIs ... Add backup apis	2018-02-15 10:22:35 -08:00
Ryan Huffman	e63b692d80	Add BackupHandler for entity file backups	2018-02-15 10:22:35 -08:00
Atlante45	272f95efa2	Specify wich packet can ignore verification at DS level	2018-02-15 10:09:21 -08:00
Ryan Huffman	0bbbff95cd	Fix replacement octree data not working	2018-02-15 10:09:21 -08:00
Ryan Huffman	2a667fcd60	Cleanup entity -> ds persist	2018-02-15 10:09:21 -08:00
Ryan Huffman	1b7b4eee50	Fix entity data not being gzipped when adding id+version	2018-02-15 10:09:20 -08:00
Ryan Huffman	ff5be2d690	Fix entity data ID sometimes being reset	2018-02-15 10:09:20 -08:00
Ryan Huffman	cb9327e030	Add entity file sync and domain content backups	2018-02-15 10:09:20 -08:00
Clément Brisset	c62f68264f	Merge pull request #12295 from birarda/feat/content-split-from-settings ... initial separation of DS into domain settings and content settings	2018-02-15 10:04:36 -08:00
samcake	246ac25d0a	Introducing a way to abort a task from one of its job, using it to skip highlight tasks if nothing to highlight	2018-02-14 17:36:46 -08:00
David Back	e4263100b4	Merge branch 'master' of https://github.com/highfidelity/hifi into avatarInRange	2018-02-14 16:40:11 -08:00
Bradley Austin Davis	33690e09b7	Merge pull request #12399 from samcake/blue ... Introducing group culling to avoid the avatar model to be partially culled	2018-02-14 15:38:52 -08:00
Seth Alves	d1c0f0a40f	Merge pull request #12390 from druiz17/add-control-mapping ... add control button mapping for controller API	2018-02-14 15:02:28 -08:00
John Conklin II	9ba29028e3	Merge pull request #12398 from jherico/fix/spectator_cam ... Fix spectator camera crash	2018-02-14 13:15:42 -08:00
Stephen Birarda	6240181474	initial separation of content settings and domain settings	2018-02-14 12:09:56 -08:00
John Conklin II	63f752e76f	Merge pull request #12366 from sethalves/fix-children-of-animated-entity-joints ... fix -- get children of animated entity joints to follow along, again	2018-02-14 11:12:45 -08:00
Brad Davis	8853bd6388	Fix spectator camera crash	2018-02-14 11:11:28 -08:00
samcake	6357f36a97	Fixing names	2018-02-14 10:39:14 -08:00
samcake	1d3ae1b187	Work in progress to get the render items beeing tagged correctly for groupCulled	2018-02-13 17:50:01 -08:00
Stephen Birarda	6ba2f4b279	Merge pull request #12286 from Atlante45/feat/asset-server-backup ... Add asset server backups capabilities to the Domain Server	2018-02-13 17:40:11 -07:00
John Conklin II	309c2ecba1	Merge pull request #12239 from druiz17/fix-camera-update ... Do not override sensorToWorldMatrix if animGraph is loading or failed to load	2018-02-13 15:10:13 -08:00
samcake	a98f55298b	Merge branch 'master' of https://github.com/highfidelity/hifi into blue	2018-02-13 13:06:58 -08:00
samcake	f64e5f2444	Introducing the cull group	2018-02-13 13:06:26 -08:00
Clément Brisset	593113c102	Merge pull request #12387 from Atlante45/new-master ... Merge stable back into master	2018-02-13 12:59:59 -08:00
Andrew Meadows	b111e82763	Merge pull request #12365 from AndrewMeadows/workload-001 ... moving Job/Task framework out of 'render' library and into its own 'task' library	2018-02-13 12:26:32 -08:00
Andrew Meadows	20c2a4470e	merge 'findByID' into 'workload-001'	2018-02-13 11:47:02 -08:00
Elisa Lupin-Jimenez	a61021f46c	Merge pull request #12272 from elisa-lj11/2d-images ... 2d images (JPG and PNG) are now supported as (quasi) entities	2018-02-13 11:44:02 -08:00
Andrew Meadows	38bc312004	faster and const EntityTree::findByID()	2018-02-13 11:25:34 -08:00
Dante Ruiz	ddcee05b14	added control button for controller API	2018-02-13 09:41:00 -08:00
Sam Gateau	040710807d	Merge pull request #12346 from Zvork/scripts ... Fix transition (ex-fade) debugging scripts	2018-02-13 09:08:35 -08:00
Andrew Meadows	01fb8f3369	remove cruft	2018-02-13 08:58:24 -08:00
Andrew Meadows	95b34cf112	remove cruft and extra whitespace	2018-02-13 08:58:24 -08:00
Andrew Meadows	f1495d27f6	try task link dependency rather than include	2018-02-13 08:58:24 -08:00
Andrew Meadows	a1c540fc85	instantiate trace_workload logging category	2018-02-13 08:57:20 -08:00
Andrew Meadows	2b1b75450d	fix assert	2018-02-13 08:57:20 -08:00
Andrew Meadows	d59c3898dc	add 'workload' logging profile	2018-02-13 08:57:20 -08:00