Commit graph

77032 commits

Author SHA1 Message Date
Robin K Wilson
435c58c7cc
Update BUILD_WIN.md 2019-03-20 14:48:35 -07:00
Shannon Romano
e256c34823
Merge pull request #15191 from roxanneskelly/Case21467
Case 21728 - tab in marketplace search bar causes an update of search results
2019-03-20 14:22:10 -07:00
Shannon Romano
a6d4f98ee7
Merge pull request #15204 from roxanneskelly/Case21025
Case 21025 conditionalizing TabletWebView features
2019-03-20 14:21:37 -07:00
Shannon Romano
560459f491
Merge pull request #14916 from SimonWalton-HiFi/dissectors-add-audiosolorequest
Dissectors - Add AudioSoloRequest, BulkAvatarTraitsAck
2019-03-20 12:46:02 -07:00
Howard Stearns
3085ea212d
Merge pull request #15186 from howard-stearns/make-placename-consistent-with-hostname-after-domain-reset
make placename consistent with hostname after domain reset
2019-03-20 12:18:32 -07:00
Thijs Wenker
20c3a36308
Merge pull request #15227 from thoys/fix/create/dontIgnoreAllUpdatesWhenFocussed
Case 21816: don't ignore updates that originate from entityPropertiesTool itself [master]
2019-03-20 19:43:37 +01:00
Roxanne Skelly
7fc2a52022
Merge pull request #15226 from roxanneskelly/Case21392
Case 21392 - Excise unneeded code from marketplacesInject.js
2019-03-20 10:16:24 -07:00
Shannon Romano
4ac25121e0
Merge pull request #15190 from roxanneskelly/Case20393
Case20393 - Add item counts to interface categories
2019-03-19 17:53:30 -07:00
Roxanne Skelly
27fa0dc4c6 CR fixes 2019-03-19 17:24:19 -07:00
Shannon Romano
e847c35b28
Merge pull request #15223 from roxanneskelly/Case21807
Case 21807 - updatable items not showing up as updatable after clicking 'show updates' button. (master)
2019-03-19 17:19:22 -07:00
Roxanne Skelly
ab61f65ea2 CR fix 2019-03-19 17:08:04 -07:00
Roxanne Skelly
640b05304a Case 21392 - Excise unneeded code from marketplacesInject.js 2019-03-19 16:24:07 -07:00
Thijs Wenker
19c51b25d1 don't ignore updates that originate from entityPropertiesTool itself 2019-03-20 00:18:21 +01:00
Howard Stearns
44f897fbd2
Merge pull request #15216 from howard-stearns/allow-base-url-to-be-specified-in-fst
allow baseURL to be specified in fst
2019-03-19 13:56:27 -07:00
Roxanne Skelly
94739aa7c7 Case 21769 - updatable items not showing up as updatable
after clicking 'show updates' button.
2019-03-19 13:44:16 -07:00
Sam Gateau
d88bee89e4
Merge pull request #15176 from sabrina-shanman/hfm_oven_wip
(case 21205) Incorporate HFM in Oven + Add FST baking/output + More Oven Improvements
2019-03-19 13:03:49 -07:00
Howard Stearns
61fb65b5a4 don't set _url, so that cache_clearing works 2019-03-19 12:41:58 -07:00
Roxanne Skelly
80a1eaa3fd
Merge pull request #15215 from roxanneskelly/Case21790
Stand-alone Tagging: tagged places not coming first in GOTO list
2019-03-19 11:25:43 -07:00
howard-stearns
0e4d3b2aeb allow baseURL to be specified in fst 2019-03-18 17:40:54 -07:00
Roxanne Skelly
b6e583087e Stand-alone Tagging: tagged places not coming first in GOTO list 2019-03-18 17:40:01 -07:00
sabrina-shanman
fa6a94f16a Fix not mapping identical URLs in DomainBaker 2019-03-18 17:21:05 -07:00
sabrina-shanman
b0b4307f27 Fix unsupported model types preventing DomainBaker from finishing 2019-03-18 17:02:49 -07:00
sabrina-shanman
e6487332e8 Attempt to fix linker error with Android and draco in BuildDracoMeshTask.cpp 2019-03-18 17:02:44 -07:00
sabrina-shanman
e4cafced2a Re-name GRAP_KEY to GRAB_KEY in DomainBaker.cpp 2019-03-18 16:49:09 -07:00
sabrina-shanman
64fbf51ac2 Warn if baked mesh is empty for OBJBaker 2019-03-18 16:49:09 -07:00
sabrina-shanman
266f3a8ad8 Warn if handleFinishedTextureBaker doesn't recognize the sender 2019-03-18 16:49:09 -07:00
sabrina-shanman
cf40ed953b Do not create temporary directory in ModelBaker and copy model directly to the original output folder 2019-03-18 16:49:09 -07:00
sabrina-shanman
c29b3a8c35 Bypass signals in JSBaker/MaterialBaker when resource is already loaded 2019-03-18 16:49:09 -07:00
sabrina-shanman
bc3b35aad3 Do not consolidate source images by file for now, since they may have the same filename but different paths 2019-03-18 16:49:00 -07:00
sabrina-shanman
0990b56952 Better avoid overwriting textures in ModelBaker::compressTexture 2019-03-18 16:48:47 -07:00
Roxanne Skelly
fe28eaca7c fix typo 2019-03-18 11:23:48 -07:00
Shannon Romano
840f3a3a2e
Merge pull request #15187 from SamGondelman/wearables
Case 21721: Fix wearable duplication on domain switch
2019-03-15 17:40:23 -07:00
Sam Gondelman
e7f2df4fac
Merge pull request #15197 from SamGondelman/onion
Case 21746: Fix color grading/lighting of renderLayer front entities
2019-03-15 17:17:09 -07:00
sabrina-shanman
b6c44ea443 Remove unused variables when iterating through mesh nodes in FBXBaker 2019-03-15 15:56:36 -07:00
sabrina-shanman
53429f459e Remove some redundancy involving model texture URL resolution 2019-03-15 15:32:39 -07:00
sabrina-shanman
60ed9e12a4 Attempt to fix build errors 2019-03-15 15:17:33 -07:00
SamGondelman
79dda7a6c7 build errors 2019-03-15 14:29:50 -07:00
SamGondelman
83bac723ef fix wearable duplication on domain switch 2019-03-15 13:38:25 -07:00
Roxanne Skelly
9182db8bd4 Case 21025 conditionalizing TabletWebView features 2019-03-15 12:56:43 -07:00
SamGondelman
8748a7561b fix lighting/color grading for everything 2019-03-15 12:48:32 -07:00
Roxanne Skelly
365be5f74c Merge branch 'master' of https://github.com/highfidelity/hifi into Case21467 2019-03-15 12:38:12 -07:00
sabrina-shanman
041db33578 Attempt to fix build warnings 2019-03-15 10:20:58 -07:00
sabrina-shanman
c54b23f647 Make material baking output unique textures per usage like model baking does 2019-03-14 17:09:26 -07:00
sabrina-shanman
c8209aa976 Do not have multiple copies of the original texture file in the baked output 2019-03-14 17:09:25 -07:00
sabrina-shanman
20d0ca0073 Fix baked material JSONS using wrong texture paths 2019-03-14 17:09:21 -07:00
Shannon Romano
98eec6b74d
Merge pull request #15185 from thoys/fix/create/stopReselectionWhenFocussed
Case 21653: Fix User is not able to update input fields and scroll past selected object in Create Tools [master]
2019-03-14 16:14:32 -07:00
Anthony Thibault
a8b38e6fbe
Merge pull request #15192 from amantley/bugHandNoHipAnim
Fixed Memory Corruption in AnimClip.cpp
2019-03-14 15:28:19 -07:00
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