Commit graph

74368 commits

Author SHA1 Message Date
sabrina-shanman
b021c3c46d Add model-baker logging category 2018-12-13 10:37:35 -08:00
sabrina-shanman
ec748c60cf Give more appropriate names for some model-related constants and move them into HFM.h 2018-12-13 10:37:35 -08:00
sabrina-shanman
c41174a823 Re-name baker::ImportContext to baker::BakeContext 2018-12-13 10:33:03 -08:00
sabrina-shanman
9e63caa84a Fix linker error for model-baker on Android/Linux 2018-12-11 12:54:44 -08:00
sabrina-shanman
566d09dc9c Add model preparation step to ModelCache using new library model-baker 2018-12-11 11:15:54 -08:00
sabrina-shanman
25e3d49941 Add VaryingSet1 to Task aliases 2018-12-11 11:15:54 -08:00
Shannon Romano
a3c870ed90
Merge pull request #14479 from sabrina-shanman/hfm_mimetype
(case 20037) Add robust MIME type detection for loading models in ModelCache
2018-12-11 18:41:55 +00:00
Brad Hefta-Gaub
43bbba6635
Merge pull request #14554 from sethalves/break-parenting-loops
fix some parenting loops crashes
2018-12-11 10:02:17 -08:00
Shannon Romano
bb9a764855
Merge pull request #14517 from luiscuenca/getEntityJointParent
Add method to check entities joint hierarchy
2018-12-11 01:06:38 +00:00
sabrina-shanman
79e9bff225 Nest if statement for invalid id checking in hfm::FormatRegistry::getSerializerForMediaType 2018-12-10 16:18:11 -08:00
sabrina-shanman
31d1512701 Simplify url empty check in GeometryReader::run 2018-12-10 16:12:23 -08:00
Jeff Clinton
b6a87f2251
Merge pull request #14555 from vladest/linux_build_fix
Added missed header
2018-12-10 15:06:08 -08:00
Jeff Clinton
1aa93c1d86
Merge pull request #14557 from zfox23/MS20215_soldOutFix
Fix MS20215: Fix incorrect display of unavailable items on Marketplace main page
2018-12-10 12:32:41 -08:00
Zach Fox
ed99da2165 Fix MS20215: Fix incorrect display of unavailable items on Marketplace main page 2018-12-10 11:15:27 -08:00
sabrina-shanman
b960b66542 Fix mac warning for std::move on temporary object 2018-12-10 11:10:29 -08:00
Jeff Clinton
fbb0a6d37a
Merge pull request #14541 from dback2/unityAvatarExporter
Unity Avatar Exporter
2018-12-10 11:02:35 -08:00
Jeff Clinton
40f50eccb1
Merge pull request #14550 from zfox23/MS20208_assetsToInventory
Fix MS20208: Change an instance of 'ASSETS' to 'INVENTORY'
2018-12-10 10:49:06 -08:00
Howard Stearns
42799817a1
Merge pull request #14552 from SimonWalton-HiFi/agent-large-avatar-packets
Pass on dropFaceTracking flag in ScriptableAvatar::toByteArrayStateful()
2018-12-10 10:37:15 -08:00
sabrina-shanman
8792824960 Remove FormatSerializerRegister as it is unused 2018-12-10 09:58:59 -08:00
Sam Gateau
f7bf51d62c
Merge pull request #13966 from elmanytas/run_interface_ubuntu_18.04
Added steps to run interface in Ubuntu 18.04 .
2018-12-10 09:50:43 -08:00
Brad Hefta-Gaub
a005f9e9ab
Merge pull request #14546 from danteruiz/fix-reload-scripts
fix realod all scripts functionality broken by PR14478
2018-12-09 17:30:36 -08:00
Brad Hefta-Gaub
26ccfb2533
Merge pull request #14329 from ctrlaltdavid/mini-tablet-tuning
Mini tablet tuning
2018-12-09 17:23:59 -08:00
Brad Hefta-Gaub
1e9faa7754
Merge pull request #14276 from ctrlaltdavid/M19345
Make create apps not grab tablet if editing an entity with hand
2018-12-09 17:21:10 -08:00
Brad Hefta-Gaub
0425ae1231
Merge pull request #14239 from ElderOrb/FB19219
FB19219 - Make avatarapp to handle wearables update via drag&drop
2018-12-09 17:20:13 -08:00
vladest
ead49e5f03 Added missed header 2018-12-08 16:49:34 +01:00
Seth Alves
c1e2653526 check for and break parenting loops in hasAncestorOfType, findAncestorOfType, isParentPathComplete 2018-12-08 07:42:03 -08:00
Jamil Akram
4e7a777fda
Merge pull request #14486 from amantley/jointNameMapping
FST File Joint Name Mapping From FBX Joint Names to Hifi Skeleton Joint Names
2018-12-07 17:07:37 -08:00
sabrina-shanman
031085b384 Remove now unused HFMSimpleFormat 2018-12-07 16:17:33 -08:00
John Conklin II
69876bdec2
Merge pull request #14548 from SamGondelman/mirrorFix
Case 19473 (#2): Fix Mirror tonemapping
2018-12-07 16:11:59 -08:00
John Conklin II
0a80c16686
Merge pull request #14419 from SamGondelman/splash
Case 19740: Improve startup times by pre-compiling shaders with splash screen
2018-12-07 16:10:52 -08:00
Clément Brisset
3386e5042f
Merge pull request #14450 from birarda/bug/case-insensitive-paths
match domain paths match case-insensitively
2018-12-07 13:59:49 -08:00
John Conklin II
2d52fffa4b
Merge pull request #14460 from huffman/fix/lifetime-slider-alt
Change lifetime back to a regular input field
2018-12-07 13:43:08 -08:00
Ryan Huffman
a42a771df5
Merge pull request #14540 from huffman/feat/hide-certified-urls
Add hiding of certified properties in Create
2018-12-07 13:42:23 -08:00
sabrina-shanman
f2e69aec5e Fix mac warning for OBJSerializer::getFactory not marked with override 2018-12-07 13:41:33 -08:00
Ryan Huffman
6eb0029b9a
Merge pull request #14480 from thoys/fix/create/missingStartMiddleFinishTooltips
MS20000: [CreateApp/Tooltips] Add missing start/middle/finish tooltips
2018-12-07 12:10:54 -08:00
Jamil Akram
bc5166d1d8
Merge pull request #14531 from hyperlogic/feature/drop-after-delay-out-of-range-tracking
Added DropAfterDelay strategy to Vive Tracker Calibration Dialog
2018-12-07 12:09:44 -08:00
Jeff Clinton
998ec20854
Merge pull request #14539 from Atlante45/fix/script-loading
Fix ESS scripts getting stuck on load
2018-12-07 12:07:44 -08:00
sabrina-shanman
7cbe3776f5 Simplify serializer registration process 2018-12-07 12:05:27 -08:00
Stephen Birarda
e3e400c86f
Merge pull request #14549 from birarda/bug/no-initial-send
fix for initial send of non-instanced trait
2018-12-07 12:02:08 -08:00
Brad Hefta-Gaub
9428f1de33
Merge pull request #14529 from SimonWalton-HiFi/avatar-mixer-downloads-fst
Don't fetch avatars' .fst files from within the AvatarData class
2018-12-07 12:01:58 -08:00
Dante Ruiz
177a94b9a9 fix realod all scripts functionality 2018-12-07 11:48:03 -08:00
Zach Fox
4cc5fc755f Fix MS20208: Change an instance of 'ASSETS' to 'INVENTORY' 2018-12-07 11:42:03 -08:00
Thijs Wenker
3a259d8525 Merge branch 'master' of github.com:highfidelity/hifi into fix/create/missingStartMiddleFinishTooltips2
# Conflicts:
#	scripts/system/html/js/entityProperties.js
2018-12-07 20:24:21 +01:00
birarda
51fd742722 fix for initial send of non-instanced trait 2018-12-07 11:17:44 -08:00
Ryan Huffman
bf844e0472 Add hiding of certified properties in Create 2018-12-07 11:05:52 -08:00
Ryan Huffman
f42c31ca36 Update number property to reuse numberdraggable emit function 2018-12-07 11:02:31 -08:00
Ryan Huffman
c9ab5c23ea Add support for min/max/step/defaultValue on number field 2018-12-07 11:02:31 -08:00
Ryan Huffman
818339823c Add new number type in Create 2018-12-07 11:02:31 -08:00
David Back
e5792aa85f remove scene 2018-12-07 11:01:54 -08:00
John Conklin II
55f59a720f
Merge pull request #14501 from thoys/fix/create/userDataErrorMessagePopupInfiniteLoopFix
MS19567 [CreateApp]: userData error message continues popup fix
2018-12-07 10:59:34 -08:00