Commit graph

259 commits

Author SHA1 Message Date
Clement
f163bbc0d5 Sample connections stats every seconds 2019-01-03 10:04:38 -08:00
Clement
c5b60594b6 Record more detailed stats on Retransmit/duplicate 2019-01-03 10:04:38 -08:00
Clement
0bfe2671dd Cleanup udt dead code 2018-07-20 18:12:24 -07:00
Ryan Huffman
23a279434c Fix potential map.json corruption in Asset Server 2018-07-03 10:33:25 -07:00
Ryan Huffman
faafd26d2a Add uncompressed KTX files to baked texture output 2018-06-08 11:39:47 -07:00
Stephen Birarda
ec354620db
Merge pull request #12956 from huffman/feat/client-texture-selection-baking
Add support for client texture selection
2018-05-04 16:14:43 -07:00
Ryan Huffman
12d4cf12cf Bump model and texture baking versions in AssetServer 2018-05-01 14:11:50 -07:00
Oren Hurvitz
a226790295 Eliminated warnings in gcc
Note that the call to encodeNode() in FBXWriter.cpp can never be reached, so it's safe to remove it.
2018-04-30 15:05:27 +03:00
Simon Walton
9f9a68188d Merge remote-tracking branch 'upstream/master' into short-id 2018-04-20 11:10:21 -07:00
Stephen Birarda
a0e1d2e54e
Merge pull request #12764 from SimonWalton-HiFi/bakedassettype-enum
Make BakedAssetType a scoped enum
2018-04-17 11:50:14 -07:00
Clement
6e7f8a2ef6 Fix value collision for baking version 2018-04-06 17:24:16 -07:00
Simon Walton
d1cb4aab89 Make BakedAssetType a scoped enum 2018-04-02 17:55:23 -07:00
Simon Walton
d3464378b7 Short local source IDs - checkpoint
DS assigns 16-bit IDs as well as UUIDs; ACs track mappings;
nodes use short IDs in packets. Initial setup works; then
fails prob. due to DS UUID.
2018-03-27 13:46:58 -07:00
Ryan Huffman
d2ae30f8e0 Disable support for baking scripts in the Asset Server 2018-03-22 16:22:59 -07:00
Ryan Huffman
655636c44f Remove redundant if block in AssetServer.cpp 2018-03-21 12:16:12 -07:00
Ryan Huffman
0a00227ce3 Update message for failed bakes inside of AssetServer.cpp 2018-03-13 15:03:20 -07:00
Ryan Huffman
6ed89fb9cc Cleanup asset server versioning changes 2018-03-13 14:52:35 -07:00
Ryan Huffman
df8a25cbdc Add warning to AssetServer.h to update bake version in .cpp 2018-03-13 14:52:35 -07:00
Ryan Huffman
9a7497c9ec Update AssetServer to check for baking disabled on startup 2018-03-13 14:52:35 -07:00
Ryan Huffman
0003a32701 Fix AssetServer not detecting missing bakeVersion 2018-03-13 14:52:35 -07:00
Ryan Huffman
e38ef699cc Remove BakingVersion.h 2018-03-13 14:52:35 -07:00
Ryan Huffman
8a89e8f9fb Remove BakedTypeInfo 2018-03-13 14:52:35 -07:00
Ryan Huffman
6f3155db32 Fix existing baked assets not being recognized 2018-03-13 14:52:35 -07:00
Ryan Huffman
6ac8cdecd1 Re-enable js baking 2018-03-13 14:52:35 -07:00
Ryan Huffman
091dae730b Add versioning to Asset Server 2018-03-13 14:52:35 -07:00
Atlante45
3592fcf3c2 CR 2018-02-26 14:52:27 -08:00
Ryan Huffman
c368c84f59 Make BakeAssetTask::abort thread-safe 2018-02-23 11:06:11 -08:00
Atlante45
c106fee659 Merge branch 'master' of https://github.com/highfidelity/hifi into feat/backups-integration 2018-02-22 19:45:43 -08:00
Stephen Birarda
a0f7d4dd34 use const auto & where possible as per CR comments 2018-02-22 18:08:08 -08:00
Stephen Birarda
d9d2b26519 delete baked content for unmapped files on AS startup 2018-02-22 16:55:35 -08:00
Atlante45
f6e9d2c6dd Fix race condition in Asset Server 2018-02-15 18:16:30 -08:00
Atlante45
4482f9c83c Queue all requests until the AS is fully setup 2018-02-15 11:27:21 -08:00
Sam Gondelman
15cdfef16a
Merge branch 'master' into decals 2018-02-14 17:33:01 -08:00
SamGondelman
9e8aa1898c warnings, load material from URL, shapeID -> parentMaterialID 2018-02-12 12:50:09 -08:00
Atlante45
46449256ce CR 2018-02-09 11:38:46 -08:00
Atlante45
87f77b6257 Asset Server Backup 2018-02-09 11:32:42 -08:00
humbletim
dfb1619dc6 CR feedback; using namespace AssetUtils => inline AssetUtils:: 2018-01-18 21:49:53 -05:00
humbletim
a863aec4a0 put existing AssetUtils functions in namespace per CR feedback 2018-01-03 04:01:43 -05:00
Ryan Huffman
65649fc331 Remove _outputDir from BakeAssetTask 2017-12-08 17:56:33 -08:00
Ryan Huffman
5cf2ab5cbd Remove unnecessary logging on BakeAssetTask 2017-12-08 17:53:49 -08:00
Ryan Huffman
239877fc18 Remove _didFinish from BakeAssetTask 2017-12-08 17:47:57 -08:00
Ryan Huffman
50c47c785d Fix BakeAssetTask not handling case where oven process is not found 2017-12-08 17:45:42 -08:00
Ryan Huffman
94a58a2471 Remove baking dependency from assignment-client 2017-12-07 10:53:23 -08:00
Ryan Huffman
2eecb41337 Update metatype registration in assetBakeTask 2017-12-06 13:59:46 -08:00
Ryan Huffman
6b098bfc6a Fix aborted baking in oven cli 2017-12-06 13:51:31 -08:00
Ryan Huffman
cb9a30413d Rename removeTemporaryDis to removeTemporaryApplicationDirs 2017-12-06 12:50:20 -08:00
Ryan Huffman
f20aa2e680 Fix asset server baking not working on *nix 2017-12-06 11:49:34 -08:00
Ryan Huffman
bee666b522 Add error text reading to asset server baking 2017-12-06 11:49:34 -08:00
Ryan Huffman
de7e3e60cd Add temp dir removal to asset server 2017-12-06 11:49:34 -08:00
Ryan Huffman
7eb93f4777 Add oven as dep to assignment-client 2017-12-06 11:49:34 -08:00