Commit graph

59294 commits

Author SHA1 Message Date
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
Seth Alves
095cd03ee2 Merge pull request #11380 from ctrlaltdavid/fix-controller-typos
Fix typos in controller modules disabler
2017-09-16 11:13:15 -07:00
Seth Alves
4fcbaf6f4d Merge pull request #11374 from sethalves/fix-grab-entity-methods
fix grab entity methods + jshint cleanups
2017-09-16 11:11:13 -07:00
Seth Alves
04b99ef8a5 Merge pull request #11352 from 1P-Cusack/FogBugz/Case_6107
[QML] Fixes FogBugz Case 6107: Can't sort on import menu (details below).
2017-09-16 11:08:59 -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
David Rowe
18b71f0c0f Fix typos in controller modules disabler 2017-09-16 15:34:53 +12:00
Sam Gateau
512e9432ed Merge pull request #11370 from samcake/blue-bis
Fixing the web surface of the tablet
2017-09-15 15:36:55 -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
samcake
524c94cdd4 Adding more comments for future fixmes 2017-09-15 14:35:45 -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
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
Seth Alves
0816a8af27 fix grab entity methods 2017-09-15 12:07:50 -07:00
Seth Alves
b67c571aaa fix grab entity methods 2017-09-15 12:05:49 -07:00
samcake
c687932ca7 One more: 2017-09-15 11:44:35 -07:00
Atlante45
8711823a9b Sync up AssetServer.qml and TabletAssetServer.qml 2017-09-15 11:44:08 -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.
* updated initialization of anim graph to use Model::isLoaded() instead of
  Model::initWhenReady() to know when the model was completely loaded.
2017-09-15 11:23:09 -07:00
Seth Alves
df80b7ecfa stopNearTrigger, not end 2017-09-15 11:16:54 -07:00
samcake
97617c6dbe Merge branch 'master' of https://github.com/highfidelity/hifi into blue-bis 2017-09-15 11:13:34 -07:00
samcake
19cd537e65 addressing review comments 2017-09-15 11:10:25 -07:00
Seth Alves
39e6605f6f fix grab entity methods + jshint cleanups 2017-09-15 10:50:46 -07:00
Seth Alves
8a49edbecb code review 2017-09-15 10:08:35 -07:00
Chris Collins
2a77bb06c7 Merge pull request #11367 from highfidelity/RC-54-HOTFIX
Build 54.1 Hotfix Fix for polyline crash
2017-09-15 09:35:59 -07:00
Sam Gateau
30bf800963 Cleanup 2017-09-14 20:33:08 -07:00
Thijs Wenker
9f61e7471c Merge pull request #11365 from thoys/feat/cloneAvatarEntities
Clone local avatar entities
2017-09-15 04:51:18 +02:00
samcake
ec7536db2c Brining the changes just to fix the tablet issue 2017-09-14 18:36:20 -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
Anthony J. Thibault
f534ee5ad9 laser offset fix 2017-09-14 16:37:45 -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
Brad Davis
d3ac7a388c Fix polyline rendering using default texture 2017-09-14 15:50:09 -07:00
Brad Davis
4c4df97c42 Fix transform of polylines with high update rates 2017-09-14 15:50:02 -07:00
Brad Davis
c0fb9dcf2e Fix polyline crash and flicker 2017-09-14 15:49:54 -07:00
Chris Collins
cfec2a29ae Merge pull request #11314 from jherico/polyline_crash
Fix polyline crash and flicker
2017-09-14 15:42:49 -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
Thijs Wenker
af4bc59307 clone local avatar entities 2017-09-14 23:31:51 +02:00