30383 commits

Author	SHA1	Message	Date
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
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