Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Riven 2024, Radio Free D'ni, ExpEmp, and Mysterium 2024 Clothing #260

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion compiled/dat/GlobalClothing_District_Female.prp
Git LFS file not shown
4 changes: 2 additions & 2 deletions compiled/dat/GlobalClothing_District_FemaleFan02.prp
Git LFS file not shown
4 changes: 2 additions & 2 deletions compiled/dat/GlobalClothing_District_FemaleMysterium.prp
Git LFS file not shown
2 changes: 1 addition & 1 deletion compiled/dat/GlobalClothing_District_Male.prp
Git LFS file not shown
4 changes: 2 additions & 2 deletions compiled/dat/GlobalClothing_District_MaleFan02.prp
Git LFS file not shown
4 changes: 2 additions & 2 deletions compiled/dat/GlobalClothing_District_MaleMysterium.prp
Git LFS file not shown
4 changes: 2 additions & 2 deletions sources/avatar/clothing/Avatar_Male04.max
Git LFS file not shown
3 changes: 3 additions & 0 deletions sources/avatar/clothing/Icon_UTorso_Pub.tga
Git LFS file not shown
4 changes: 2 additions & 2 deletions sources/avatar/clothing/bas.avatar.female.04.max
Git LFS file not shown
3 changes: 3 additions & 0 deletions sources/avatar/clothing_fan02/FTorso_ExpEmp_base.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions sources/avatar/clothing_fan02/FTorso_LongSleeve_RFD_Base.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions sources/avatar/clothing_fan02/FTorso_LongSleeve_RFD_Tint1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions sources/avatar/clothing_fan02/FTorso_longsleeve_RFD_tint2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions sources/avatar/clothing_fan02/FTorso_shortsleeve_RFD_base.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
265 changes: 263 additions & 2 deletions sources/avatar/clothing_fan02/Fan02.json
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,16 @@

"Icon_UTorso_Shirt_Riven2024.png",
"MTorso_xSleeve_Riven2024_Base.png",
"MTorso_xSleeve_Riven2024_Tint.png"
"MTorso_xSleeve_Riven2024_Tint.png",

"Icon_UTorso_Shirt_RFD.png",
"MTorso_Xsleeve_RFD_Base.png",
"MTorso_Xsleeve_RFD_tint1.png",
"MTorso_Xsleeve_RFD_tint2.png",

"Icon_UTorso_ExpEmp.png",
"MTorso_ExpEmp_base.png",
"UTorso_ExpEmpSleeve_base.png"
],
"clItems": [
{
Expand Down Expand Up @@ -1034,6 +1043,126 @@
}
}
]
},
{
"name": "MTorso_LongSleeve_RFD",
"type": "Shirt",
"group": "Male",
"icon": "Icon_UTorso_Shirt_RFD.png",
"tint1": [1, 1, 1],
"tint2": [1, 1, 1],
"desc": "ColorLabel1=Shirt; ColorLabel2=Text; isLogoFor=01_MTorso01_01; GroupName=LongSleeve01",
"text": "Long-Sleeved Shirt - Radio Free D'ni",
"meshes": [
{
"name": "MHTorso_SMsh",
"page": "Male"
},
{
"name": "MMTorso_SMsh",
"page": "Male"
},
{
"name": "MLTorso_SMsh",
"page": "Male"
}
],
"elements": [
{
"name": "Chest",
"layers": {
"0": "MTorso_Xsleeve_RFD_Base.png",
"8": "MTorso_Xsleeve_RFD_tint1.png",
"9": "MTorso_Xsleeve_RFD_tint2.png"
}
},
{
"name": "Arm",
"layers": {
"8": "mtorso_longsleeve01arm_tint1*0#0.hsm"
}
}
]
},
{
"name": "MTorso_ShortSleeve_RFD",
"type": "Shirt",
"group": "Male",
"icon": "Icon_UTorso_Shirt_RFD.png",
"tint1": [1, 1, 1],
"tint2": [1, 1, 1],
"desc": "ColorLabel1=Shirt; ColorLabel2=Text; isLogoFor=02_MTorso12_01; GroupName=ShortSleeve",
"text": "Short-Sleeved Shirt - Radio Free D'ni",
"meshes": [
{
"name": "MHTorso08_SMsh",
"page": "Male01"
},
{
"name": "MMTorso_SMsh",
"page": "Male01"
},
{
"name": "MLTorso_SMsh",
"page": "Male01"
}
],
"elements": [
{
"name": "Chest",
"layers": {
"0": "MTorso_Xsleeve_RFD_Base.png",
"8": "MTorso_Xsleeve_RFD_tint1.png",
"9": "MTorso_Xsleeve_RFD_tint2.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"
}
}
]
},
{
"name": "MReward_ExpEmp",
"type": "Shirt",
"group": "Male",
"icon": "Icon_UTorso_ExpEmp.png",
"tint1": [1.0, 1.0, 1.0],
"tint2": [1.0, 1.0, 1.0],
"desc": "ColorLabel1=; ColorLabel2=; GroupName=Pub; isLogoFor=MReward_PubJacket; nonStandard",
"text": "Explorer's Emporium Jacket",
"meshes": [
{
"name": "MHTorso_Pub_SMsh",
"page": "Male04"
},
{
"name": "MMTorso_Pub_SMsh",
"page": "Male04"
},
{
"name": "MLTorso_Pub_SMsh",
"page": "Male04"
}
],
"elements": [
{
"name": "Chest",
"layers": {
"0": "MTorso_ExpEmp_base.png"
}
},
{
"name": "Arm",
"layers": {
"0": "UTorso_ExpEmpSleeve_base.png"
}
}
]
}
]
},
Expand Down Expand Up @@ -1119,7 +1248,20 @@

"Icon_UTorso_Shirt_Riven2024.png",
"FTorso_xSleeve_Riven2024_Base.png",
"FTorso_xSleeve_Riven2024_Tint.png"
"FTorso_xSleeve_Riven2024_Tint.png",

"Icon_UTorso_Shirt_RFD.png",
"FTorso_longsleeve_RFD_base.png",
"FTorso_longsleeve_RFD_tint1.png",
"FTorso_longsleeve_RFD_tint2.png",

"FTorso_shortsleeve_RFD_base.png",
"FTorso_shortsleeve_RFD_tint1.png",
"FTorso_shortsleeve_RFD_tint2.png",

"Icon_UTorso_ExpEmp.png",
"FTorso_ExpEmp_base.png",
"UTorso_ExpEmpSleeve_base.png"
],
"clItems": [
{
Expand Down Expand Up @@ -2028,6 +2170,125 @@
}
}
]
},
{
"name": "FTorso_ShortSleeve_RFD",
"type": "Shirt",
"group": "Female",
"icon": "Icon_UTorso_Shirt_RFD.png",
"tint1": [0.0, 0.0, 0.0],
"tint2": [0.0, 0.0, 0.0],
"desc": "ColorLabel1=Shirt; ColorLabel2=Text; isLogoFor=02_FTorso12_01; GroupName=ShortSleeve",
"text": "Short Sleeve T-Shirt - Radio Free D'ni",
"meshes": [
{
"name": "FHTorso12_SMsh",
"page": "Female01"
},
{
"name": "FMTorso12_SMsh",
"page": "Female01"
},
{
"name": "FLTorso12_SMsh",
"page": "Female01"
}
],
"elements": [
{
"name": "Chest",
"layers": {
"0": "FTorso_shortsleeve_RFD_base.png",
"8": "FTorso_shortsleeve_RFD_tint1.png",
"9": "FTorso_shortsleeve_RFD_tint2.png"
}
},
{
"name": "Arm",
"layers": {
"1": "mtorso_shortsleevearm_skin*0#0.hsm",
"8": "fsleeve04t02l1*0#0.hsm"
}
}
]
},
{
"name": "FTorso_LongSleeve_RFD",
"type": "Shirt",
"group": "Female",
"icon": "Icon_UTorso_Shirt_RFD.png",
"tint1": [1, 1, 1],
"tint2": [1, 1, 1],
"desc": "ColorLabel1=Shirt; ColorLabel2=Text; isLogoFor=01_FTorso01_01; GroupName=LongSleeve01",
"text": "Long-Sleeved Shirt - Radio Free D'ni",
"meshes": [
{
"name": "FHTorso_SMsh",
"page": "Female"
},
{
"name": "FMTorso_SMsh",
"page": "Female"
},
{
"name": "FLTorso_SMsh",
"page": "Female"
}
],
"elements": [
{
"name": "Chest",
"layers": {
"0": "FTorso_longsleeve_RFD_base.png",
"8": "FTorso_longsleeve_RFD_tint1.png",
"9": "FTorso_longsleeve_RFD_tint2.png"
}
},
{
"name": "Arm",
"layers": {
"8": "ftorso_longsleeve01arm_tint1*0#0.hsm"
}
}
]
},
{
"name": "FReward_ExpEmp",
"type": "Shirt",
"group": "Female",
"icon": "Icon_UTorso_ExpEmp.png",
"tint1": [1.0, 1.0, 1.0],
"tint2": [1.0, 1.0, 1.0],
"desc": "ColorLabel1=; ColorLabel2=; GroupName=Pub; isLogoFor=FReward_PubJacket; nonStandard",
"text": "Explorer's Emporium Jacket",
"meshes": [
{
"name": "FHTorso_Pub_SMsh",
"page": "Female04"
},
{
"name": "FMTorso_Pub_SMsh",
"page": "Female04"
},
{
"name": "FLTorso_Pub_SMsh",
"page": "Female04"
}
],
"elements": [
{
"name": "Chest",
"layers": {
"0": "FTorso_ExpEmp_base.png"
}
},
{
"name": "Arm",
"layers": {
"0": "UTorso_ExpEmpSleeve_base.png"
}
}
]
}
]
}
Expand Down
3 changes: 3 additions & 0 deletions sources/avatar/clothing_fan02/Icon_UTorso_ExpEmp.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions sources/avatar/clothing_fan02/Icon_UTorso_Shirt_RFD.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions sources/avatar/clothing_fan02/MTorso_ExpEmp_base.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions sources/avatar/clothing_fan02/MTorso_Xsleeve_RFD_Base.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions sources/avatar/clothing_fan02/MTorso_Xsleeve_RFD_tint1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions sources/avatar/clothing_fan02/MTorso_Xsleeve_RFD_tint2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions sources/avatar/clothing_fan02/UTorso_ExpEmpSleeve_base.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Loading