From 614dee8f7ce42d4451e8c398cbc549d1c34eec70 Mon Sep 17 00:00:00 2001 From: Darryl Pogue Date: Tue, 18 Jun 2024 11:30:49 -0700 Subject: [PATCH 1/2] Fix wrong filename casing on GoInst shirt base --- ...rso_xSleeve_GoInst_base.png => FTorso_xSleeve_GoInst_Base.png} | 0 ...rso_xSleeve_GoInst_base.png => MTorso_xSleeve_GoInst_Base.png} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename sources/avatar/clothing_fan02/{FTorso_xSleeve_GoInst_base.png => FTorso_xSleeve_GoInst_Base.png} (100%) rename sources/avatar/clothing_fan02/{MTorso_xSleeve_GoInst_base.png => MTorso_xSleeve_GoInst_Base.png} (100%) diff --git a/sources/avatar/clothing_fan02/FTorso_xSleeve_GoInst_base.png b/sources/avatar/clothing_fan02/FTorso_xSleeve_GoInst_Base.png similarity index 100% rename from sources/avatar/clothing_fan02/FTorso_xSleeve_GoInst_base.png rename to sources/avatar/clothing_fan02/FTorso_xSleeve_GoInst_Base.png diff --git a/sources/avatar/clothing_fan02/MTorso_xSleeve_GoInst_base.png b/sources/avatar/clothing_fan02/MTorso_xSleeve_GoInst_Base.png similarity index 100% rename from sources/avatar/clothing_fan02/MTorso_xSleeve_GoInst_base.png rename to sources/avatar/clothing_fan02/MTorso_xSleeve_GoInst_Base.png From a6cb4eed821d79172f0a6a113110e8fe9e0e157c Mon Sep 17 00:00:00 2001 From: Darryl Pogue Date: Tue, 18 Jun 2024 11:02:07 -0700 Subject: [PATCH 2/2] Add shirt design for Riven 2024 --- .../GlobalClothing_District_FemaleFan02.prp | 4 +- .../dat/GlobalClothing_District_MaleFan02.prp | 4 +- sources/avatar/UTorso_xSleeve-Template.xcf | 3 + .../FTorso_xSleeve_Riven2024_Base.png | 3 + .../FTorso_xSleeve_Riven2024_Tint.png | 3 + sources/avatar/clothing_fan02/Fan02.json | 101 ++++++++++++++++-- .../Icon_UTorso_Shirt_Riven2024.png | 3 + .../MTorso_xSleeve_Riven2024_Base.png | 3 + .../MTorso_xSleeve_Riven2024_Tint.png | 3 + .../UTorso_xSleeve_Riven2024.xcf | 3 + 10 files changed, 120 insertions(+), 10 deletions(-) create mode 100644 sources/avatar/UTorso_xSleeve-Template.xcf create mode 100644 sources/avatar/clothing_fan02/FTorso_xSleeve_Riven2024_Base.png create mode 100644 sources/avatar/clothing_fan02/FTorso_xSleeve_Riven2024_Tint.png create mode 100644 sources/avatar/clothing_fan02/Icon_UTorso_Shirt_Riven2024.png create mode 100644 sources/avatar/clothing_fan02/MTorso_xSleeve_Riven2024_Base.png create mode 100644 sources/avatar/clothing_fan02/MTorso_xSleeve_Riven2024_Tint.png create mode 100644 sources/avatar/clothing_fan02/UTorso_xSleeve_Riven2024.xcf diff --git a/compiled/dat/GlobalClothing_District_FemaleFan02.prp b/compiled/dat/GlobalClothing_District_FemaleFan02.prp index 584b635a1..b7da39860 100644 --- a/compiled/dat/GlobalClothing_District_FemaleFan02.prp +++ b/compiled/dat/GlobalClothing_District_FemaleFan02.prp @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2b413c4977c0395b93dcec581e3a10daf9c8437fb02e63254aa970a909b58d9b -size 6398518 +oid sha256:5b411efe1dd09d6fd2f463d3614eddd13db65d5ac238eb131080ed04fd3c63dc +size 6685935 diff --git a/compiled/dat/GlobalClothing_District_MaleFan02.prp b/compiled/dat/GlobalClothing_District_MaleFan02.prp index 840a9724e..8d0876f4b 100644 --- a/compiled/dat/GlobalClothing_District_MaleFan02.prp +++ b/compiled/dat/GlobalClothing_District_MaleFan02.prp @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c1996a2a15c7305b7400e49f2f19c9f7f2419598c0dcca9d30946e5f27b71c16 -size 6137191 +oid sha256:b6685f94c4bfc909e5a240a6d5d95eebf1673a2e7b48242aa597bb664e1ff6d5 +size 6424668 diff --git a/sources/avatar/UTorso_xSleeve-Template.xcf b/sources/avatar/UTorso_xSleeve-Template.xcf new file mode 100644 index 000000000..6053ec97b --- /dev/null +++ b/sources/avatar/UTorso_xSleeve-Template.xcf @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:321a5e2b8fef57ae53cbac418bc945cbe89ee2fc840a3b036911f2493323dee7 +size 708381 diff --git a/sources/avatar/clothing_fan02/FTorso_xSleeve_Riven2024_Base.png b/sources/avatar/clothing_fan02/FTorso_xSleeve_Riven2024_Base.png new file mode 100644 index 000000000..5ce65f1c4 --- /dev/null +++ b/sources/avatar/clothing_fan02/FTorso_xSleeve_Riven2024_Base.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1b5210ff11254baa0604f79fe92fd8d998222b9a41da102f2d13f2b998adf6ad +size 85314 diff --git a/sources/avatar/clothing_fan02/FTorso_xSleeve_Riven2024_Tint.png b/sources/avatar/clothing_fan02/FTorso_xSleeve_Riven2024_Tint.png new file mode 100644 index 000000000..5ebfed29e --- /dev/null +++ b/sources/avatar/clothing_fan02/FTorso_xSleeve_Riven2024_Tint.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7e41590d47dc64a627e896e806d026348809646e48c3117d2263fe7fb506ca8f +size 82124 diff --git a/sources/avatar/clothing_fan02/Fan02.json b/sources/avatar/clothing_fan02/Fan02.json index 7eafcee1b..fadaf6bdb 100644 --- a/sources/avatar/clothing_fan02/Fan02.json +++ b/sources/avatar/clothing_fan02/Fan02.json @@ -70,13 +70,17 @@ "MTorso_xSleeve_MTP_Tint1.png", "MTorso_HoodSweatMTP_Base.png", "MTorso_HoodSweatMTP_Tint1.png", - + "Icon_MLegs_shortstrydye.png", "MLegs_Shorts_TransDye_Base.png", - + "Icon_UTorso_Shirt_Kalamee.png", "MTorso_ShortSleeve_Kalamee_Base.png", - "MTorso_ShortSleeve_Kalamee_Tint1.png" + "MTorso_ShortSleeve_Kalamee_Tint1.png", + + "Icon_UTorso_Shirt_Riven2024.png", + "MTorso_xSleeve_Riven2024_Base.png", + "MTorso_xSleeve_Riven2024_Tint.png" ], "clItems": [ { @@ -989,6 +993,47 @@ } } ] + }, + { + "name": "MTorso_ShortSleeve_Riven2024", + "type": "Shirt", + "group": "Male", + "icon": "Icon_UTorso_Shirt_Riven2024.png", + "tint1": [0.0, 0.0, 0.0], + "tint2": [0.0, 0.0, 0.0], + "desc": "ColorLabel1=Shirt; ColorLabel2=; isLogoFor=02_MTorso12_01; GroupName=ShortSleeve", + "text": "Short Sleeve T-Shirt - Riven: Moiety Hive", + "meshes": [ + { + "name": "MHTorso08_SMsh", + "page": "Male01" + }, + { + "name": "MMTorso_SMsh", + "page": "Male01" + }, + { + "name": "MLTorso_SMsh", + "page": "Male01" + } + ], + "elements": [ + { + "name": "Chest", + "layers": { + "0": "MTorso_xSleeve_Riven2024_Base.png", + "8": "MTorso_xSleeve_Riven2024_Tint.png" + } + }, + { + "name": "Arm", + "layers": { + "0": "mtorso_shortsleevearm_base*0#0.hsm", + "1": "mtorso_shortsleevearm_skin*0#0.hsm", + "8": "mtorso_shortsleevearm_tint1*0#0.hsm" + } + } + ] } ] }, @@ -1064,13 +1109,17 @@ "FTorso_LongSleeve_MTP_Tint1.png", "FTorso_HoodSweatMTP_Base.png", "FTorso_HoodSweatMTP_Tint1.png", - + "Icon_FLegs_shortstrydye.png", "FLegs_Shorts_TransDye_Base.png", - + "Icon_UTorso_Shirt_Kalamee.png", "FTorso_ShortSleeve_Kalamee_Base.png", - "FTorso_ShortSleeve_Kalamee_Tint1.png" + "FTorso_ShortSleeve_Kalamee_Tint1.png", + + "Icon_UTorso_Shirt_Riven2024.png", + "FTorso_xSleeve_Riven2024_Base.png", + "FTorso_xSleeve_Riven2024_Tint.png" ], "clItems": [ { @@ -1939,6 +1988,46 @@ } } ] + }, + { + "name": "FTorso_ShortSleeve_Riven2024", + "type": "Shirt", + "group": "Female", + "icon": "Icon_UTorso_Shirt_Riven2024.png", + "tint1": [0.0, 0.0, 0.0], + "tint2": [0.0, 0.0, 0.0], + "desc": "ColorLabel1=Shirt; ColorLabel2=; isLogoFor=02_FTorso12_01; GroupName=ShortSleeve", + "text": "Short Sleeve T-Shirt - Riven: Moiety Hive", + "meshes": [ + { + "name": "FHTorso12_SMsh", + "page": "Female01" + }, + { + "name": "FMTorso12_SMsh", + "page": "Female01" + }, + { + "name": "FLTorso12_SMsh", + "page": "Female01" + } + ], + "elements": [ + { + "name": "Chest", + "layers": { + "0": "FTorso_xSleeve_Riven2024_Base.png", + "8": "FTorso_xSleeve_Riven2024_Tint.png" + } + }, + { + "name": "Arm", + "layers": { + "1": "mtorso_shortsleevearm_skin*0#0.hsm", + "8": "fsleeve04t02l1*0#0.hsm" + } + } + ] } ] } diff --git a/sources/avatar/clothing_fan02/Icon_UTorso_Shirt_Riven2024.png b/sources/avatar/clothing_fan02/Icon_UTorso_Shirt_Riven2024.png new file mode 100644 index 000000000..35ed78d13 --- /dev/null +++ b/sources/avatar/clothing_fan02/Icon_UTorso_Shirt_Riven2024.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b45e377ee4653d06a9a7be8221acba1aec0a36bdcc8800e565f8b3d3b662520a +size 11942 diff --git a/sources/avatar/clothing_fan02/MTorso_xSleeve_Riven2024_Base.png b/sources/avatar/clothing_fan02/MTorso_xSleeve_Riven2024_Base.png new file mode 100644 index 000000000..10ebed7ac --- /dev/null +++ b/sources/avatar/clothing_fan02/MTorso_xSleeve_Riven2024_Base.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0e109e7c09de9e5157249a0404afda37196b661bfbf9d4d63468bfc59082b002 +size 84020 diff --git a/sources/avatar/clothing_fan02/MTorso_xSleeve_Riven2024_Tint.png b/sources/avatar/clothing_fan02/MTorso_xSleeve_Riven2024_Tint.png new file mode 100644 index 000000000..e53d924fb --- /dev/null +++ b/sources/avatar/clothing_fan02/MTorso_xSleeve_Riven2024_Tint.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:34f2e999429d48ab7da15ddbff96d547a1ab03c1914f351ed550b3c8e255c9a5 +size 82964 diff --git a/sources/avatar/clothing_fan02/UTorso_xSleeve_Riven2024.xcf b/sources/avatar/clothing_fan02/UTorso_xSleeve_Riven2024.xcf new file mode 100644 index 000000000..e21e8e79c --- /dev/null +++ b/sources/avatar/clothing_fan02/UTorso_xSleeve_Riven2024.xcf @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:387f08dc8623a1e5e5d30b9040271be3e4db73819b48ffa93152e6bd6ae9566a +size 1504185