Commit graph

395 commits

Author SHA1 Message Date
Seth Alves
66191a5419 Merge pull request #11291 from ElderOrb/optional-build-tools
make building tools (besides 'scribe') optional
2017-10-08 10:02:28 -07:00
Bradley Austin Davis
e42068f681 Merge branch 'master' into android_new 2017-09-26 14:31:29 -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
Bradley Austin Davis
bc4193f276 Merge branch 'master' into android_new 2017-09-19 14:27:31 -07:00
Bradley Austin Davis
b93e91b9f3 New android toolchain 2017-09-19 13:45:12 -07:00
beholder
04305155d0 make building tools (besides 'scribe') optional 2017-09-14 23:16:12 +03:00
Stephen Birarda
4066c9392d output from oven into folder with model name 2017-09-13 13:34:15 -07:00
Stephen Birarda
88b8fb4c5e use general worker threads for fbx baking 2017-09-12 20:02: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
Ryan Huffman
9b462171f6 Add draco support to FBXBaker 2017-09-08 16:58:29 -07:00
Stephen Birarda
91f4551598 add draco to the oven tool 2017-09-08 09:46:55 -07:00
Stephen Birarda
3cf77f377c remove FBX SDK from CMake files 2017-09-07 18:46:44 -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
Stephen Birarda
26b74db864 enable compression in image library from Asset Server 2017-09-07 12:07:57 -07:00
Anthony J. Thibault
23ff1b9ead Fixes for scaling controller display
Adds MyAvatar.sensorToWorldScaleChanged signal.
2017-09-05 15:03:41 -07:00
Atlante45
28c9aa031c Setup script model status 2017-08-25 10:54:34 -07:00
Ryan Huffman
39f04adc8d Improve baking interface and add automatic baking to asset server 2017-08-24 16:15:28 -07:00
Ryan Huffman
8d4ab5f751 Update FBXBaker to take output directory and update oven to use it 2017-08-21 13:40:51 -07:00
Seth Alves
c4d909927a make atp-client work again 2017-07-24 19:23:39 -07:00
Andrew Meadows
665aa92da2 Merge pull request #10877 from sethalves/atp-client
Atp client
2017-07-07 14:04:50 -07:00
Stephen Birarda
bff54d260e fix for baking FBX with external textures 2017-07-07 10:11:13 -07:00
Seth Alves
b8875a8902 Merge branch 'master' of github.com:highfidelity/hifi into atp-client 2017-07-06 17:28:55 -07:00
Clément Brisset
34e3f56002 Merge pull request #10843 from birarda/bug/user-activities-interface-only
disable user activity logger in DS/AC/ac-client
2017-07-06 14:01:49 -07:00
Stephen Birarda
916f57772b default the UAL off for all targets, enable manually for Interface 2017-07-06 10:21:07 -07:00
Seth Alves
98ac2ccb90 rearrange code so authed connection works better 2017-07-05 17:36:25 -07:00
Seth Alves
f7131027e0 if user has provided login credentials, wait for the keypair to be ready before proceeding 2017-07-05 17:26:15 -07:00
Seth Alves
d62b0ffb3b Merge branch 'acclient_fix' of github.com:jherico/hifi into atp-client 2017-07-05 17:03:16 -07:00
Brad Davis
2409c83d5d Fix ACClient on Linux 2017-07-05 16:53:42 -07:00
Seth Alves
a05e9e12c1 remove some debug prints 2017-07-04 17:59:56 -07:00
Seth Alves
bdbfe25a53 remove some debug prints 2017-07-04 17:46:35 -07:00
Seth Alves
1192e86494 add a way to login on command-line 2017-07-04 17:11:53 -07:00
Seth Alves
a6af6015a4 add a way to login on command-line 2017-07-04 17:00:25 -07:00
Seth Alves
e9a8c3f5e8 rename atp-get to atp-client. add ability to list atp file mappings and to upload new files 2017-07-04 15:52:03 -07:00
Ryan Huffman
b8ce4b9006 Merge pull request #10801 from huffman/fix/oven-native-separators
Add support for native separators in oven, and vs2015/2017 FBX sdk
2017-07-03 12:07:26 -07:00
Stephen Birarda
86eb5b14ca disable the user activity logger in DS/AC/ac-client 2017-06-28 13:19:58 -07:00
Anthony J. Thibault
d7416434bf added tool to visualize avatar-animation.json using graphviz. 2017-06-26 11:38:24 -07:00
Ryan Huffman
b12018ccf3 Fix Oven not properly handling native separators 2017-06-23 10:54:48 -07:00
Seth Alves
a053a1da4b more HIFI_MEMORY_DEBUGGING fixes 2017-06-22 13:50:46 -07:00
Seth Alves
9ce173f682 missed a few 2017-06-22 10:56:08 -07:00
Seth Alves
7ff576ef18 add memory-debugging macro to some cmake files 2017-06-22 10:07:39 -07:00
Seth Alves
b1119ff465 more changes to get oven building on Linux 2017-06-21 20:10:54 -07:00
Stephen Birarda
e658953246 Merge pull request #10645 from seefo/oven
Oven will now give proper return codes when used via CLI
2017-06-09 13:06:09 -07:00
Seth Alves
485df396ef Merge pull request #10628 from jherico/qt59
Fixes for Qt 5.9 compatibility
2017-06-08 16:51:08 -07:00
seefo
a4f4d49bec Oven will now give proper return codes when used via CLI 2017-06-08 11:52:58 -07:00
seefo
0c7ffa0ac6 Replaced baker in OvenCLI with an std::unique_ptr 2017-06-08 09:48:30 -07:00
seefo
99e9e10882 Made requested changes to OvenCLI constructor 2017-06-07 11:36:56 -07:00
seefo
a3d2fa2630 Made requested changed to Oven CLI 2017-06-06 16:13:18 -07:00
seefo
46400f4122 Cleaned up oven CLI 2017-06-06 15:05:26 -07:00
Bradley Austin Davis
b4bbf98fe3 Suppress TBB warnings 2017-06-06 15:02:16 -07:00