2877 commits

Author	SHA1	Message	Date
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
Ryan Huffman	a56303a3fe	Merge pull request #11379 from highfidelity/feat/auto-bake ... Add auto baking to Asset Server and mesh compression for FBXs	2017-09-21 08:33:51 -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	d4e35edc84	add memory for unique_ptr in BakeAssetTask	2017-09-19 15:08:44 -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
Anthony J. Thibault	0757f513af	Merge branch 'master' into feature/ant-man	2017-09-18 11:36:39 -07:00
Seth Alves	8a49edbecb	code review	2017-09-15 10:08:35 -07:00
Atlante45	ae14f1f88e	Merge branch 'master' of https://github.com/highfidelity/hifi into feat/auto-bake	2017-09-14 15:34:20 -07:00
Seth Alves	d89f2b77da	rework ScriptEngine lifetimes using 'smart' pointers	2017-09-14 10:42:21 -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
Atlante45	48e58febc6	Remove deprecated AutoBaker	2017-09-13 09:54:54 -07:00
Daniela	6941a10639	Add SensorToWorldScale factor to the bounding box dimensions in AvatarMixerSlave.	2017-09-12 21:10:19 +01:00
Daniela	5a918a3033	Add SensorToWorldScale factor to the bounding box dimensions.	2017-09-12 19:00:57 +01:00
Daniela	c88c70aa6f	Add SensorToWorldScale factor to the bounding box dimensions.	2017-09-12 18:11:45 +01:00
Brad Hefta-Gaub	6a1fe81832	Merge pull request #11210 from AndrewMeadows/mtwabp-OctreeSendThread-002 ... split packet construction from packet sending in OctreeSendThread	2017-09-07 12:36:29 -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
Stephen Birarda	5e1decb02b	Merge branch 'master' of github.com:highfidelity/hifi into feat/auto-bake	2017-09-07 12:06:53 -07:00
Brad Hefta-Gaub	c5098abfb9	Merge pull request #10937 from kencooke/zzmp-audio/peak-values ... Add peak values for all input devices in selection dialog	2017-09-07 11:58:50 -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