Clément Brisset
|
108de209bb
|
Merge pull request #11393 from birarda/feat/auto-bake
don't export embedded textures with original, remove triangle warning
|
2017-09-18 16:21:07 -07:00 |
|
Clément Brisset
|
02c07fd818
|
Merge pull request #11385 from huffman/feat/remove-fbxwriter-list-support
Remove support for QList in FBXWriter
|
2017-09-18 14:26:25 -07:00 |
|
Stephen Birarda
|
608f8196c6
|
remove commented out removal of embedded media folder
|
2017-09-18 14:01:48 -07:00 |
|
Stephen Birarda
|
02a529923e
|
don't export embedded textures, remove triangle warning
|
2017-09-18 14:00:03 -07:00 |
|
Ryan Huffman
|
d80aa50e79
|
Remove support for QList in FBXWriter
|
2017-09-18 09:04:13 -07:00 |
|
Stephen Birarda
|
1f961885cc
|
Merge pull request #11369 from huffman/feat/bake-skinning-support
Add animation support for draco encoded FBXs
|
2017-09-15 15:21:35 -07:00 |
|
Ryan Huffman
|
1ca926c780
|
Merge pull request #11378 from Atlante45/feat/auto-bake
Fix Asset Server layout on the tablet
|
2017-09-15 14:52:47 -07:00 |
|
Atlante45
|
a37642ba44
|
Pull Auto-Baking changes to TabletAssetServer.qml
|
2017-09-15 14:43:15 -07:00 |
|
Ryan Huffman
|
2a4f7712c3
|
Replace magic number for compressed flag in FBXWriter
|
2017-09-15 14:41:38 -07:00 |
|
Ryan Huffman
|
eca7632111
|
Merge pull request #11376 from Atlante45/feat/auto-bake
Pull Auto-Baking changes to TabletAssetServer.qml
|
2017-09-15 14:31:18 -07:00 |
|
Ryan Huffman
|
c5852dfbe8
|
Add list compression to FBXWriter
|
2017-09-15 13:53:10 -07:00 |
|
Atlante45
|
c4d018504b
|
Pull Auto-Baking changes to TabletAssetServer.qml
|
2017-09-15 13:28:51 -07:00 |
|
Atlante45
|
8711823a9b
|
Sync up AssetServer.qml and TabletAssetServer.qml
|
2017-09-15 11:44:08 -07:00 |
|
Ryan Huffman
|
fd1d4b9bd1
|
Update FBXBaker to only pack original indices if needed
|
2017-09-14 16:49:53 -07:00 |
|
Stephen Birarda
|
ef60d0afb3
|
Merge pull request #11368 from birarda/feat/draco-in-baking
don't re-bake an already baked Draco FBX
|
2017-09-14 16:47:48 -07:00 |
|
Ryan Huffman
|
7db8d1dcbc
|
Add support for baked skinned meshes
|
2017-09-14 16:43:52 -07:00 |
|
Ryan Huffman
|
3793062045
|
Add optional FBX 2015 encoding to FBXWriter
|
2017-09-14 16:31:10 -07:00 |
|
Stephen Birarda
|
2a62bac4f9
|
refuse to re-bake an already baked FBX
|
2017-09-14 16:08:11 -07:00 |
|
Clément Brisset
|
9816070e70
|
Merge pull request #11366 from Atlante45/feat/auto-bake
Update feat/auto-bake with master
|
2017-09-14 15:36:32 -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 |
|
Clément Brisset
|
cbe61871dc
|
Merge pull request #11346 from birarda/feat/draco-in-baking
Add mesh compression to baking library and FBXReader
|
2017-09-14 15:32:58 -07:00 |
|
Stephen Birarda
|
43196cd0a6
|
fix buffer resizing to only occur when attribute is present
|
2017-09-14 14:46:48 -07:00 |
|
Stephen Birarda
|
bb98df38d4
|
remove re-grabbing of draco faces
|
2017-09-14 14:42:40 -07:00 |
|
Stephen Birarda
|
9cb4e2c5f2
|
address code review comments
|
2017-09-14 13:58:48 -07:00 |
|
Seth Alves
|
10494cf3e0
|
Merge pull request #11359 from vladest/fix_runningscripts_selection
use selection model of TreeView
|
2017-09-14 11:22:08 -07:00 |
|
Seth Alves
|
11df5a447e
|
Merge pull request #11310 from ElderOrb/case6718
6718 PR11082: Help text cannot be dismissed by clicking on the text i…
|
2017-09-14 11:17:48 -07:00 |
|
Seth Alves
|
dbaf60a957
|
Merge pull request #11363 from ElderOrb/lint-fix
add missing comma
|
2017-09-14 09:10:14 -07:00 |
|
beholder
|
61c5395f44
|
add missing comma
|
2017-09-14 18:48:43 +03:00 |
|
Thijs Wenker
|
523d099f70
|
Merge pull request #11355 from jherico/crash/zone-keylight
Fix race condition accessing QString sub-properties in zones
|
2017-09-14 16:03:05 +02:00 |
|
Thijs Wenker
|
ddb4b2d2be
|
Merge pull request #11354 from hyperlogic/bug-fix/good-riddance
Remove handControllerGrab.js, see controllerDispatcher.js instead.
|
2017-09-14 15:42:30 +02:00 |
|
vladest
|
7233c47257
|
use selection model of TreeView
|
2017-09-14 15:36:12 +02:00 |
|
Brad Davis
|
f4d8216501
|
Fix race condition accessing QString sub-properties in zones
|
2017-09-13 18:06:21 -07:00 |
|
Anthony J. Thibault
|
745d2ff395
|
Remove handControllerGrab.js, see controllerDispatcher.js instead.
|
2017-09-13 17:36:56 -07:00 |
|
anshuman64
|
d3dbd431d6
|
Merge pull request #11279 from druiz17/controller-dispatcher-1
handControllerGrab Refactor -> controllerDispatcher
|
2017-09-13 16:56:57 -07:00 |
|
druiz17
|
1b288ef860
|
make garbbing radius the same as master
|
2017-09-13 16:15:36 -07:00 |
|
Stephen Birarda
|
7b36105793
|
Merge pull request #11347 from Atlante45/feat/auto-bake
Finalize auto baking UI
|
2017-09-13 16:05:38 -07:00 |
|
druiz17
|
310dbce65d
|
fixed merge conflict
|
2017-09-13 15:55:04 -07:00 |
|
Chris Collins
|
84998a3360
|
Merge pull request #11351 from Atlante45/new-master
Update master from stable
|
2017-09-13 14:28:44 -07:00 |
|
Stephen Birarda
|
bfb4dd0cdb
|
disable warning c4267 when including draco
|
2017-09-13 14:00:41 -07:00 |
|
Stephen Birarda
|
c365e1718e
|
set include dir for draco the same across the board
|
2017-09-13 13:51:26 -07:00 |
|
Stephen Birarda
|
1e6154fbc8
|
make draco compile flags OS X only
|
2017-09-13 13:45:26 -07:00 |
|
Stephen Birarda
|
4066c9392d
|
output from oven into folder with model name
|
2017-09-13 13:34:15 -07:00 |
|
Atlante45
|
d3966ce8c2
|
Merge branch 'stable' of https://github.com/highfidelity/hifi into new-master
|
2017-09-13 13:14:25 -07:00 |
|
Melissa Brown
|
49ab8af428
|
Merge pull request #11344 from Menithal/21536
21536: Clap App!
|
2017-09-13 12:54:31 -07:00 |
|
Menithal
|
59746c564b
|
21536: Applied forgotten beutify to file
|
2017-09-13 21:24:24 +03:00 |
|
David Kelly
|
030b39050a
|
Merge pull request #11343 from davidkelly/dk/oneFileWallet
Wallet updates
|
2017-09-13 11:15:03 -07:00 |
|
Chris Collins
|
1b608a7d35
|
Merge pull request #11315 from highfidelity/RC-54
Beta Release 54 - Includes up to Developer Release 7078
|
2017-09-13 10:36:28 -07:00 |
|
Atlante45
|
c04a6b5b88
|
Add error tooltip
|
2017-09-13 09:54:56 -07:00 |
|
Atlante45
|
9e11ae311e
|
Fix error reporting
|
2017-09-13 09:54:55 -07:00 |
|
Atlante45
|
2e84f48539
|
Fix QML errors
|
2017-09-13 09:54:55 -07:00 |
|