Ryan Huffman
abbe263142
Fix FBXBaker not properly handling textures with the same name
2017-09-21 13:40:39 -07:00
Ken Cooke
84786ac8e3
Merge pull request #11424 from ctrlaltdavid/21548
...
Fix recording just made not playing back if reload it
2017-09-21 12:19:23 -07:00
David Rowe
a2d8152a3a
Coding standard
2017-09-22 07:13:32 +12:00
Andrew Meadows
6b3b3a7448
Merge pull request #11382 from ElderOrb/case6618
...
6618 [Worklist] Add Input Field On Top of Keyboard
2017-09-21 08:54:11 -07:00
Andrew Meadows
b803344f0c
Merge pull request #11421 from jherico/fix/transform_log_spam
...
Don't add items to the scene graph until they have a valid parent chain
2017-09-21 08:42:56 -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
David Rowe
4ce5e4ac46
Fix recording just made not playing back if reload it
2017-09-21 12:19:32 +12:00
Brad Davis
27350bd7de
Don't add items to the scene graph until they have a valid parent chain
2017-09-20 16:52:23 -07:00
Ryan Huffman
20759b0c97
Merge pull request #11404 from birarda/feat/auto-bake
...
add abort on shutdown to Baker/FBXBaker/TextureBaker
2017-09-19 14:20:56 -07:00
Stephen Birarda
a8ac015bc4
address code review comments
2017-09-19 13:56:42 -07:00
Clément Brisset
a6376fcc12
Merge pull request #11402 from huffman/fix/remove-fbxcpp
...
Remove FBX.cpp and other cleanup
2017-09-19 13:54:50 -07:00
Stephen Birarda
e1d79ee8f4
add abort to Baker and subclasses
2017-09-19 13:18:23 -07:00
Stephen Birarda
0d166cc250
Merge pull request #11400 from Atlante45/feat/auto-bake
...
Remove unused Algorithms.h
2017-09-19 12:44:15 -07:00
Ryan Huffman
5950006111
Remove extraneous logging
2017-09-19 11:18:25 -07:00
Ryan Huffman
641addf397
Remove FBX.cpp
2017-09-19 11:13:39 -07:00
vladest
6c32783a09
Merge branch 'master' into audio_devices_split
2017-09-19 17:43:03 +02:00
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
Atlante45
b9e5957c9f
Remove unused Algorithms.h
2017-09-18 16:14:06 -07:00
Anthony J. Thibault
73ad9051a4
Shapes now render at the correct size.
2017-09-18 15:27:58 -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
Anthony J. Thibault
7e2b2960ed
Fix for lighting as IPD scale changes.
...
(cherry picked from commit a260aaaae8
2017-09-18 12:15:32 -07:00
Anthony J. Thibault
0757f513af
Merge branch 'master' into feature/ant-man
2017-09-18 11:36:39 -07:00
beholder
8b39c56aa1
rename 'target' to 'targetOverride' to indicate that parameter overrides default target
2017-09-18 20:40:22 +03:00
Ryan Huffman
d80aa50e79
Remove support for QList in FBXWriter
2017-09-18 09:04:13 -07:00
Seth Alves
765031bf89
Merge pull request #11377 from vladest/create_resize
...
Add resizable flag. Use the flag for Create only
2017-09-16 11:14:40 -07:00
Sam Gateau
84dfe53fee
Merge pull request #11362 from jherico/crash/model-race
...
Ensure thread-safety for model pointer access
2017-09-16 10:45:09 -07:00
beholder
871b169128
6618 [Worklist] Add Input Field On Top of Keyboard
2017-09-16 16:17:36 +03: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
2a4f7712c3
Replace magic number for compressed flag in FBXWriter
2017-09-15 14:41:38 -07:00
Ryan Huffman
c5852dfbe8
Add list compression to FBXWriter
2017-09-15 13:53:10 -07:00
Anthony Thibault
c7fc45e0ae
Merge pull request #11375 from hyperlogic/bug-fix/avatar-attachments-rendering
...
Avatar Attachments now render correctly
2017-09-15 13:28:00 -07:00
vladest
de4f34aacb
Add resizable flag. Use the flag for Create only
2017-09-15 21:49:38 +02:00
Seth Alves
d968bbad6c
Merge pull request #11364 from sethalves/rework-scriptengine-lifetime
...
Rework scriptengine lifetime
2017-09-15 12:17:51 -07:00
Anthony J. Thibault
3f6c88e77f
Avatar Attachments now render correctly
...
* moved Avatar::fixupModelsInScene off the newly created render thread back
to the main thread.
* updated Avatar::postUpdate to take a scene pointer, necessary for
Avatar::fixupModelsInScene
* updated developer/tests/avatarAttachementTest.js to account for recent
changes in avatar attachment scale, commit 712aff7ad
2017-09-15 11:23:09 -07:00
Seth Alves
8a49edbecb
code review
2017-09-15 10:08:35 -07:00
Ryan Huffman
fd1d4b9bd1
Update FBXBaker to only pack original indices if needed
2017-09-14 16:49:53 -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
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
Brad Davis
688ee68cf9
Ensure thread-safety for model pointer access
2017-09-14 12:29:23 -07:00
Brad Davis
aef85eb69d
Fix polyline rendering using default texture
2017-09-14 10:48:14 -07:00
Seth Alves
cf2979dc78
Merge branch 'master' of github.com:highfidelity/hifi into rework-scriptengine-lifetime
2017-09-14 10:42:26 -07:00
Seth Alves
d89f2b77da
rework ScriptEngine lifetimes using 'smart' pointers
2017-09-14 10:42:21 -07:00
Anthony J. Thibault
7959988622
Merge branch 'master' into feature/ant-man
2017-09-14 10:37:45 -07:00
