Commit graph

59074 commits

Author SHA1 Message Date
Atlante45
9f2b0258e9 Update baking status with the correct checkmark glyph 2017-09-13 09:54:55 -07:00
Atlante45
944a4fd49d Update hifi glyphs + font reference 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
David Kelly
bce92a622e cr feedback 2017-09-13 09:45:02 -07:00
Stephen Birarda
dc86c6fe73 fixes for warnings in FBXReader/FBXWriter 2017-09-13 09:16:58 -07:00
Andrew Meadows
50b94887fa Merge pull request #11339 from ElderOrb/case7469
7469 Mouse Pointer Depth is Incorrect in HMD Mode
2017-09-13 08:33:09 -07:00
Andrew Meadows
5741699bab Merge pull request #11301 from Menithal/21484-Fix
WL21484 _- Hotfix - Solve Joint array issues with Similar, but not same Skeletons
2017-09-13 08:05:53 -07:00
David Kelly
7550374f8f Merge branch 'master' of https://github.com/highfidelity/hifi into dk/oneFileWallet 2017-09-13 04:49:13 -07:00
Stephen Birarda
8a9e4029ae use explicit conversion from size_t to int 2017-09-13 00:23:52 -07:00
Stephen Birarda
4efd9b8453 set explicit draco encoding options 2017-09-12 23:45:34 -07:00
Ryan Huffman
087a95a625 Add explicit draco encoder options to FBXBaker 2017-09-12 23:15:35 -07:00
Stephen Birarda
c445d914d7 make sure material IDs are de-duplicated 2017-09-12 22:04:33 -07:00
Stephen Birarda
88b8fb4c5e use general worker threads for fbx baking 2017-09-12 20:02:27 -07:00
Ryan Huffman
c9024f5e87 Update FBXBaker to bake triangleIndices and fix faces being lost 2017-09-12 19:59:43 -07:00
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
druiz17
b3ff5c86f7 fixed secondary triggers and chest lid 2017-09-12 14:43:06 -07:00
druiz17
0b360f455c Merge branch 'master' of github.com:highfidelity/hifi into controller-dispatcher-1 2017-09-12 14:38:07 -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
Dante Ruiz
bf32f65efe Merge pull request #11341 from vladest/flickable_off
Flickable off
2017-09-12 13:09:06 -07:00
Menithal
40beb4bca8 Some minor tweaks 2017-09-12 22:12:30 +03:00
Chris Collins
bb26cf2179 Merge pull request #11342 from Atlante45/RC-54
Fix RC-54 conflict with stable
2017-09-12 11:48:13 -07:00
Menithal
79603765c4 Removed unused check 2017-09-12 21:40:15 +03:00
Menithal
5aab3f3cf3 Switched from marketplace links to local 2017-09-12 21:24:14 +03:00
Menithal
ca2d22a192 Updated Scripts 2017-09-12 21:22:40 +03:00
David Kelly
187ed71a8a more cleanup, plus now keyfile associated with user directly 2017-09-12 10:55:27 -07:00
Dante Ruiz
d90f6320a9 Merge pull request #8 from sethalves/controller-dispatcher-1
Controller dispatcher 1
2017-09-12 10:54:10 -07:00
Atlante45
c170cc2eb1 Merge branch 'stable' of https://github.com/highfidelity/hifi into RC-54 2017-09-12 10:53:04 -07:00
druiz17
b634292261 fixing some small issues 2017-09-12 10:53:04 -07:00
Seth Alves
e9918ca599 add profiling to controller-dispatcher 2017-09-12 10:52:52 -07:00
Seth Alves
a9aa6df93e Merge branch 'controller-dispatcher-1' of github.com:sethalves/hifi into controller-dispatcher-1 2017-09-12 10:44:29 -07:00
Seth Alves
315f874824 add profiling to controller-dispatcher 2017-09-12 10:44:09 -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
vladest
92a83328c0 Follow naming convention 2017-09-12 19:17:49 +02:00
Seth Alves
2850029f26 add profiling to controller-dispatcher 2017-09-12 10:00:32 -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
Seth Alves
14965da1b2 Merge branch 'controller-dispatcher-1' of github.com:druiz17/hifi into controller-dispatcher-1 2017-09-12 09:23:39 -07:00
David Kelly
61e8458d13 some cleanup 2017-09-12 08:08:41 -07:00
vladest
08deba35ae Take in account current WebEngine profile to make sure all features are in place, like download 2017-09-12 16:22:53 +02:00
vladest
17a923b9de Temporarily disable WebView flickable until new solution will be investigated 2017-09-12 15:48:47 +02:00
beholder
deee6aab1a 7469 Mouse Pointer Depth is Incorrect in HMD Mode 2017-09-12 04:24:18 +03:00