30511 commits

Author	SHA1	Message	Date
sabrina-shanman	da9f37bb39	Fix up HFMFormatRegistry to accept subclass factory unique pointers	2018-12-04 09:30:04 -08:00
sabrina-shanman	19459c15a5	Split MIMETypeLibrary file type detection into three separate functions	2018-12-04 09:30:04 -08:00
sabrina-shanman	660d8c4e92	Remove unused mapping parameter from MIME type detection	2018-12-04 09:30:04 -08:00
sabrina-shanman	0da4669370	Replace ReadWriteLockable with std::lock_guard in HFMFormatRegistry/ModelFormatRegistry	2018-12-04 09:30:04 -08:00
sabrina-shanman	6ec0e42ded	Remove locks from MIMETypeLibrary	2018-12-04 09:30:04 -08:00
sabrina-shanman	bf1c5f2fa5	Make Serializer::Factory stored by HFMFormatRegistry unique_ptr	2018-12-04 09:30:03 -08:00
sabrina-shanman	30c4830bd8	Make Serializers use SimpleFormat	2018-12-04 09:30:03 -08:00
sabrina-shanman	2178baf1a8	Create SimpleFormat	2018-12-04 09:29:57 -08:00
Sam Gateau	d2ff4d4674	Merge branch 'master' of https://github.com/highfidelity/hifi into one	2018-12-03 20:52:43 -08:00
Simon Walton	eb097af796	Remove all .fst downloads from AvatarData and its derived classes	2018-12-03 17:42:39 -08:00
Seth Alves	541d0ab4d6	work around menu-item name hash collision for Home	2018-12-03 17:33:04 -08:00
Simon Walton	9315c546d3	Initial version - move updateJoints() to derived class	2018-12-03 16:26:47 -08:00
birarda	c959dd7024	release avatar entity and traits locks sooner to avoid deadlock	2018-12-03 14:57:38 -08:00
amantley	f7fcf503c2	removed joint lean from fbxSerializer. it was unused	2018-12-03 14:50:57 -08:00
Clément Brisset	56ac34f9d1	Merge pull request #14506 from Atlante45/fix/misc-agent ... Fix various AC bugs	2018-12-03 14:18:12 -08:00
Clément Brisset	62f21822ce	Merge pull request #14494 from Atlante45/fix/agent-shutdown-crash ... Fix Agent crash on shutdown	2018-12-03 14:17:35 -08:00
luiscuenca	ad42f6a590	Add method to check entities joint hierarchy	2018-12-01 12:32:29 -07:00
Angus Antley	a73f74d63c	Merge remote-tracking branch 'upstream/master' into jointNameMapping	2018-11-30 21:29:29 -08:00
sabrina-shanman	39d1a2be6f	Simplify ModelLoader to utilize new model format registry	2018-11-30 16:50:53 -08:00
sabrina-shanman	243a1d6598	Add ModelFormatRegistry for handling model loading on the application side	2018-11-30 16:50:53 -08:00
sabrina-shanman	74015a1a5e	Implement hfm::Format/hfm::Factory for model serializers	2018-11-30 16:50:53 -08:00
sabrina-shanman	d1ac501967	Create hfm::FormatRegistry, for more general model format definition	2018-11-30 16:50:45 -08:00
sabrina-shanman	142e787a9c	Create MIMETypeLibrary for general MIME type detection	2018-11-30 10:28:43 -08:00
Jeff Clinton	0bca290de2	Merge pull request #14485 from sethalves/crash-on-exits ... suppress 'No instance available' messages during shutdown. try a dif…	2018-11-30 10:10:43 -08:00
Clement	c53c52c7a0	Fix various Agent bugs	2018-11-29 17:42:04 -08:00
Ken Cooke	88d935a28e	Fix the audio injector "pitch" property	2018-11-29 08:12:14 -08:00
Sam Gateau	9353745054	MErge with master	2018-11-28 21:40:24 -08:00
Clement	181f2b4263	Fix Agent crash on shutdown	2018-11-28 18:40:52 -08:00
Ken Cooke	11252a8f56	Fix UBSAN warning (left-shift of negative integer) when peak limiter is called with implausibly large (or NaN) audio values	2018-11-28 16:48:34 -08:00
sabrina-shanman	2919097f29	Complain about empty HFMModel when EITHER meshes or joints are empty	2018-11-28 15:58:02 -08:00
sabrina-shanman	b809eed01f	Merge branch 'master' into hfm_mimetype	2018-11-28 15:06:04 -08:00
Seth Alves	0de011dd71	Merge pull request #14478 from danteruiz/ScriptEngine-Crashes ... Fix script engine crashes when reloading scripts.	2018-11-28 12:04:52 -08:00
Shannon Romano	ff934a8f87	Merge pull request #14394 from sabrina-shanman/hfm_serializer ... (case 20005) Create HFMSerializer interface for model loaders	2018-11-28 11:10:27 -08:00
Sam Gondelman	860d920368	more typos	2018-11-28 09:55:10 -08:00
Sam Gondelman	ecd936705b	typo	2018-11-28 09:54:20 -08:00
Seth Alves	fac27553d7	suppress 'No instance available' messages during shutdown. try a different way of shutting down AudioClient.	2018-11-27 17:02:48 -08:00
Sam Gondelman	4d621ba61c	Merge branch 'master' into splash	2018-11-27 16:01:07 -08:00
amantley	ad777201f6	changed comment and cleaned up variable name in getJointName	2018-11-27 15:08:50 -08:00
SamGondelman	1f354f813c	rework shader pre-compilation	2018-11-27 14:38:02 -08:00
amantley	579e2dd2ee	removed unnecessary mirror joint code and cleaned up whitespace in rig.cpp	2018-11-27 14:10:20 -08:00
sabrina-shanman	df1083970f	Fix assert in ModelLoader.h	2018-11-27 14:07:03 -08:00
amantley	f2c5184c95	Merge remote-tracking branch 'upstream/master' into jointNameMapping	2018-11-27 13:57:00 -08:00
Seth Alves	8f21ade0c7	make cmake -DDISABLE_QML=1 work again	2018-11-27 12:41:40 -08:00
Sam Gondelman	f728a8ba5a	Update drawCellBounds.slv	2018-11-27 10:57:57 -08:00
Sam Gondelman	5ee803bf1d	Update parabola.slv	2018-11-27 10:54:56 -08:00
Sam Gateau	87730884ab	Merge pull request #14340 from Nex-Pro/patch-5 ... Change to English spelling of 'declination'	2018-11-27 10:53:28 -08:00
Sam Gondelman	3a4ec2cc27	Update glowLine.slv	2018-11-27 10:53:25 -08:00
sabrina-shanman	fd83ae231b	Fix case for ModelLoader import	2018-11-27 09:49:55 -08:00
Dante Ruiz	c4a9ca3445	fix interface crashing when reloading scripts	2018-11-27 09:32:37 -08:00
Simon Walton	e10936ec34	Delete network query resources for failed queries	2018-11-26 18:26:25 -08:00
sabrina-shanman	d1f8bfe48b	Move definition of supported file types into ModelLoader	2018-11-26 17:51:11 -08:00
sabrina-shanman	98853b5d1d	Move FBXSerializer import by AnimationCache to source file	2018-11-26 16:30:18 -08:00
sabrina-shanman	b3d5f2fa65	Add MIME type-based Serializer selection	2018-11-26 16:30:18 -08:00
sabrina-shanman	2387641cbb	Store the MIME type in HTTPResourceRequest::onRequestFinished()	2018-11-26 16:09:41 -08:00
sabrina-shanman	fc0a31fa0d	Define ModelLoader instance in ModelCache	2018-11-26 16:09:41 -08:00
sabrina-shanman	f900a81e7a	Add ModelLoader	2018-11-26 16:09:41 -08:00
amantley	19efa492b8	Merge remote-tracking branch 'upstream/master' into jointNameMapping	2018-11-26 13:48:43 -08:00
amantley	fb7b503ce9	removed unnecessary iteration of the joint name mapping in AnimSkeleton.cpp	2018-11-26 13:48:00 -08:00
amantley	26fc53ef78	cleaned up whitespace and removed debug prints	2018-11-26 11:08:59 -08:00
Sam Gateau	f9fb4b61c1	Merge branch 'master' of https://github.com/highfidelity/hifi into one	2018-11-25 22:40:06 -08:00
SamGondelman	e282d51883	CR	2018-11-26 01:15:07 -05:00
amantley	746c5ed621	we can now handle missing joints and extra joints	2018-11-21 15:46:54 -08:00
sam gateau	48f32dc36b	Remove stuppid error	2018-11-21 13:35:36 -08:00
sam gateau	ad3d5f7efb	Merge branch 'one' of github.com:samcake/hifi into one	2018-11-21 13:32:54 -08:00
sam gateau	be03859ed6	Warnings from build	2018-11-21 13:31:54 -08:00
Sam Gateau	6b1c7bf96e	restoring the engine render views and cleaning up the task / config section of the pr	2018-11-20 23:15:09 -08:00
SamGondelman	c99a8101f7	trying to fix build errors	2018-11-21 01:56:46 -05:00
sam gateau	f3bbd412d1	Cleaning too many changes	2018-11-20 17:40:59 -08:00
amantley	a488364976	fixed mirroring helper functions contains left and contains right	2018-11-20 17:14:35 -08:00
amantley	572cdcd008	remapping is now able to work remains to clean up code and check for gotchas from old fst code	2018-11-20 17:09:37 -08:00
sabrina-shanman	be511378cd	Merge branch 'master' into hfm_serializer	2018-11-20 13:42:24 -08:00
SamGondelman	e8d45c46c1	shouldn't be able to write actionData	2018-11-19 23:31:20 -05:00
SamGondelman	58408497d1	hopefully fix hud crash	2018-11-19 21:27:23 -05:00
birarda	23857ea8c2	ensure packets are added to loss list after timeout	2018-11-19 17:40:55 -08:00
amantley	1fd03102c5	debugging name mapping code	2018-11-19 17:40:43 -08:00
sam gateau	3412a4573b	Merge branch 'master' of github.com:highfidelity/hifi into one	2018-11-19 17:40:15 -08:00
Jeff Clinton	30051f75da	Merge pull request #14434 from sethalves/fix-throw-from-worker ... catch QString exceptions that ModelCache can throw	2018-11-19 16:36:52 -08:00
Seth Alves	26a50e1820	don't log urls!	2018-11-19 15:38:12 -08:00
Seth Alves	cd177a4457	catch QString exceptions that ModelCache can throw	2018-11-19 15:25:14 -08:00
sam gateau	84cd2a8ef6	Merge branch 'master' of github.com:highfidelity/hifi into one	2018-11-19 15:23:55 -08:00
Jeff Clinton	484de06cf4	Merge pull request #14422 from SimonWalton-HiFi/entities-json-less-strict ... Don't check for presence of particular keys in models json	2018-11-19 10:29:10 -08:00
Jeff Clinton	870619b19d	Merge pull request #14412 from amantley/avatarPipelineOffsets ... Avatar Pipeline Joint Rotation Offsets Handling	2018-11-19 08:54:29 -08:00
Alexander Ivash	64d05e33c1	second attempt to fix all other shutdown QML warnings at once	2018-11-18 00:24:45 +05:30
Sam Gateau	837b321004	merging with master	2018-11-17 10:35:05 -08:00
SamGondelman	0fccb4c73c	move to batch, try to use static	2018-11-17 01:45:16 -08:00
Seth Alves	b72f462028	Merge pull request #14406 from danteruiz/master-disable-interstitial ... disable interstitial for master	2018-11-16 20:13:50 -08:00
Sam Gateau	5f062bbcf5	Merge branch 'master' of https://github.com/highfidelity/hifi into one	2018-11-16 20:05:08 -08:00
amantley	fd9c05ce80	joint mapping. adding to fbx reader and avatar classes to get non standard names to map to hifi	2018-11-16 17:39:46 -08:00
Simon Walton	3baebf55c5	Don't enforce key presence in models.json	2018-11-16 17:33:13 -08:00
Jason Najera	da3ea682ba	Merge pull request #14347 from r3tk0n/19550-oculus-store-v2 ... MS19550 - Don't show help for HMDs that aren't plugged in and active	2018-11-16 15:49:46 -08:00
SamGondelman	cbe5814c64	shader compilation prototype	2018-11-16 15:18:56 -08:00
sam gateau	9dd6c8d9d9	Merge branch 'master' of github.com:highfidelity/hifi into one	2018-11-16 11:55:44 -08:00
amantley	eb00435353	removed whitespace	2018-11-16 10:35:50 -08:00
Sam Gondelman	968ffe7ec3	Merge branch 'master' into branching	2018-11-16 10:25:02 -08:00
Seth Alves	d19cdc62d7	Merge pull request #14135 from ElderOrb/FB18573 ... FB18573 - Other avatars' avatar entities may appear to be successfull…	2018-11-16 10:05:22 -08:00
Sam Gateau	0166d7748a	Merging with master around rc76 cut time	2018-11-15 22:52:37 -08:00
r3tk0n	34224c4f16	Fix XBox One controller detection.	2018-11-15 14:08:21 -08:00
John Conklin II	60c538309a	Merge pull request #14411 from SamGondelman/fading ... Fix for avatar flashing on fade out	2018-11-15 13:58:43 -08:00
John Conklin II	83660ab8e1	Merge pull request #14128 from Zvork/ao ... Improved Ambient Occlusion	2018-11-15 13:57:13 -08:00
John Conklin II	8177d5bbcd	Merge pull request #14275 from Atlante45/fix/injector-crash ... Rework audio data memory ownership model to fix injector crashes	2018-11-15 13:25:42 -08:00