31383 commits

Author	SHA1	Message	Date
sabrina-shanman	2b355e9d52	Re-name ColorChannelMapping to ColorChannel and put versions in two specific libraries rather than shared	2019-02-12 11:56:44 -08:00
SamGondelman	f75a3e1a72	it's working!	2019-02-12 11:41:47 -08:00
Brad Davis	a6f23f48d6	Merge branch 'feature/quest_custom_plugins' into feature/quest	2019-02-12 09:53:12 -08:00
SamGondelman	189ccfde4a	clement's comments from PR14858	2019-02-12 09:51:11 -08:00
SamGondelman	d2ecc21f0b	Merge remote-tracking branch 'upstream/master' into materialMapping	2019-02-12 09:46:40 -08:00
SamGondelman	61346437da	working on material mapping	2019-02-12 09:22:31 -08:00
Sam Gateau	0c2c581c64	Add the gles backend MS texture ad framebuffer support	2019-02-11 22:52:35 -08:00
Sam Gateau	afb6c838eb	REverting all the changes from the brown branch not used	2019-02-11 20:13:37 -08:00
Sam Gateau	9ad783135c	Bringing back brownBis to just msaa support	2019-02-11 19:42:05 -08:00
Sam Gateau	8a4f7fe2b6	Merge branch 'master' of https://github.com/highfidelity/hifi into brown	2019-02-11 18:57:33 -08:00
sabrina-shanman	2c5446dfb5	Merge branch 'master' into gltf_mat-support	2019-02-11 17:46:23 -08:00
Jeff Clinton	123c2301da	Merge pull request #14858 from SamGondelman/fst ... Case 21046: Fix Subsurface Scattering and ResourceCache "extra" bug	2019-02-11 17:40:44 -08:00
SamGondelman	77a8ddb3f0	Merge remote-tracking branch 'upstream/master' into materialMapping	2019-02-11 16:35:05 -08:00
sabrina-shanman	e16e968e98	Merge branch 'fst' of github.com:SamGondelman/hifi into gltf_mat-support	2019-02-11 16:23:15 -08:00
Brad Davis	b896e2577b	Fix QML file selectors	2019-02-11 16:17:06 -08:00
SamGondelman	d96b0534ab	fix resource texture crash	2019-02-11 16:12:13 -08:00
SamGondelman	4202685a4b	Merge remote-tracking branch 'upstream/master' into fst	2019-02-11 16:07:36 -08:00
Brad Davis	e534270f9a	Merge remote-tracking branch 'upstream/master' into feature/quest_custom_plugins	2019-02-11 15:41:32 -08:00
SamGondelman	f53ccf7363	fix create, working on mini tablet	2019-02-11 14:54:53 -08:00
David Rowe	8e0ff9b4de	Fix up some "Client Entity" JSDoc API classifications	2019-02-12 11:50:09 +13:00
David Rowe	5428bb19dc	Add "Avatar Script" JSDoc API classification	2019-02-12 11:49:49 +13:00
SamGondelman	d988de4a17	Merge remote-tracking branch 'upstream/master' into NOverlaysFinal	2019-02-11 10:27:12 -08:00
raveenajain	cfc13de39d	Merge branch 'master' of https://github.com/highfidelity/hifi into glb_files	2019-02-11 10:25:46 -08:00
SamGondelman	4f03157f39	working on fst material mapping	2019-02-11 10:20:55 -08:00
amerhifi	e6366eaf02	consolidated the OculusAcitivity into OCulusMobilieAcitivity to reduce amount of back and forth between super and base as well as remove reduntant calls to native. Moved setcontentView on the native callback becuase it was blocking QtActivity from finishing its initialization	2019-02-11 09:46:06 -08:00
sabrina-shanman	0fda6bd3e0	Merge 'samuel/fst' into gltf_mat-support	2019-02-11 09:28:29 -08:00
sabrina-shanman	5840f272ed	Store mapped single channel texture with alpha of 255 just to be safe	2019-02-11 09:07:45 -08:00
sabrina-shanman	f7d7136b3e	Do not have hash specialization just for ColorChannelMapping	2019-02-11 09:06:26 -08:00
sabrina-shanman	0f291612c3	Fix invalid processImage calls in TextureBaker.cpp	2019-02-11 09:04:41 -08:00
SamGondelman	20841a0eea	fix skybox loading I think and pull in sabrina's ktx caching fix	2019-02-09 16:42:34 -08:00
Brad Hefta-Gaub	a23f436a9f	Merge pull request #14880 from kencooke/audio-meter-improvements ... Case 21091: Improved audio metering	2019-02-08 19:08:31 -08:00
sabrina-shanman	23806ed67d	Add support for GLTF roughness/metallic	2019-02-08 18:54:40 -08:00
raveenajain	709f784fea	:}	2019-02-08 16:51:18 -08:00
raveenajain	43a1c78402	Merge branch 'master' into glb_files	2019-02-08 15:59:01 -08:00
Anthony Thibault	88bb2c9bda	Merge pull request #14884 from hyperlogic/bug-fix/pack-all-traits-in-client-traits-handler ... Pack all non-instanced avatar traits	2019-02-08 15:40:50 -08:00
Shannon Romano	bd33855820	Merge pull request #14786 from raveenajain/gltf_update ... Case 20866: gltf color attribute	2019-02-08 15:27:41 -08:00
Shannon Romano	48db974aec	Merge pull request #14843 from raveenajain/gltf_embedded ... Case 20937: gltf embedded data	2019-02-08 15:27:07 -08:00
Anthony Thibault	e6cdfe3377	Merge pull request #14827 from luiscuenca/FixShapeInfoAssertion ... Case 14722: Fix assertion when trying to create multisphere shapeInfo with empty data (80.0/master)	2019-02-08 15:10:44 -08:00
Roxanne Skelly	74f8615fb7	Merge pull request #14876 from roxanneskelly/QmlMarketplace ... Case 20653: QmlMarketplace - disable links if 3dhtml surfaces are not available	2019-02-08 15:04:35 -08:00
Sabrina Shanman	baf72eaae0	Merge pull request #14802 from sabrina-shanman/hfm_prep_joints ... Case 20887: Move FST joint property handling to the model preparation step	2019-02-08 15:02:23 -08:00
Cristian Duarte	514c552a4d	Android - Remove block that disabled AnimInverseKinematics::overlay method	2019-02-08 19:53:59 -03:00
John Conklin II	95aadeafb0	Merge pull request #14868 from SamGondelman/color ... Case 21070: Fix black albedo coloring	2019-02-08 14:42:19 -08:00
John Conklin II	ab8ef2db08	Merge pull request #14862 from SamGondelman/backface ... Case 21047: Render backfaces of triangles on Procedural Entities	2019-02-08 14:41:10 -08:00
John Conklin II	78f0a3feaa	Merge pull request #14739 from SamGondelman/animations ... Case 20398: Fix animation URL change	2019-02-08 14:40:24 -08:00
Roxanne Skelly	93665fa501	Merge branch 'master' of https://github.com/highfidelity/hifi into QmlMarketplace	2019-02-08 14:21:29 -08:00
John Conklin II	851b968501	Merge pull request #14737 from SamGondelman/zone ... Case 19291: Fix zone bugs	2019-02-08 14:07:26 -08:00
Anthony Thibault	d012d07519	Merge pull request #14865 from hyperlogic/feature/anim-optimizations ... Animation System Optimizations	2019-02-08 12:44:10 -08:00
Sam Gateau	f9e827afa5	Merge branch 'master' of github.com:highfidelity/hifi into brown	2019-02-08 12:04:59 -08:00
Shannon Romano	a78b83c1dd	Merge pull request #14874 from sabrina-shanman/bug_no-normal-textures ... (case 21076) Fix missing normal textures on models (RC80)	2019-02-08 11:19:22 -08:00
SamGondelman	f7a487a020	move materialcache et al to material-networking library	2019-02-08 10:28:07 -08:00
Anthony Thibault	5b7d7b8833	Pack all non-instanced traits ... Previously this code only would pack the skeletonModelURL trait. Which is technically not a bug, because there it is the only non-instanced trait. But, we plan to add new traits in the future. So, lets fix this now.	2019-02-08 08:53:43 -08:00
Roxanne Skelly	e6b2c890d0	Case21085 - Changing domains with scripting APIs not working ... AccountManager was earlier changed to support QUrlQuery for query strings in it's 'send.' Unfortunately, QUrlQuery isn't a scriptable property type so using AM was failing from scripts	2019-02-07 22:21:05 -08:00
Sam Gateau	48d671c6c3	Merge branch 'master' of https://github.com/highfidelity/hifi into brown	2019-02-07 18:54:19 -08:00
Ken Cooke	d014dc2d14	Add audio meter ballistics for less display jitter (10ms attack, 300ms release)	2019-02-07 15:35:20 -08:00
Ken Cooke	2617febbcd	Replace ad-hoc audio meter with meter calibrated in dBFS	2019-02-07 15:31:13 -08:00
Brad Davis	d3301803d3	Support custom display / input plugin lists and small tweaks	2019-02-07 15:15:26 -08:00
raveenajain	446176d3a5	update to parse glb files	2019-02-07 15:08:04 -08:00
Jeff Clinton	54109deab9	Merge pull request #14825 from SamGondelman/fall ... Case 20829: Always fall when flying is not allowed	2019-02-07 14:39:46 -08:00
SamGondelman	c217f8d80f	remove overlay picks from stats qml	2019-02-07 14:25:07 -08:00
John Conklin II	dda310c0b9	Merge pull request #14835 from SamGondelman/textures ... Case 20944: Fix Model textures property	2019-02-07 14:19:01 -08:00
SamGondelman	e601f6c59f	move material mapping to hfm prep step	2019-02-07 14:10:09 -08:00
Brad Davis	070fb25b80	Cleaning up differnces from master	2019-02-07 13:33:28 -08:00
SamGondelman	3addcb630c	Merge remote-tracking branch 'sabrina/hfm_prep_joints' into materialMapping	2019-02-07 11:45:59 -08:00
Anthony Thibault	f8608464fa	warning fixes	2019-02-07 11:33:44 -08:00
sabrina-shanman	ef529ed309	Do not use continues in logic checking if we should calculate mesh tangents	2019-02-07 11:27:08 -08:00
sabrina-shanman	985f6dcb75	Fix normal textures not being visible	2019-02-07 11:22:33 -08:00
danteruiz	95d30e5cbf	Merge branch 'master' of github.com:highfidelity/hifi into feature/quest	2019-02-07 10:41:44 -08:00
SamGondelman	7fe0e5909e	fix black albedo coloring	2019-02-07 10:14:10 -08:00
SamGondelman	e74ff18bef	Merge remote-tracking branch 'upstream/master' into NOverlaysFinal	2019-02-07 09:49:27 -08:00
SamGondelman	25ca52d892	Merge remote-tracking branch 'upstream/master' into NOverlaysFinal	2019-02-07 09:48:13 -08:00
Cristian Duarte	babb972d89	Merge remote-tracking branch 'hifi/master' into android_handshake	2019-02-07 14:44:22 -03:00
Sam Gateau	632d6e8a73	Merge pull request #14863 from danteruiz/android-apps-directories ... Case 20877: Support CMake time configuration of QmlFileSelectors	2019-02-07 09:30:49 -08:00
Ken Cooke	ba00f95f72	Expose clipping status to audio scripting interface	2019-02-06 18:23:50 -08:00
Sam Gateau	4648c47af8	Merge branch 'master' of https://github.com/highfidelity/hifi into brown	2019-02-06 18:13:26 -08:00
Sam Gateau	29573aaa83	fix the half resoolution problem	2019-02-06 16:41:23 -08:00
Ken Cooke	918e2fc7ab	Proper detection of digital clipping on the unprocessed audio input. ... Triggered when 3+ consecutive samples > -0.1 dBFS.	2019-02-06 16:08:30 -08:00
Shannon Romano	6fd480e51d	Merge pull request #14795 from AndrewMeadows/myAvatar-vs-backfacing-triangles-2 ... case 17773: reduce likelihood MyAvatar will get stuck in mesh geometry when flying around	2019-02-06 15:52:31 -08:00
Jeff Clinton	2c666aed5e	Merge pull request #14821 from SamGondelman/owningAvatarID ... Case 20932: Fix getEntityProperties	2019-02-06 14:43:31 -08:00
Sam Gateau	db30857b87	Merge branch 'master' of github.com:highfidelity/hifi into brown	2019-02-06 13:21:34 -08:00
Brad Davis	8b70f1771e	Merge remote-tracking branch 'upstream/master' into feature/quest	2019-02-06 13:16:22 -08:00
Sam Gateau	9ff9117a34	Merge pull request #14811 from jherico/feature/quest_frame_player ... Case 20884: Quest frame player and Oculus libraries	2019-02-06 13:15:39 -08:00
Brad Davis	b40595b14f	Fix merge issue	2019-02-06 13:06:04 -08:00
Sam Gateau	8ec9c8502d	Merge branch 'master' of github.com:highfidelity/hifi into brown	2019-02-06 12:09:38 -08:00
Shannon Romano	6a91b54261	Merge pull request #14856 from AndrewMeadows/fix-crash-on-early-shutdown-redux ... case 21042: fix interface crash on early shutdown, 0.80.0 redux	2019-02-06 11:53:49 -08:00
Shannon Romano	30a6f25b69	Merge pull request #14851 from AndrewMeadows/myAvatar-unmovable-until-floor ... case 20048: don't allow MyAvatar to move until physics enabled	2019-02-06 11:52:42 -08:00
SamGondelman	9193704173	trying to get hashes working	2019-02-06 11:47:38 -08:00
danteruiz	d0fecac0d8	+android -> +android_interface	2019-02-06 11:37:52 -08:00
Shannon Romano	61459d5756	Merge pull request #14775 from roxanneskelly/QmlMarketplace ... Qml marketplace	2019-02-06 11:20:49 -08:00
Shannon Romano	26927aaec6	Merge pull request #14847 from AndrewMeadows/trust-the-packet ... Case 20959: fix crash for incorrect parsing of AvatarEntity data	2019-02-06 11:15:13 -08:00
SamGondelman	4c9fb168c7	enable backface culling on procedurals	2019-02-06 10:55:36 -08:00
Brad Davis	91e18f569b	Merge remote-tracking branch 'upstream/master' into feature/quest	2019-02-06 10:15:36 -08:00
Dante Ruiz	6c9d15d9a9	remove used variable	2019-02-06 09:58:02 -08:00
Dante Ruiz	aa645af744	fix quest controllers	2019-02-06 09:19:36 -08:00
Sam Gateau	d8f6583047	Merge branch 'master' of github.com:highfidelity/hifi into brown	2019-02-06 09:01:38 -08:00
John Conklin II	3ee412faf7	Merge pull request #14854 from danteruiz/quest-default ... Case 21037: Allow the script engine to use FileSeclector when loading scriopts	2019-02-06 07:21:03 -08:00
Sam Gateau	35491bf5b0	Multisampling works in 4.1	2019-02-06 00:05:17 -08:00
Anthony Thibault	5c7e81584c	AnimPose::inverse() optimization	2019-02-05 18:23:58 -08:00
Anthony Thibault	87498b3dd2	Avoid dynamic_cast in getAnimInverseKinematicsNode	2019-02-05 18:15:05 -08:00
Anthony Thibault	708309fa63	CubicHermiteSplineWithArcLength optimization	2019-02-05 18:11:30 -08:00
Anthony Thibault	a959d69554	Make AnimSkeleton::getParentIndex() more cache coherent	2019-02-05 18:10:32 -08:00
Sam Gateau	893bbe3a37	Merge branch 'master' of github.com:highfidelity/hifi into brown	2019-02-05 18:02:09 -08:00
Sam Gateau	b1b6533295	Restore clear	2019-02-05 18:01:41 -08:00
SamGondelman	3ee448a89a	fix scattering and working on resource cache bug	2019-02-05 17:32:15 -08:00
Andrew Meadows	16ef30ced0	don't flushRepeatedMessages() in LogHandler dtor	2019-02-05 17:14:25 -08:00
Clement	8b32a62e2f	Simplify filter check	2019-02-05 17:03:19 -08:00
Clement	5945823606	Honor full scene resends	2019-02-05 17:03:19 -08:00
Ken Cooke	f9afe6fe43	Detect loudness and clipping on the raw audio input	2019-02-05 16:39:03 -08:00
Anthony Thibault	d8644a2745	Simplify isEqual computation for vectors used in Rig	2019-02-05 15:06:29 -08:00
John Conklin II	ae6672533c	Merge pull request #14788 from jherico/feature/quest_gpu_timers ... Case 20876: Quest: Support gpu timing on systems with disjoint timer extension	2019-02-05 14:49:40 -08:00
John Conklin II	ec0bdba7fb	Merge pull request #14814 from sethalves/fix-edit-in-releaseGrab ... case 20919: Fix edit in release grab	2019-02-05 14:48:59 -08:00
Anthony Thibault	569bef50fd	AnimPose operator* optimizations	2019-02-05 14:48:05 -08:00
danteruiz	30bd9774b2	script engine to load platform specific files	2019-02-05 13:11:54 -08:00
Jeff Clinton	35608c35de	Merge pull request #14808 from danteruiz/webengine-fileselector ... Case 20879: Migrate webEngine referencing QML into +webengine folder	2019-02-05 12:57:38 -08:00
Ken Cooke	cfaa841746	Add output silence-detection to the noise gate processing	2019-02-05 12:34:42 -08:00
Sam Gateau	59d53bd716	Merge branch 'master' of github.com:highfidelity/hifi into brown	2019-02-05 12:20:39 -08:00
raveenajain	253e3554af	feedback	2019-02-05 10:18:34 -08:00
raveenajain	21fa1878cb	spaces	2019-02-05 09:28:47 -08:00
raveenajain	d109c0fb1b	feedback changes	2019-02-05 09:23:10 -08:00
Brad Hefta-Gaub	936837c886	Merge pull request #14823 from Atlante45/fix/scripts-load-fail-master ... [master] Fix reload mechanic for entity server scripts	2019-02-05 09:19:56 -08:00
Andrew Meadows	5a4960b300	add crash::doAssert() for debug purposes	2019-02-05 09:00:48 -08:00
Sam Gateau	4089f8c5b0	Adding Color filter to the tone mapper	2019-02-04 23:45:35 -08:00
Sam Gateau	99251bdd6d	Merge branch 'master' of https://github.com/highfidelity/hifi into brown	2019-02-04 19:16:14 -08:00
raveenajain	9fe42a0549	Merge branch 'master' of https://github.com/highfidelity/hifi into gltf_embedded	2019-02-04 16:49:23 -08:00
Roxanne Skelly	78aa1783a0	Merge branch 'master' of https://github.com/highfidelity/hifi into QmlMarketplace	2019-02-04 15:04:55 -08:00
Jamil Akram	bab411e001	Merge pull request #14822 from hyperlogic/bug-fix/anim-tests-work-again ... Make Animation Unit Tests Pass Again	2019-02-04 12:45:12 -08:00
SamGondelman	31cf623252	fix keyboard focus	2019-02-04 12:44:04 -08:00
Andrew Meadows	1d7265f668	trust the data in the packet, Luke	2019-02-04 09:45:06 -08:00
Sam Gateau	d0a044120a	Adding the sub samples control	2019-02-03 21:31:19 -08:00
SamGondelman	4b406bf41c	fix getEntityObject and tablet highlighting (Overlays.findOverlays)	2019-02-01 16:23:06 -08:00
SamGondelman	391cca787f	fix keyboard textures and text display	2019-02-01 15:33:53 -08:00
SamGondelman	b80d2a9b06	Merge remote-tracking branch 'upstream/master' into NOverlaysFinal	2019-02-01 13:33:04 -08:00
SamGondelman	50bfe84aa7	fix keyboard intersection, laser alpha	2019-02-01 12:11:00 -08:00
raveenajain	d1d8832e7a	read in embedded data	2019-02-01 11:27:43 -08:00
Sam Gateau	8671e7c499	Merge branch 'master' of github.com:highfidelity/hifi into brown	2019-01-31 17:11:35 -08:00
Sam Gateau	84db9f4729	testing the water...	2019-01-31 16:18:47 -08:00
SamGondelman	0955512a80	add billboard mode to web entities and fix picking/culling	2019-01-31 15:45:10 -08:00
sabrina-shanman	3d1edf4d9e	Make small code improvements to PrepareJointsTask	2019-01-31 15:00:50 -08:00
raveenajain	f73296182c	Merge branch 'master' of https://github.com/highfidelity/hifi into gltf_embedded	2019-01-31 14:19:58 -08:00
raveenajain	997660d430	review changes	2019-01-31 13:50:17 -08:00
raveenajain	216e9bd4cb	Merge branch 'master' of https://github.com/highfidelity/hifi into gltf_update	2019-01-31 13:47:38 -08:00
raveenajain	ae09aec5d9	embedded model geometry	2019-01-31 13:36:53 -08:00
SamGondelman	ee1552661c	fix textures	2019-01-31 12:04:46 -08:00
Dante Ruiz	778ddad9ac	to the spot on first launch	2019-01-31 10:52:48 -08:00
luiscuenca	5438bddc84	Fix assertion on shapeInfo when creating multisphere with empty data	2019-01-31 09:43:30 -07:00
SamGondelman	2d0c1184e4	only domain zone entities control flying and ghosting	2019-01-30 18:27:17 -08:00
SamGondelman	5553752d81	fall when flying not allowed	2019-01-30 18:04:44 -08:00
Sam Gateau	196748c4f9	Merge branch 'master' of github.com:highfidelity/hifi into brown	2019-01-30 18:04:39 -08:00
Clement	283dabc622	Fix reload mechanic for entity server scripts	2019-01-30 17:29:28 -08:00
Anthony Thibault	2c40b120ca	Make Animation Tests Pass Again	2019-01-30 17:26:52 -08:00
SamGondelman	6e61c02d04	fix getEntityProperties	2019-01-30 17:17:39 -08:00