395 commits

Author	SHA1	Message	Date
Ryan Huffman	faafd26d2a	Add uncompressed KTX files to baked texture output	2018-06-08 11:39:47 -07:00
David Rowe	e44e7ca35f	Fix up Resource and resource cache APIs' JSDoc	2018-05-21 11:57:16 +12:00
Stephen Birarda	ec354620db	Merge pull request #12956 from huffman/feat/client-texture-selection-baking ... Add support for client texture selection	2018-05-04 16:14:43 -07:00
John Conklin II	c7bc479c60	Merge pull request #13094 from hyperlogic/bug-fix/case-14639 ... Fix for crash deep in QML after useFullAvatarURL	2018-05-04 11:33:28 -07:00
Anthony J. Thibault	fc9bd7f905	Fix for crash deep in QML after useFullAvatarURL ... Here we avoid calling FSTReader::downloadMapping() from within MyAvatar::useFullAvatarURL(). This prevents the error case where a QEventLoop is entered during QML execution.	2018-05-03 14:06:06 -07:00
David Rowe	e95c38d939	Merge branch 'master' into 21856-g ... # Conflicts: # libraries/model-networking/src/model-networking/TextureCache.h	2018-05-03 21:03:14 +12:00
MiladNazeri	8e214d8ee8	Merge pull request #13049 from ctrlaltdavid/21856-d ... List which contexts each namespace and class is available in	2018-05-03 01:29:14 -07:00
Ryan Huffman	529869e80c	Make NetworkTexture extension comparisons case-insensitive	2018-05-02 13:41:52 -07:00
Ryan Huffman	697fde4a1a	Cleanup meta texture related changes	2018-05-02 13:31:32 -07:00
John Conklin II	7a5fce4315	Merge pull request #12991 from luiscuenca/avatarScript ... Avatar Scripts	2018-05-02 12:23:13 -07:00
luiscuenca	689fbd2da0	added requested changes	2018-05-02 11:09:17 -07:00
David Rowe	48632be3c2	Fix up cache APIs' JSDoc	2018-05-02 16:12:48 +12:00
Ryan Huffman	24ac342c6b	Add support for client texture selection	2018-05-01 14:11:31 -07:00
luiscuenca	2de982a5a2	Added script types and better script reload	2018-04-30 12:04:35 -07:00
David Rowe	2cc3ed6287	List which contexts each namespace and object is available in	2018-04-28 20:00:28 +12:00
David Rowe	08dc9b133f	Docs to JSDoc review	2018-04-26 21:10:28 +12:00
luiscuenca	e0770f06b1	Add scripts to Model Packager	2018-04-25 19:35:26 -07:00
MiladNazeri	0f87e53902	Merge pull request #12963 from MiladNazeri/docs/DocsToJSDocsUpdate ... Docs/docs to js docs update	2018-04-25 12:26:19 -07:00
luiscuenca	165c3214a7	Avatar Scripts	2018-04-24 18:43:53 -07:00
milad nazeri	23d07fa292	fixed spacing issue	2018-04-24 13:14:55 -07:00
milad nazeri	1121fe8da0	fix tabs	2018-04-23 21:47:53 -07:00
milad nazeri	4ac06fe99f	Updating previous jsdocs	2018-04-22 22:22:33 -07:00
milad nazeri	e9b9c05b5d	removed cruft	2018-04-22 08:51:47 -07:00
Oren Hurvitz	5e22202355	Material resources: support relative path for emissiveMap	2018-04-16 13:11:03 +03:00
NissimHadar	10ce785ad7	If not in DEBUG then do not call qcDebug (in NetworkTexture::ktxInitialDataRequestFinished)	2018-04-07 09:17:08 -07:00
Dante Ruiz	f5a954d08e	Merge branch 'serverless-domains' of github.com:sethalves/hifi into serverless-domains	2018-03-22 09:06:42 -07:00
Seth Alves	4033af9b11	Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains	2018-03-21 11:11:43 -07:00
SamGondelman	8ddf360c79	support relative paths for material images	2018-03-19 09:59:11 -07:00
Seth Alves	7a7a9e9af0	Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains	2018-03-16 16:55:47 -04:00
Stephen Birarda	472e7c003f	Merge pull request #11860 from huffman/feat/obj-baker-update ... OBJ Baking	2018-03-16 13:54:07 -07:00
Seth Alves	e3022da787	Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains	2018-03-16 09:34:38 -07:00
Dante Ruiz	8cf4e653df	making networktexture handled /~/	2018-03-16 09:04:35 -07:00
Seth Alves	2fd6bc4130	rename Mesh api getPos3 to getPos, deprecate but still support getPos3	2018-03-14 10:24:44 -07:00
Ryan Huffman	11a3a86af3	Merge branch 'master' of github.com:highfidelity/hifi into feat/obj-baker-update	2018-03-13 14:49:26 -07:00
Seth Alves	b39c7eadd2	Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains	2018-03-13 09:24:18 -07:00
Bradley Austin Davis	f48db825c3	Merge pull request #12615 from jherico/fix/ktx_loading ... Fix local KTX files never being removed from pending downloads	2018-03-12 15:04:40 -07:00
Bradley Austin Davis	e33539f575	Remove unused variable	2018-03-10 18:44:24 -08:00
Brad Davis	7d267bb709	Fix local KTX files never being removed from pending downloads	2018-03-09 16:01:45 -08:00
Seth Alves	58bc42990c	merge from upstream	2018-03-09 12:03:26 -08:00
David Rowe	b461a422c6	Merge branch 'master' into 21709	2018-03-09 14:18:42 +13:00
John Conklin II	1341774450	Merge pull request #12482 from SimonWalton-HiFi/declare-metatype ... Add a Q_DECLARE_METATYPE in TextureCache.	2018-03-08 09:37:06 -08:00
Seth Alves	9f2be4db8f	Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains	2018-03-07 15:04:38 -08:00
Sam Gondelman	f51a35455a	Merge pull request #12515 from SamGondelman/scriptableMaterials ... Material reflection	2018-03-07 14:29:31 -08:00
David Rowe	a62b6b7150	Merge branch 'master' into 21709	2018-03-07 17:34:53 +13:00
David Rowe	eeb7f5ca8d	Doc review	2018-03-07 17:29:39 +13:00
Ryan Huffman	ac0ecc8baa	Merge remote-tracking branch 'upstream/master' into feat/obj-baker-update	2018-03-05 10:41:49 -08:00
Seth Alves	606face7c0	gather together the url scheme constants, name them consistently	2018-03-02 20:39:38 -08:00
David Rowe	1a42722d99	Fix Material roughnessMap etc. JSDoc	2018-03-01 10:50:40 +13:00
David Rowe	3275846882	Material entity JSDoc	2018-03-01 09:57:42 +13:00
SamGondelman	b56f755034	material reflection	2018-02-23 17:58:46 -08:00