58799 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Stephen Birarda	b253d3b57c	fix material triangle index insertion	2017-09-12 17:44:53 -07:00
Stephen Birarda	a25e5796dc	use push_back instead of append for extracted mesh vectors	2017-09-12 16:35:21 -07:00
Stephen Birarda	bb7cd58e9a	fix reference to part index	2017-09-12 16:28:12 -07:00
Stephen Birarda	5d9ed78369	fixes for extracted mesh construction	2017-09-12 16:09:40 -07:00
Stephen Birarda	cf282dd3fc	add code to read draco mesh from FBX	2017-09-12 15:04:53 -07:00
Stephen Birarda	61314949ec	add draco as external to FBX library	2017-09-12 14:10:27 -07:00
Ryan Huffman	395c9283dc	Merge remote-tracking branch 'upstream/feat/auto-bake' into feat/auto-bake-fbxwriter	2017-09-12 14:09:59 -07:00
Clément Brisset	c1685d827e	Merge pull request #11288 from birarda/feat/bake-with-compression ... enable compression in image library from Asset Server	2017-09-12 14:08:03 -07:00
Stephen Birarda	2105f2da92	change unique ID for material and second tex coord	2017-09-12 10:27:07 -07:00
Stephen Birarda	f9cc82c992	use draco 1.1.0 in external	2017-09-12 10:25:44 -07:00
Ryan Huffman	9243cf7590	Remove extraneous logging in FBXWriter	2017-09-12 09:45:46 -07:00
Ryan Huffman	2d9d432221	Update FBXBaker to remove unused nodes from the Geometry node	2017-09-12 09:45:24 -07:00
Ryan Huffman	8fc8b8100d	Fix FBXBaker failing on bad mesh data and draco meshes that can't be encoded	2017-09-12 09:44:44 -07:00
Stephen Birarda	1b2ba3acb6	force libc++ for OS X draco build	2017-09-11 12:07:57 -07:00
Ryan Huffman	b1d0df06d9	Add error handling in FBXBaker for empty nodes and failed draco compression	2017-09-11 12:07:41 -07:00
Ryan Huffman	ebd925b966	Add proper per face materials and texCoords1 to fbx baking	2017-09-11 10:52:59 -07:00
Ryan Huffman	3d6d383a15	Clean up duplicate list code in encodeFBXProperty	2017-09-08 16:58:57 -07:00
Ryan Huffman	9b462171f6	Add draco support to FBXBaker	2017-09-08 16:58:29 -07:00
Stephen Birarda	09d18b5ba9	handle special include path for Draco on WIN	2017-09-08 09:47:16 -07:00
Stephen Birarda	91f4551598	add draco to the oven tool	2017-09-08 09:46:55 -07:00
Stephen Birarda	0d7b50cfb6	remove old texture type method	2017-09-08 09:44:19 -07:00
Stephen Birarda	3cf77f377c	remove FBX SDK from CMake files	2017-09-07 18:46:44 -07:00
Stephen Birarda	b153d1e177	use FBXReader/FBXWriter for texture baking in FBXBaker	2017-09-07 18:38:29 -07:00
Ryan Huffman	7214f57376	Update FBXBaker::exportScene with FBXWriter	2017-09-07 14:12:15 -07:00
Ryan Huffman	b60d68c714	Replace FBX SDK loading of file in FBXBaker with FBXReader	2017-09-07 14:00:09 -07:00
Ryan Huffman	49e09f4838	Remove FBXBaker and TextureBaker from oven	2017-09-07 13:12:07 -07:00
Ryan Huffman	7a55c867be	Fix _fbxNode rename to _rootNode in FBXReader	2017-09-07 12:56:46 -07:00
Ryan Huffman	aa1aad0a09	Add FBXWriter for serializing FBXNode	2017-09-07 12:56:36 -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	1508edb459	use store/load to be clearer about atomics	2017-09-07 12:07:58 -07:00
Stephen Birarda	7859b3b11f	remove image compression choices from Interface settings	2017-09-07 12:07:57 -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
Thijs Wenker	e2229b3c38	Merge pull request #11302 from cain-kilgore/21523 ... WL 21523 - Update text in the "How to Quit The Sandbox" Prompt	2017-09-07 21:04:34 +02:00
Chris Collins	12d720805c	Merge pull request #11319 from jherico/async_qml_load_crash ... Fix potential crash on asynchronous QML loads	2017-09-07 12:03:10 -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
Brad Hefta-Gaub	3b16ebcc90	Merge pull request #11287 from jherico/vcpkg_ssl ... Migrate to vcpkg version of OpenSSL	2017-09-07 11:53:09 -07:00
Brad Hefta-Gaub	7cce45017b	Merge pull request #11244 from birarda/bug/ice-dns-fail ... add a timeout for ICE server DNS lookup	2017-09-07 11:09:05 -07:00
Cain Kilgore	84f37b9663	Changed string name	2017-09-07 18:53:05 +01:00
Brad Hefta-Gaub	fce8715457	Merge pull request #11306 from ElderOrb/case7385 ... 7385 - Collect Stats on "Exit VR" button	2017-09-07 10:18:58 -07:00
Brad Davis	cc3beb3d91	Fix potential crash on asynchronous QML loads	2017-09-07 09:53:21 -07:00
Howard Stearns	a0ae9ee747	Merge pull request #11311 from davidkelly/dk/walletCleanup ... wallet cleanup	2017-09-06 14:29:24 -07:00
anshuman64	94e1545e58	Merge pull request #11298 from ElderOrb/case7382 ... 7382 Create Menu does not Work on Tablet	2017-09-06 14:09:41 -07:00
Stephen Birarda	c5f7c5d314	Merge pull request #11281 from huffman/feat/bake-meta-errors ... Add auto bake error handling to asset server	2017-09-06 13:20:16 -07:00
Chris Collins	8563a05431	Merge pull request #11255 from misslivirose/feat/tablet-tutorial ... Removing tutorial paths for first run experience	2017-09-06 09:23:45 -07:00
Cain Kilgore	d429bd0b01	Changed the Interface text to say 'Task bar' instead of 'system tray'	2017-09-06 13:42:13 +01:00
Cain Kilgore	2a6b523542	Again	2017-09-06 13:09:43 +01:00
Cain Kilgore	14e5cf31f2	Apparently I didn't need 'em	2017-09-06 12:42:17 +01:00