Commit graph

77105 commits

Author SHA1 Message Date
SamGondelman
c985fc735d clean up avatar rendering and ring gizmo normals 2019-03-14 14:43:43 -07:00
amantley
bc696d6db6 fixed memory leak caused by bone length scale computation 2019-03-14 13:49:13 -07:00
sabrina-shanman
3016860bab Fix QFile::open complaining the device was already open in
TextureBaker::processTexture
2019-03-14 13:31:29 -07:00
Roxanne Skelly
b220b76874 Merge branch 'master' of https://github.com/highfidelity/hifi into Case21467 2019-03-14 13:05:08 -07:00
Roxanne Skelly
f971d17acc Merge branch 'master' of https://github.com/highfidelity/hifi into Case20393 2019-03-14 12:36:42 -07:00
Roxanne Skelly
4470cf9ae5 Marketplace category dropdown UI tweaks 2019-03-14 12:35:54 -07:00
NissimHadar
6c9c58c657 Remove unneeded wait. 2019-03-14 11:36:40 -07:00
sabrina-shanman
5e430c98c5 Attempt to fix build warnings 2019-03-14 09:56:25 -07:00
Thijs Wenker
aeb56ff22a EntityList -> re-focus the rename field rather then re-selecting the text fully
EntityProperties -> ignore selection updates when nothing is changed and window is focused
2019-03-14 01:26:06 +01:00
sabrina-shanman
5b75eb34e8 Fix ModelBaker not properly checking if texture file name exists 2019-03-13 17:26:02 -07:00
Howard Stearns
9b3b109d22 make placename consistent with hostname after domain reset 2019-03-13 17:09:54 -07:00
sabrina-shanman
27c7bf5c92 Remove duplicate FBX debug dump 2019-03-13 17:02:55 -07:00
Shannon Romano
58146063db
Merge pull request #15179 from roxanneskelly/Case21703
Case 21703, Case 21704, Case 21701 - random marketplace UI fixes
2019-03-13 16:45:46 -07:00
sabrina-shanman
a3412bb25e Attempt to fix build errors 2019-03-13 16:44:50 -07:00
sabrina-shanman
cb1f42afe5 Copy pre-parsed node from FBXSerializer for baking 2019-03-13 16:44:50 -07:00
sabrina-shanman
3aaa18f529 Might as well deduplicate indices when loading model for baking 2019-03-13 16:44:50 -07:00
sabrina-shanman
32d5f7135f Give the oven model-baker Baker an appropriate materialMappingBaseURL, but disable ParseMaterialMappingTask for now 2019-03-13 16:44:50 -07:00
Roxanne Skelly
c3ecc29c4b Merge branch 'master' of https://github.com/highfidelity/hifi into Case20393 2019-03-13 16:04:34 -07:00
maspring
5e09103d9f
Merge pull request #15177 from huffman/fix/vsfiles
Case 21708: Remove .vs folder from version control
2019-03-13 15:39:25 -07:00
Roxanne Skelly
559351a6eb Case 21701 - Items were showing up in marketplace as "updates" when they
weren't
2019-03-13 15:33:46 -07:00
Roxanne Skelly
42bf812019 Case 21704 - marketplace button formatting fixes 2019-03-13 15:03:29 -07:00
Roxanne Skelly
822e5ceb98 Case 21703 - Disable SUBMIT before balance is retrieved
to prevent sending a send-money request with too large
of a balance
2019-03-13 13:42:55 -07:00
SamGondelman
300dd39abf fix script engine shutdown 2019-03-13 12:23:31 -07:00
Shannon Romano
28b8f1a62c
Merge pull request #15172 from wayne-chen/fixSteamCompleteProfileBody-master
Case 21695: Unable to create new profile during steam login
2019-03-13 10:46:08 -07:00
Roxanne Skelly
2dc38df779 Case 20393 - Display item counts in categories dropdown in Marketplace 2019-03-13 10:17:39 -07:00
Ryan Huffman
d8139af429 Remove .vs folder from version control 2019-03-13 08:51:19 -07:00
Sam Gondelman
f013b9af2b
fix warnings 2019-03-13 00:24:19 -07:00
SamGondelman
609c4ab52e try to fix audio injector threading issues 2019-03-12 18:41:43 -07:00
sabrina-shanman
b855b0e2a3 Document available bake types for baker command line 2019-03-12 18:33:41 -07:00
NissimHadar
b35b7687b7 Ready. 2019-03-12 18:32:17 -07:00
sabrina-shanman
7f77e163ac Restore 'Re-bake originals' checkbox to domain bake window 2019-03-12 18:17:11 -07:00
sabrina-shanman
a93825c2f9 Fix remaining issues with merge 2019-03-12 18:14:18 -07:00
Wayne Chen
6b82b8cd7f fix for steam complete profile bug 2019-03-12 17:55:14 -07:00
Shannon Romano
95bdf29f35
Merge pull request #15151 from roxanneskelly/Case20622
Case 20622 - Qml Marketplace - Fix categories dropdown UI issues
2019-03-12 17:42:47 -07:00
danteruiz
1e354fb280 fix notications scaling 2019-03-12 17:18:15 -07:00
sabrina-shanman
ddc4f5349e Merge branch 'master' into hfm_oven_wip 2019-03-12 16:23:07 -07:00
sabrina-shanman
06d38bf8e7 Fix DomainBaker not outputting URLs relative to the Destination URL Path 2019-03-12 15:36:14 -07:00
sabrina-shanman
f9f55f08db Fix model baking GUI being less lenient with local Windows files 2019-03-12 15:36:14 -07:00
sabrina-shanman
41c0594361 Make output folder cleaner for single model bake when baked model url is given as input 2019-03-12 15:36:13 -07:00
sabrina-shanman
09c30269d4 Add a note about FST support for url userinfo/query/fragment 2019-03-12 15:36:13 -07:00
sabrina-shanman
abbbeb11e1 Comment out baking for collision model, with explanation 2019-03-12 15:36:13 -07:00
sabrina-shanman
b42c6d1352 Fix baked models not mapping to correct textures 2019-03-12 15:36:06 -07:00
sabrina-shanman
5b504c4759 Add encode/decode speed config to BuildDracoMeshTask 2019-03-12 15:36:05 -07:00
sabrina-shanman
efc9f993f5 Add FSTBaker, and make ModelBaker output an FST
Restore feature to look for baked model file in other oven directory
2019-03-12 15:34:57 -07:00
danteruiz
6303f61cc3 fix lasers scale issue 2019-03-12 14:26:59 -07:00
Shannon Romano
88da09c2ab
Merge pull request #15029 from FlameSoulis/fix/Linux-Build-Guide
Resolve Linux Build Guide's Cmake issue
2019-03-12 12:29:46 -07:00
Sabrina Shanman
ff67cd652e
Merge pull request #15158 from SamGondelman/unrigged
Case 7295: Fix rendering of unrigged vertices
2019-03-12 10:59:29 -07:00
NissimHadar
41662b183b Removed redundant method. 2019-03-12 10:45:04 -07:00
John Conklin II
2cf7462fbc
Merge pull request #15159 from dback2/jointOffset2RenamingFix
Case 21669: Fix joint renaming with jointRotationOffset2
2019-03-12 10:32:02 -07:00
NissimHadar
df2fd82b61 Merge branch 'master' of github.com:highfidelity/hifi into 21616-addPerTileThreshold 2019-03-11 20:25:32 -07:00