173 commits

Author	SHA1	Message	Date
Atlante45	a4b9945226	Fix use after free in deleteMappings	2017-09-21 16:22:51 -07:00
Ryan Huffman	abbe263142	Fix FBXBaker not properly handling textures with the same name	2017-09-21 13:40:39 -07:00
Atlante45	dd050e103f	Don't redirect to the same hash.	2017-09-20 18:45:45 -07:00
Stephen Birarda	f6d3960160	fix call to maybeBake when looking at skybox	2017-09-20 15:58:52 -07:00
Stephen Birarda	29a9331f14	change include for QUrlQuery to be consistent	2017-09-20 12:55:50 -07:00
Stephen Birarda	a8ac015bc4	address code review comments	2017-09-19 13:56:42 -07:00
Stephen Birarda	e1d79ee8f4	add abort to Baker and subclasses	2017-09-19 13:18:23 -07:00
Atlante45	9e11ae311e	Fix error reporting	2017-09-13 09:54:55 -07:00
Atlante45	7d9daea0f6	Transmit baking errors to interface for display.	2017-09-13 09:54:54 -07:00
Stephen Birarda	bd36ba19b3	fix dereference of end iterator	2017-09-07 12:07:58 -07:00
Stephen Birarda	e4de869db6	fix iterator find from merge	2017-09-07 12:07:58 -07:00
Stephen Birarda	e25b4700d9	re-set defaults in texture baking when AssetServer done	2017-09-07 12:07:57 -07:00
Stephen Birarda	26b74db864	enable compression in image library from Asset Server	2017-09-07 12:07:57 -07:00
Clément Brisset	7d4f17506e	Merge branch 'feat/auto-bake' into feat/bake-meta-errors	2017-09-01 17:33:25 -07:00
Stephen Birarda	55d44a8c8f	Merge pull request #11285 from Atlante45/feat/baking-enabled ... Wire "Use baked" checkbox	2017-09-01 16:25:49 -07:00
Ryan Huffman	eb2e87a798	Change it++ to ++it	2017-09-01 13:02:25 -07:00
Ryan Huffman	5ee33085a5	Add handling of failedLastBake error in getAssetStatus	2017-09-01 10:37:28 -07:00
Ryan Huffman	7a68788c8c	Fix warning for non-const default in AssetServer	2017-08-31 16:22:46 -07:00
Atlante45	cdfae714b5	Remove baking tasks for hash once done	2017-08-31 15:51:47 -07:00
Ryan Huffman	25f64e1aa9	Merge branch 'feat/auto-bake' of github.com:highfidelity/hifi into feat/bake-meta-errors	2017-08-31 15:17:40 -07:00
Ryan Huffman	d2c7235fed	Fix update to count width in GetAllMappings	2017-08-31 14:41:29 -07:00
Atlante45	a9cfc01df3	Set Baking Enabled API	2017-08-31 13:11:27 -07:00
Atlante45	aad0be2693	Set baking enabled mappings	2017-08-31 13:10:07 -07:00
Atlante45	764e5d2e4c	Move constant to central location	2017-08-31 13:08:18 -07:00
Atlante45	da2bede6fe	Hide .baked items from the Asset Browser	2017-08-31 13:08:18 -07:00
Atlante45	3aee6db1e8	Log baker errors	2017-08-31 13:08:18 -07:00
Ryan Huffman	0cd8a5cd41	Merge branch 'feat/auto-bake' of github.com:highfidelity/hifi into feat/bake-meta-errors	2017-08-31 12:09:21 -07:00
Ryan Huffman	9ce0f03aa2	Fix mapping comparision in getAssetStatus being done against path	2017-08-31 11:58:03 -07:00
Ryan Huffman	d68338f0b0	Add error handling to asset server baking	2017-08-30 16:53:31 -07:00
Stephen Birarda	f2997c0997	refuse to perform mapping operations in /.baked/	2017-08-30 14:30:08 -07:00
Ryan Huffman	f89459525e	Merge pull request #11257 from birarda/feat/delete-baked-with-original ... add deletion of baked content when original removed	2017-08-29 13:18:58 -07:00
Ryan Huffman	e9258ec97a	Fix loading standalone baked textures from Asset Server ... NetworkTexture was not properly handling redirected ATP files. For instance, if going from .jpg -> .ktx, the NetworkTexture class needs to be aware of this so it can stop the current request and make multiple requests for the individual mip levels.	2017-08-28 15:54:40 -07:00
Stephen Birarda	6992bd6f48	add deletion of baked content when original removed	2017-08-28 15:38:31 -07:00
Stephen Birarda	79231cdee0	fix switched signature for completed bake handling	2017-08-25 17:10:09 -07:00
Stephen Birarda	cc7dd2162b	fixes for OS X build	2017-08-25 17:03:52 -07:00
Atlante45	0755b77615	Fix for mac build	2017-08-25 16:32:32 -07:00
Atlante45	065721d23f	Merge branch 'feat/auto-bake' of https://github.com/huffman/hifi into feat/auto-bake	2017-08-25 16:22:14 -07:00
Ryan Huffman	7d08a5788f	Move outputFiles from FBXBaker to Baker	2017-08-25 16:21:00 -07:00
Atlante45	700b11e28b	Fix bad conditional	2017-08-25 16:17:37 -07:00
Atlante45	a36ddf7b6d	Fix failed connection	2017-08-25 16:13:29 -07:00
Atlante45	eaa2b9fda8	Fix packet version conflict	2017-08-25 15:36:33 -07:00
Atlante45	7d103d24f4	Integrate my and Huffman's work	2017-08-25 15:21:08 -07:00
Atlante45	348be788f7	Add BakingEnabled protocol	2017-08-25 10:56:27 -07:00
Atlante45	fd3156b57c	Move BakingStatus	2017-08-25 10:54:33 -07:00
Atlante45	fac6015bb0	Asset baking status first pass	2017-08-25 10:54:30 -07:00
Atlante45	cefd16ad95	Fix asset server debug messages logging category	2017-08-25 10:52:49 -07:00
Ryan Huffman	39f04adc8d	Improve baking interface and add automatic baking to asset server	2017-08-24 16:15:28 -07:00
Stephen Birarda	96672becc6	read redirected path info in MappingRequest	2017-08-15 15:19:20 -07:00
Stephen Birarda	03e952ec38	fix extension check for get mapping redirect	2017-08-14 14:09:35 -07:00
Stephen Birarda	db3524a48f	add re-direct of get mapping for baked assets	2017-08-11 14:26:27 -07:00