30670 commits

Author	SHA1	Message	Date
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
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
Wayne Chen	e0eba2135a	Merge branch 'master' into loginInitiative2	2018-11-19 15:23:43 -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
Wayne Chen	b8d8710604	Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2	2018-11-19 09:02:16 -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
amantley	3bf4a7844d	moved the jointrotationoffsets to hfmModel.h from fbx.h	2018-11-15 10:56:17 -08:00
SamGondelman	597ff773e1	fix for avatar flashing	2018-11-15 10:52:22 -08:00
amantley	f9829c270d	merged new fbx.h	2018-11-15 10:19:04 -08:00
amantley	c8cd65c3bd	added getter for the orginal cluster bind matrix values in AnimSkeleton	2018-11-15 09:58:10 -08:00
Wayne Chen	bf731f32b9	Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2	2018-11-15 09:46:32 -08:00
Olivier Prat	0401858129	Cleaned up do_draw in GLESBackend	2018-11-15 18:34:41 +01:00
Olivier Prat	ed42c94772	Merge branch 'master' of http://github.com/highfidelity/hifi into ao	2018-11-15 17:55:29 +01:00
Sam Gondelman	a5fe4709a9	Update Fade.slh	2018-11-14 17:50:21 -08:00
amantley	80ebde1036	started cleanup of pr	2018-11-14 17:27:45 -08:00
Sam Gondelman	a206d9e25a	Merge branch 'master' into branching	2018-11-14 17:08:08 -08:00
amantley	8256c652fc	added the hook to put the copy of the mutated bind poses into tthe skeleton	2018-11-14 17:02:25 -08:00
Atlante45	31033ad685	Update TTS audio API use	2018-11-14 15:42:39 -08:00
Brad Davis	b7c567af08	Fix procedurals using the iGlobalTime input	2018-11-14 15:28:22 -08:00
Dante Ruiz	f17723c216	disable interstitial for master	2018-11-14 14:50:38 -08:00
SamGondelman	8dbb2d806b	local entities are always collisionless	2018-11-14 14:48:07 -08:00
Wayne Chen	c85b840db0	Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2	2018-11-14 14:47:56 -08:00
Clement	d2a1bb4806	CR	2018-11-14 14:46:08 -08:00
Clement	7192aed131	Rework audio data memory ownership model	2018-11-14 14:45:18 -08:00
Seth Alves	1593c1185a	revert PR-14238 "TypeError: Cannot read property 'buttons'" until we can adjust it.	2018-11-14 12:29:09 -08:00
SamGondelman	079d1dcbd6	convert clientOnly to entityHost and add local entities	2018-11-14 11:25:37 -08:00
John Conklin II	92a23ec0a9	Merge pull request #14294 from SimonWalton-HiFi/max-json-size ... Allow for large Models.json file	2018-11-14 11:20:35 -08:00
sabrina-shanman	2d30902813	Fix OBJBaker not setting combineParts	2018-11-14 09:11:56 -08:00
Olivier Prat	85a3938cbe	Switch to app for ambient occlusion debug script	2018-11-14 11:55:11 +01:00
Olivier Prat	45e0f65972	Merge branch 'ao' of http://github.com/Zvork/hifi into ao	2018-11-14 09:48:24 +01:00
Simon Walton	452c212c4f	Add Paths entry parsing to json parser	2018-11-13 17:58:12 -08:00
Simon Walton	82e21e89e4	Merge remote-tracking branch 'upstream/master' into max-json-size	2018-11-13 17:26:20 -08:00
sabrina-shanman	e08bc7296f	Merge branch 'master' into hfm_serializer	2018-11-13 15:41:49 -08:00
John Conklin II	79e67ad45f	Merge pull request #14238 from ElderOrb/FB19400 ... FB19400 during shutdown -- TypeError: Cannot read property 'buttons' …	2018-11-13 15:07:21 -08:00
Sam Gondelman	13f650d514	Merge pull request #14093 from SamGondelman/police ... Case 19409, Case 19468: Fading fixes and shader cleanup	2018-11-13 15:00:23 -08:00
Jeff Clinton	6c90d7ed11	Merge pull request #14343 from ElderOrb/FB19514 ... FB19514 - Interface crashes on attempt to apply new animation url via…	2018-11-13 14:59:50 -08:00
Simon Walton	167a8fdc04	Merge branch 'master' into max-json-size	2018-11-13 14:57:06 -08:00
amantley	a8d7b0503d	removed more cruft	2018-11-13 14:24:18 -08:00
Simon Walton	a65466f154	Use traditional C strings rather than raw strings	2018-11-13 13:33:36 -08:00
Brad Hefta-Gaub	bb2239c0bd	Merge pull request #14359 from howard-stearns/no-url-logging ... remove urls from logs in Interface	2018-11-13 13:19:30 -08:00
John Conklin II	7e7817212c	Merge pull request #14321 from jherico/fix/19256 ... Case 19256: Switch back to Qt for GL context creation by default	2018-11-13 13:14:22 -08:00
Brad Davis	099ffa23ec	PR feedback	2018-11-13 12:19:20 -08:00
amantley	c80ade98ec	cleaned up white space	2018-11-13 12:10:10 -08:00
Brad Hefta-Gaub	153b8920be	Merge pull request #14348 from sabrina-shanman/hfm_library ... (case 19302) Create the HFM library and namespace	2018-11-13 12:03:53 -08:00
Brad Hefta-Gaub	6e2024350d	Merge pull request #14282 from gcalero/android_new_login ... Change Android login flow (MS case 19470)	2018-11-13 12:02:10 -08:00
amantley	f83edf4b7f	joint offsets working. reset working. to do: handling extra joints	2018-11-13 11:29:01 -08:00
Brad Hefta-Gaub	4bafcd2cfa	Merge pull request #14271 from SamGondelman/oculus ... Case 19475: Fix various Oculus Store test failures	2018-11-13 11:06:39 -08:00
Howard Stearns	938b45d3da	more removal	2018-11-13 11:05:45 -08:00
Howard Stearns	ad7266062d	Merge branch 'master' of github.com:highfidelity/hifi into no-url-logging	2018-11-13 10:33:27 -08:00
Simon Walton	df2bc6ba5c	Remove unused function	2018-11-13 10:18:30 -08:00
John Conklin II	85e5c1d6ef	Merge pull request #14363 from SimonWalton-HiFi/scale-avatar-joint-translations ... Send avatar-joint translations at world scale	2018-11-13 10:04:30 -08:00
Howard Stearns	545b85bc9d	Merge branch 'master' of github.com:highfidelity/hifi into no-url-logging	2018-11-13 09:55:54 -08:00
Howard Stearns	fc62700587	Merge branch 'no-url-logging' of github.com:howard-stearns/hifi into no-url-logging	2018-11-13 09:55:09 -08:00
Gabriel Calero	3d4893aba2	Merge remote-tracking branch 'upstream/master' into android_new_login	2018-11-13 10:43:36 -03:00
Sam Gondelman	f68706e72f	Merge pull request #14252 from gcalero/enable_aec_by_default ... Enabled AEC by default (bug 19210)	2018-11-12 16:15:33 -08:00
sabrina-shanman	93c7578f54	Convert hfm::Serializer to use hifi-namespaced types	2018-11-12 16:12:21 -08:00
sabrina-shanman	5b6e2aae5a	Remove/move some unused serializer imports	2018-11-12 16:12:21 -08:00
sabrina-shanman	8e0fb0f9c4	Remove unused alternate read functions in FBXSerializer	2018-11-12 16:12:21 -08:00
sabrina-shanman	f971294d6d	Make HFMSerializer return a smart pointer to an HFMModel	2018-11-12 16:12:21 -08:00
sabrina-shanman	5a9af5b2c3	Correct the folder location in the FBXSerializer header/source top comment	2018-11-12 16:12:21 -08:00
sabrina-shanman	baa8cdb054	Remove combineParts from the Serializer interface	2018-11-12 16:12:21 -08:00
sabrina-shanman	0cbe0bd266	Add missing copyright comment and header guard to OBJSerializer.h	2018-11-12 16:12:20 -08:00
sabrina-shanman	00f2b4eeb9	Make the existing model serializers based on HFMSerializer	2018-11-12 16:12:20 -08:00
sabrina-shanman	0271f7d334	Create the HFMSerializer interface class	2018-11-12 16:12:20 -08:00
sabrina-shanman	83cc90ace0	Re-name GLTFReader to GLTFSerializer and do the same for other model readers	2018-11-12 16:12:20 -08:00
Simon Walton	6ee837d47c	OctreeDataUtils - use new json from DS also; allow upload of large domains	2018-11-12 15:43:09 -08:00
John Conklin II	0370c60398	Merge pull request #14358 from AndrewMeadows/fix-capsuleY ... Case 18436: consistent handling of CapsuleShape dimensions	2018-11-12 15:25:42 -08:00
sabrina-shanman	753557736e	Merge branch 'master' into hfm_library	2018-11-12 15:03:30 -08:00
amantley	bcd651a65d	adding the member variable to keep track of the orig bind matrices to fbx.h	2018-11-12 14:39:48 -08:00
amantley	3f732baf86	Merge remote-tracking branch 'upstream/master' into avatarPipelineOffsets	2018-11-12 14:38:17 -08:00
John Conklin II	ec4f2f781d	Merge pull request #14352 from Atlante45/feat/solo-source ... [master] Add audio soloing feature	2018-11-12 14:07:30 -08:00
Roxanne Skelly	762033580d	And remove another url log item.	2018-11-12 13:48:08 -08:00
Roxanne Skelly	7a14cb1bbc	Remove additional url logging message.	2018-11-12 13:36:14 -08:00
SamGondelman	df1a848811	fix fade out	2018-11-12 12:58:40 -08:00
Howard Stearns	66ae01e0c3	Merge branch 'master' of github.com:highfidelity/hifi into no-url-logging	2018-11-12 12:55:20 -08:00
Simon Walton	8c347fae70	Fixes for domain server use of changed OctreeDataUtils	2018-11-12 12:45:01 -08:00
amantley	92befbc5bf	implementing backup of cluster matrices	2018-11-12 11:12:56 -08:00
John Conklin II	512b847684	Merge pull request #14339 from hyperlogic/bug-fix/anim-debug-draw-crash ... AnimDebugDraw: Prevent multi-threaded access to shared map collection.	2018-11-12 10:47:01 -08:00
John Conklin II	9d404a6cf3	Merge pull request #14379 from Cristo86/gles_use_tbo_no_ssbo ... case 19562: GLES - Use TBO instead of SSBO and make shaders use it when it is not gl45 (master)	2018-11-12 10:45:52 -08:00
John Conklin II	33da88f174	Merge pull request #14351 from luiscuenca/tweakTransitAnimations ... Tweak transit animations	2018-11-12 10:39:56 -08:00
Wayne Chen	ea325acef9	Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2	2018-11-12 10:28:03 -08:00
Brad Hefta-Gaub	22dd958582	Merge pull request #14297 from jherico/feature/vcpkg ... Case 19807: Switch to vcpkg for many dependencies on all non-mobile platforms	2018-11-12 09:52:02 -08:00
John Conklin II	dc4b967ff5	Merge pull request #14331 from SimonWalton-HiFi/large-avatars-bad-position ... Clamp avatar-joint translations that hit the compressed-format limit	2018-11-11 16:27:56 -08:00
amantley	5bb2378cd9	changes to get the engineer working	2018-11-09 15:10:14 -08:00
Zach Fox	be5dc36ccd	Actually fix build error...hopefully!	2018-11-09 14:23:15 -08:00
SamGondelman	1d1510e18e	Merge remote-tracking branch 'upstream/master' into police	2018-11-09 13:32:41 -08:00
Jeff Clinton	b9c11aad7b	Merge pull request #14259 from SamGondelman/webLock ... Case 18986: Enable interaction with locked web entity	2018-11-09 12:21:13 -08:00
SamGondelman	b3abd97707	projected materials and repeat property	2018-11-09 10:47:07 -08:00
Zach Fox	df7486d0f5	Remove unused variable, fixing unix build warning	2018-11-09 10:40:46 -08:00
Zach Fox	5cf2041c65	Remove unused variable	2018-11-09 10:38:20 -08:00
Sam Gateau	e263776b19	Address the mac bug with ResourceBUffer implemented with TBO	2018-11-09 13:22:27 -03:00
Angus Antley	fd365b5509	added debug print to fbx reader to see if the fst is being read correctly	2018-11-09 07:22:36 -08:00
Angus Antley	dce040978c	works two joint avatar with luis's new code. remains to do the engineer	2018-11-09 01:31:27 -08:00
Olivier Prat	4e89e9ed2a	Fixed draw / do_draw in GLBackends	2018-11-09 09:58:17 +01:00
Angus Antley	11bb448f9f	merged luis code with the fbx having the jointOffsets now	2018-11-09 00:46:32 -08:00
Angus Antley	e36ab9efd6	cleaned up for merge with luis	2018-11-09 00:44:52 -08:00
Angus Antley	244b768b9a	fixed the absolute default joint poses so they work for the 2 joint avatar	2018-11-08 23:42:50 -08:00
Simon Walton	d183968175	Add skipThoseWithBadParents functionality to octree visitor; reviewer suggestions	2018-11-08 18:20:20 -08:00
amantley	2cd3575e32	merged with master with hfm file changes	2018-11-08 17:31:49 -08:00
amantley	8735b409ab	in the process of changing the rotation application to being absolute joints not local	2018-11-08 17:12:10 -08:00
luiscuenca	2586811e76	Merge with master	2018-11-08 18:05:19 -07:00
Wayne Chen	f66326fc4d	Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2	2018-11-08 15:51:24 -08:00
Dante Ruiz	f5b89ee7aa	reverting previous change	2018-11-08 15:43:45 -08:00
Dante Ruiz	5d000495df	making requested changes	2018-11-08 15:33:18 -08:00
Dante Ruiz	2a16ba57ac	fix image entity crash	2018-11-08 15:24:57 -08:00
John Conklin II	3fabe557c2	Merge pull request #13948 from danteruiz/3d-keyboard ... 3D Keyboard.	2018-11-08 13:35:13 -08:00
Brad Davis	8c4f0ec774	Vcpkg migration	2018-11-08 12:28:06 -08:00
Brad Davis	8c4237b520	Fix warnings	2018-11-08 12:27:56 -08:00
Brad Davis	caf952c252	Fix duplicated window member	2018-11-08 12:27:55 -08:00
Jeff Clinton	ea8dc8ae68	Merge pull request #14334 from danteruiz/interstitial-bug-fixes ... Interstitial bug fixes	2018-11-08 11:43:38 -08:00
Clement	f337579616	CR	2018-11-08 11:31:22 -08:00
Zach Fox	1b2593fd26	CR round 4	2018-11-08 11:28:07 -08:00
Wayne Chen	e266532888	Merge branch 'master' into loginInitiative2	2018-11-08 11:17:24 -08:00
Ryan Huffman	1ff644b619	Merge pull request #14256 from ctrlaltdavid/M17008 ... Fix Interface crash importing JSON with duplicate entity IDs in file	2018-11-08 11:04:43 -08:00
Zach Fox	811b01816b	CR round 3	2018-11-08 10:41:31 -08:00
Zach Fox	e0ca535853	CR round 2	2018-11-08 10:08:42 -08:00
Zach Fox	142dfab9ac	CR round 1	2018-11-08 10:05:57 -08:00
Dante Ruiz	358aa547b1	feedback changes	2018-11-08 09:58:53 -08:00
Dante Ruiz	f664421fe0	addressing code review feedback	2018-11-08 09:58:53 -08:00
Dante Ruiz	501746b156	3D Keyboard	2018-11-08 09:58:53 -08:00
Zach Fox	1ab1cb95d8	Merge branch 'master' of github.com:highfidelity/hifi into no-url-logging	2018-11-08 09:57:10 -08:00
Zach Fox	b97fd6eb95	Merge pull request #14255 from zfox23/textToSpeech ... Text to Speech App	2018-11-08 09:44:59 -08:00
Andrew Meadows	5bfb9c1f71	fix ShapeInfo::contains() logic for capsule shapes	2018-11-08 08:39:43 -08:00
Olivier Prat	be7806644a	Removed ternary operators with mix (try to limit branching)	2018-11-08 17:29:00 +01:00
Olivier Prat	87e6bffc46	Added sampler2Darray precision for GLES	2018-11-08 14:28:00 +01:00
Olivier Prat	d64127aa9c	Android shader compilation fix	2018-11-08 13:48:19 +01:00
Olivier Prat	829e5ff44f	Same android problem fix, but elsewhere	2018-11-08 13:37:22 +01:00
Olivier Prat	09b26db650	Shader fix for android... <sigh>	2018-11-08 13:19:42 +01:00
Olivier Prat	40b7b42f5b	Bis	2018-11-08 12:29:01 +01:00
Olivier Prat	cd89ce5388	Another stupid android shader compilation error fix	2018-11-08 12:07:17 +01:00
Olivier Prat	de2f1c52cc	Another android shader compilation fix	2018-11-08 11:44:47 +01:00
Olivier Prat	05ac2fccb6	Still android fixes	2018-11-08 11:24:46 +01:00
Olivier Prat	851cfff960	Again, android shader compilatio fix	2018-11-08 11:06:28 +01:00
Olivier Prat	c79c403a52	More android shader compilation fixes	2018-11-08 10:47:24 +01:00
Olivier Prat	7e93d91bfa	Fixed android shader compilation	2018-11-08 09:29:02 +01:00
Olivier Prat	9d5dcec0a0	Merge from master	2018-11-08 09:14:42 +01:00
Clement	ef54a63de6	Use uint8_t instead of bool on the wire	2018-11-07 17:54:49 -08:00
Clement	8f763dfd50	Fix bug and crash in solo logic	2018-11-07 17:46:18 -08:00
amantley	6b4620b4a1	working on the input mapper problem for the offset rotations	2018-11-07 17:32:23 -08:00
Wayne Chen	c0b13c06d6	remove unneeded stuff.	2018-11-07 16:44:50 -08:00
Wayne Chen	f683a51ef5	allowing qApp to load overlay/load default scripts if runningscripts empty	2018-11-07 16:32:06 -08:00
Sam Gateau	4489efa58b	Merge pull request #14346 from AndrewMeadows/fix-crash-19654 ... Case 19654: fix crash in btCollisionWorld::updateSingleAabb()	2018-11-07 16:09:36 -08:00
Zach Fox	48d3450c5a	Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech	2018-11-07 14:59:23 -08:00
sam gateau	9ada9a7ad3	Merge branch 'master' of github.com:highfidelity/hifi into black-bis	2018-11-07 12:07:15 -08:00
Wayne Chen	51586625e7	Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2	2018-11-07 12:02:38 -08:00
sabrina-shanman	4d9c20343a	Link shared library in hfm	2018-11-07 11:44:58 -08:00
Clement	65a83cb026	Resend solo nodes on mixer reconnect	2018-11-07 11:41:04 -08:00
Jeff Clinton	63bf077776	Merge pull request #14263 from ElderOrb/better_imports_for_controls_and_styles ... Better imports for controls and styles	2018-11-07 11:19:55 -08:00
Sam Gateau	e28560a9c7	Merge pull request #14311 from SamGondelman/interstitial ... Case 19682: Disable interstitial on android	2018-11-07 10:47:31 -08:00
Sam Gateau	d15c8a8854	Merge pull request #14313 from SamGondelman/macFix ... Case 19686: Possibly fix mac debug deferred issue	2018-11-07 10:33:41 -08:00
Sam Gateau	8cda3f729b	Merge pull request #14316 from AndrewMeadows/workload-views-include-MyAvatar ... Case 19394: always keep entities near MyAvatar in physics simulation	2018-11-07 10:26:47 -08:00
Sam Gateau	5d0be31fe7	Merge pull request #14354 from SamGondelman/deadlock ... Case 19735: Fix ResourceCache mutex issues	2018-11-07 09:55:41 -08:00
sabrina-shanman	2c94d1f620	Fix hfm not linking in script-engine for Android build	2018-11-07 09:24:42 -08:00
amantley	1dbccc814b	working on the ik dislocation caused by the offsets, head is what I am working on	2018-11-06 17:35:53 -08:00
Simon Walton	f88168bdfb	Send avatar-joint translations at world scale	2018-11-06 17:29:02 -08:00
sabrina-shanman	8b37133875	Remove unnecessary draco dependency from hfm library	2018-11-06 17:10:44 -08:00
Wayne Chen	1ded4b6fb8	hiding previous username/hiding dev menu	2018-11-06 16:45:45 -08:00
Roxanne Skelly	cef7000a72	Case 19754 - Remove logging URLs and related file locations. ... The goal is to strip out data that can be used by untoward users in copying models, avatars, etc.	2018-11-06 16:24:32 -08:00
SamGondelman	e20aeb28eb	force low detail on oculus first run	2018-11-06 15:58:35 -08:00
Wayne Chen	7c2dd973b7	Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2	2018-11-06 15:34:34 -08:00
Wayne Chen	8797c40d94	cleanup unused functions	2018-11-06 15:04:51 -08:00
sabrina-shanman	e654ff9bbc	Remove forward declaration in HFM.h so ModelPackager and other things can use it instead	2018-11-06 14:53:23 -08:00
amantley	e52f2ab7d6	works for two joints now	2018-11-06 14:14:57 -08:00
sabrina-shanman	70c9db38ef	Do not reference HFM inside the hfm namespace	2018-11-06 14:13:48 -08:00
sabrina-shanman	8fa72396ef	Consolidate HFM class implementations into source file and move model ... logging.	2018-11-06 14:05:36 -08:00
Clement	0ca0a6f3be	Fix JSDoc arrays	2018-11-06 12:57:17 -08:00
Andrew Meadows	91f6a5057a	correct capsule height when building btCapsuleShape	2018-11-06 12:54:56 -08:00
Andrew Meadows	6ecf850159	clarify ShapeInfo::setCapsuleY() API and use it correctly	2018-11-06 12:37:55 -08:00
Clement	4e802b0f3f	Add JSDoc comments	2018-11-06 11:59:15 -08:00
SamGondelman	1444b3a186	resource mutex issues ... (cherry picked from commit 750629a6194ec98534746a377b3ba027c1dcc20e) (cherry picked from commit fc5ab3289a5f88f245c2825edd085532bd4c97ca)	2018-11-06 11:57:57 -08:00
sabrina-shanman	1a69afb3e8	Move HFM.h to hfm subfolder per convention	2018-11-06 11:43:19 -08:00
Zach Fox	53742e90f5	Cleanup after merge	2018-11-06 10:30:10 -08:00
Zach Fox	58dd690c0a	Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech	2018-11-06 10:29:05 -08:00
luiscuenca	e0d1ef3be3	Fix debug output	2018-11-06 11:11:16 -07:00
luiscuenca	599b7761b2	Read quats from fst	2018-11-06 11:09:56 -07:00
luiscuenca	0f1b12475e	Use clamp	2018-11-06 10:15:17 -07:00
luiscuenca	0f183b409b	Fix warnings	2018-11-06 10:08:06 -07:00