30665 commits

Author	SHA1	Message	Date
Dante Ruiz	177a94b9a9	fix realod all scripts functionality	2018-12-07 11:48:03 -08:00
birarda	51fd742722	fix for initial send of non-instanced trait	2018-12-07 11:17:44 -08:00
SamGondelman	8431b3b0c1	correct order of mixes	2018-12-07 10:39:10 -08:00
Wayne Chen	4e6f162e01	Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2	2018-12-07 10:12:46 -08:00
Alexander Ivash	600d09e533	relax 'isWearable()' condition to match latest changes in 'master'	2018-12-07 11:23:17 +03:00
Alexander Ivash	72a91668a5	FB19219 Make avatarapp to handle wearables update via drag&drop	2018-12-07 11:23:17 +03:00
Sam Gateau	50fcd7f40a	trying...	2018-12-06 22:45:44 -08:00
amantley	f8ae0227c3	added the lean joint back and fixed a name mapping reversal in fbxserializer.cpp	2018-12-06 20:16:03 -08:00
Sam Gateau	b24a2d33bf	Merge branch 'master' of https://github.com/highfidelity/hifi into punk	2018-12-06 19:51:05 -08:00
Sam Gateau	4fff4acde2	Merge branch 'punk' of github.com:samcake/hifi into punk	2018-12-06 19:50:46 -08:00
Stephen Birarda	fb3cdabd87	Merge pull request #14527 from birarda/bug/entity-traits-handler-deadlock ... fix for deadlock between setAvatarEntityData and sendChangedTraitsToMixer	2018-12-06 17:28:45 -08:00
sam gateau	e941833676	gathering the lighting stage jobs in their own task away from the renderer specificities	2018-12-06 17:27:13 -08:00
amantley	ca0133a2a6	put the lean joint back in	2018-12-06 16:24:06 -08:00
sabrina-shanman	6ea4769173	Re-name MIMETypeLibrary to MediaTypeLibrary and update related references	2018-12-06 13:39:18 -08:00
Sam Gondelman	2291c7e5fb	Merge branch 'master' into NOverlays3	2018-12-06 12:37:18 -08:00
Sam Gondelman	533e0e0326	Merge branch 'master' into NOverlays2	2018-12-06 12:29:38 -08:00
Luis Cuenca	37854ab05e	Add jsdoc information	2018-12-06 11:58:48 -08:00
Sam Gondelman	b690faeb12	Merge branch 'master' into NOverlays	2018-12-06 11:29:06 -08:00
Sam Gondelman	a7c083e97a	Merge branch 'master' into NOverlays2	2018-12-06 11:24:27 -08:00
Sam Gondelman	d30dd4c26c	Merge branch 'master' into NOverlays3	2018-12-06 11:23:50 -08:00
Jeff Clinton	43f84a9577	Merge pull request #14426 from ElderOrb/FB19400 ... FB19400 during shutdown -- TypeError: Cannot read property 'buttons' of null	2018-12-06 11:18:39 -08:00
Adam Smith	08d6e35d4d	Merge pull request #14372 from SamGondelman/decals ... Case 19798: 3D projected Material Entities and materialRepeat option	2018-12-06 11:13:46 -08:00
SamGondelman	645508de04	add jsdocs for BillboardMode	2018-12-06 09:59:24 -08:00
Wayne Chen	30f1016f1c	Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2	2018-12-06 09:55:00 -08:00
Simon Walton	e03104cad5	Merge remote-tracking branch 'upstream/master' into avatar-mixer-downloads-fst ... Remove the code that was fixed in the conflicting PR - it's now fixed in the new location.	2018-12-05 17:58:38 -08:00
sam gateau	a267c3115a	drafting more factorisation of render tasks	2018-12-05 17:47:33 -08:00
Sam Gondelman	df6fbefc31	Merge branch 'master' into v3	2018-12-05 16:51:33 -08:00
Adam Smith	653974ca30	Merge pull request #14293 from SamGondelman/branching ... Case 19473: Reduce branching in our shaders	2018-12-05 16:42:42 -08:00
SamGondelman	abef5c4d61	fix grab billboarding bug	2018-12-05 15:05:01 -08:00
Clement	7723261cb9	Remove deferred script loading logic	2018-12-05 14:08:30 -08:00
SamGondelman	287878ff98	merge with master	2018-12-05 10:35:08 -08:00
Antonina Savinova	2dcfea5f7c	Merge pull request #14487 from SimonWalton-HiFi/avatar-mixer-memory-leak ... Fix minor avatar-mixer memory leaks	2018-12-05 10:29:29 -08:00
Wayne Chen	a2a4d2ff89	removing trailing debug	2018-12-05 08:21:11 -08:00
Wayne Chen	07599c02c8	true reversion of scrips param	2018-12-05 08:16:54 -08:00
Sam Gateau	a295c6ffc8	scripts\developer\utilities\lib\jet\qml\TaskListView.qml	2018-12-04 22:41:36 -08:00
Wayne Chen	57b21730de	Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2	2018-12-04 17:01:56 -08:00
amantley	edab74caa4	mapped the model joint names to hifi compliant joint names in FBX serializer	2018-12-04 16:20:46 -08:00
Brad Hefta-Gaub	77e1c98264	Merge pull request #14528 from sethalves/fix-delete-home ... work around menu-item name hash collision for Home	2018-12-04 15:04:25 -08:00
Wayne Chen	2d8b638370	Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2	2018-12-04 14:19:28 -08:00
Adam Smith	763e6d1a95	Merge pull request #14444 from SamGondelman/actionData ... Case 19861: Fix: Shouldn't be able to write actionData from script	2018-12-04 11:25:00 -08:00
Adam Smith	864e9ca8ae	Merge pull request #14443 from SamGondelman/hud ... Case 19660: Fix HUD crash	2018-12-04 11:10:43 -08:00
sam gateau	8efdec1e51	merging with master	2018-12-04 11:03:46 -08:00
Simon Walton	f3236e0843	Remove FST joint members from AvatarData	2018-12-04 10:45:32 -08:00
Wayne Chen	1375e85f2c	Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2	2018-12-04 10:21:12 -08:00
sabrina-shanman	ed1684967f	Remove straggler HFMSimpleFormat.cpp	2018-12-04 10:08:14 -08:00
sabrina-shanman	1c9beed44f	Fix ModelFormatRegistry Dependency inheritance being private	2018-12-04 09:30:05 -08:00
sabrina-shanman	3c38b43a65	Fix compilation error due to static variable definition in MIMETypeLibrary header file	2018-12-04 09:30:04 -08:00
sabrina-shanman	a63888cac8	Remove unused default constructor for GLTFSerializer	2018-12-04 09:30:04 -08:00
sabrina-shanman	a04c822ef0	Oops, ModelFormatRegistry needs to be defined as a Dependency before it can be used by DependencyManager	2018-12-04 09:30:04 -08:00
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
sam gateau	0343983f31	Applying changes done in deferred to forward	2018-12-03 16:58:54 -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
SamGondelman	98f9dc0ca4	remove grid entity files	2018-12-03 12:07:26 -08:00
SamGondelman	3ce6f7f3d6	real image entities	2018-12-03 11:50:59 -08:00
SamGondelman	1fd8a21f8e	cleanup	2018-12-03 11:07:54 -08:00
Sam Gateau	a5d1c4833e	Exploring varying with names	2018-12-03 00:00:28 -08:00
Sam Gateau	259a97c43a	Exploring varying with names	2018-12-02 23:41:57 -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
Sam Gateau	80ec393f2e	Merge branch 'master' of github.com:highfidelity/hifi into punk	2018-11-30 19:16:42 -08:00
sam gateau	2c4cd68a00	iterating on a simpler engine graph	2018-11-30 17:43:27 -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
Wayne Chen	09bc886c20	Merge branch 'master' into loginInitiative2	2018-11-30 13:05:17 -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
sam gateau	7575f9948d	Merge branch 'punk' of github.com:samcake/hifi into punk	2018-11-29 17:59:43 -08:00
sam gateau	14bf383c50	MIgrating everything to collect the items out from the render task	2018-11-29 17:59:04 -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 Gondelman	7936dd1ac4	fix build errors again	2018-11-28 23:01:02 -08:00
Sam Gondelman	66d77d2df8	fix build error 2	2018-11-28 21:45:50 -08:00
Sam Gateau	9353745054	MErge with master	2018-11-28 21:40:24 -08:00
Sam Gondelman	dc32472bd6	fix build error	2018-11-28 20:42:45 -08:00
Sam Gateau	fb47900e2f	Merge branch 'master' of https://github.com/highfidelity/hifi into punk	2018-11-28 19:12:29 -08:00
Wayne Chen	9deb15b9f6	Merge branch 'master' into loginInitiative2	2018-11-28 19:10:20 -08:00
Clement	181f2b4263	Fix Agent crash on shutdown	2018-11-28 18:40:52 -08:00
SamGondelman	2acb6b6857	v3 procedurals and shader fixes	2018-11-28 17:58:27 -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
Sam Gateau	ba4aec2aff	Fixing the issues with thte debug renderdeferredTask and investigating the avatars perf	2018-11-28 01:01:18 -08:00
Sam Gateau	199fe2178d	Merge branch 'master' of https://github.com/highfidelity/hifi into punk	2018-11-27 18:13:31 -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
Seth Alves	098440c273	fix a bug that broke Entities.setVoxel(). Fix polyvox textures	2018-11-27 10:43:33 -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
sam gateau	f348cc35c4	separting debug in its own task	2018-11-26 15:20:45 -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
Wayne Chen	0d52566315	Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2	2018-11-26 09:13:35 -08:00
Sam Gateau	b7b8e8e6bf	Trying to group together the debug jobs in a separate task	2018-11-26 00:38:04 -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