195 commits

Author	SHA1	Message	Date
Atlante45	4482f9c83c	Queue all requests until the AS is fully setup	2018-02-15 11:27:21 -08:00
Atlante45	87f77b6257	Asset Server Backup	2018-02-09 11:32:42 -08:00
humbletim	dfb1619dc6	CR feedback; using namespace AssetUtils => inline AssetUtils::	2018-01-18 21:49:53 -05:00
Ryan Huffman	94a58a2471	Remove baking dependency from assignment-client	2017-12-07 10:53:23 -08:00
Ryan Huffman	6b098bfc6a	Fix aborted baking in oven cli	2017-12-06 13:51:31 -08:00
Ryan Huffman	cb9a30413d	Rename removeTemporaryDis to removeTemporaryApplicationDirs	2017-12-06 12:50:20 -08:00
Ryan Huffman	de7e3e60cd	Add temp dir removal to asset server	2017-12-06 11:49:34 -08:00
Stephen Birarda	25c10d5de2	Merge pull request #11735 from highfidelity/stable ... Merge stable back into master	2017-11-02 14:22:31 -07:00
Stephen Birarda	60fbbe4bc0	disable baking of JS files	2017-10-25 14:29:28 -07:00
Clément Brisset	725dc1851e	Merge pull request #11412 from mnafees/21495 ... CR for Job #21495 - Add limit to file size imported into asset server	2017-10-13 13:45:42 -07:00
Stephen Birarda	8a331e29a2	Merge pull request #11455 from utkarshgautamnyu/feat/JS-Baker ... Feat/JS-Baker	2017-10-12 16:16:02 -05:00
Mohammed Nafees	52e29c07cc	Fix warning resulting in build error	2017-10-11 19:59:04 -04:00
Mohammed Nafees	19b00e1364	Add option to limit assets filesize in settings	2017-10-11 19:59:04 -04:00
Ryan Huffman	a6d148475b	Add removal of temporary baked files in AssetServer	2017-10-05 09:08:42 -07:00
utkarshgautamnyu	32e319fedc	Update AssetServer.cpp	2017-09-28 11:23:20 -07:00
utkarshgautamnyu	463afd6be5	made updates to fix building	2017-09-28 11:12:26 -07:00
utkarshgautamnyu	258c32f9aa	Update AssetServer.cpp	2017-09-26 11:52:25 -07:00
utkarshgautamnyu	e81501a4d1	Update AssetServer.cpp	2017-09-26 11:08:48 -07:00
utkarshgautamnyu	0260749b6b	Update AssetServer.cpp	2017-09-26 11:02:22 -07:00
utkarshgautamnyu	9e91ab7630	Update AssetServer.cpp	2017-09-25 20:19:53 -07:00
utkarshgautamnyu	91dad385a6	Refactored AssetServer.cpp	2017-09-25 15:12:04 -07:00
utkarshgautamnyu	cda5e94b33	Added JavaScript Baking	2017-09-22 20:57:18 -07:00
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