Browse Source

Merge cef33ffc46 into 5d140becc8

pull/276/merge
Darryl Pogue 3 months ago committed by GitHub
parent
commit
728a690b12
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. BIN
      compiled/dat/GlobalClothing_District_FemaleFan02.prp
  2. BIN
      compiled/dat/GlobalClothing_District_MaleFan02.prp
  3. BIN
      sources/avatar/clothing/Avatar_Male04.max
  4. BIN
      sources/avatar/clothing/Icon_UTorso_Pub.tga
  5. BIN
      sources/avatar/clothing/bas.avatar.female.04.max
  6. BIN
      sources/avatar/clothing_fan02/FTorso_ExpEmp_base.png
  7. BIN
      sources/avatar/clothing_fan02/FTorso_LongSleeve_RFD_Base.png
  8. BIN
      sources/avatar/clothing_fan02/FTorso_LongSleeve_RFD_Tint1.png
  9. BIN
      sources/avatar/clothing_fan02/FTorso_ShortSleeve_Sameehn_base.png
  10. BIN
      sources/avatar/clothing_fan02/FTorso_ShortSleeve_Sameehn_tint1.png
  11. BIN
      sources/avatar/clothing_fan02/FTorso_longsleeve_RFD_tint2.png
  12. BIN
      sources/avatar/clothing_fan02/FTorso_shortsleeve_RFD_base.png
  13. BIN
      sources/avatar/clothing_fan02/FTorso_shortsleeve_RFD_tint1.png
  14. BIN
      sources/avatar/clothing_fan02/FTorso_shortsleeve_RFD_tint2.png
  15. 1242
      sources/avatar/clothing_fan02/Fan02.json
  16. BIN
      sources/avatar/clothing_fan02/Icon_UTorso_ExpEmp.png
  17. BIN
      sources/avatar/clothing_fan02/Icon_UTorso_Shirt_RFD.png
  18. BIN
      sources/avatar/clothing_fan02/Icon_UTorso_Shirt_Sameehn.png
  19. BIN
      sources/avatar/clothing_fan02/MTorso_ExpEmp_base.png
  20. BIN
      sources/avatar/clothing_fan02/MTorso_ShortSleeve_Sameehn_base.png
  21. BIN
      sources/avatar/clothing_fan02/MTorso_ShortSleeve_Sameehn_tint1.png
  22. BIN
      sources/avatar/clothing_fan02/MTorso_Xsleeve_RFD_Base.png
  23. BIN
      sources/avatar/clothing_fan02/MTorso_Xsleeve_RFD_tint1.png
  24. BIN
      sources/avatar/clothing_fan02/MTorso_Xsleeve_RFD_tint2.png
  25. BIN
      sources/avatar/clothing_fan02/UTorso_ExpEmpSleeve_base.png
  26. BIN
      sources/avatar/clothing_mysterium/FTorso_ShortSleeve_Mysterium2024_Base.png
  27. BIN
      sources/avatar/clothing_mysterium/FTorso_ShortSleeve_Mysterium2024_Tint1.png
  28. BIN
      sources/avatar/clothing_mysterium/FTorso_ShortSleeve_Mysterium2024_Tint2.png
  29. BIN
      sources/avatar/clothing_mysterium/Icon_UTorso_Shirt_Mysterium2024.png
  30. BIN
      sources/avatar/clothing_mysterium/MTorso_ShortSleeve_Mysterium2024_Base.png
  31. BIN
      sources/avatar/clothing_mysterium/MTorso_ShortSleeve_Mysterium2024_Tint1.png
  32. BIN
      sources/avatar/clothing_mysterium/MTorso_ShortSleeve_Mysterium2024_Tint2.png
  33. 95
      sources/avatar/clothing_mysterium/mysterium.json

BIN
compiled/dat/GlobalClothing_District_FemaleFan02.prp (Stored with Git LFS)

Binary file not shown.

BIN
compiled/dat/GlobalClothing_District_MaleFan02.prp (Stored with Git LFS)

Binary file not shown.

BIN
sources/avatar/clothing/Avatar_Male04.max (Stored with Git LFS)

Binary file not shown.

BIN
sources/avatar/clothing/Icon_UTorso_Pub.tga (Stored with Git LFS)

Binary file not shown.

BIN
sources/avatar/clothing/bas.avatar.female.04.max (Stored with Git LFS)

Binary file not shown.

BIN
sources/avatar/clothing_fan02/FTorso_ExpEmp_base.png (Stored with Git LFS)

Binary file not shown.

BIN
sources/avatar/clothing_fan02/FTorso_LongSleeve_RFD_Base.png (Stored with Git LFS)

Binary file not shown.

BIN
sources/avatar/clothing_fan02/FTorso_LongSleeve_RFD_Tint1.png (Stored with Git LFS)

Binary file not shown.

BIN
sources/avatar/clothing_fan02/FTorso_ShortSleeve_Sameehn_base.png (Stored with Git LFS)

Binary file not shown.

BIN
sources/avatar/clothing_fan02/FTorso_ShortSleeve_Sameehn_tint1.png (Stored with Git LFS)

Binary file not shown.

BIN
sources/avatar/clothing_fan02/FTorso_longsleeve_RFD_tint2.png (Stored with Git LFS)

Binary file not shown.

BIN
sources/avatar/clothing_fan02/FTorso_shortsleeve_RFD_base.png (Stored with Git LFS)

Binary file not shown.

BIN
sources/avatar/clothing_fan02/FTorso_shortsleeve_RFD_tint1.png (Stored with Git LFS)

Binary file not shown.

BIN
sources/avatar/clothing_fan02/FTorso_shortsleeve_RFD_tint2.png (Stored with Git LFS)

Binary file not shown.

1242
sources/avatar/clothing_fan02/Fan02.json

File diff suppressed because it is too large Load Diff

BIN
sources/avatar/clothing_fan02/Icon_UTorso_ExpEmp.png (Stored with Git LFS)

Binary file not shown.

BIN
sources/avatar/clothing_fan02/Icon_UTorso_Shirt_RFD.png (Stored with Git LFS)

Binary file not shown.

BIN
sources/avatar/clothing_fan02/Icon_UTorso_Shirt_Sameehn.png (Stored with Git LFS)

Binary file not shown.

BIN
sources/avatar/clothing_fan02/MTorso_ExpEmp_base.png (Stored with Git LFS)

Binary file not shown.

BIN
sources/avatar/clothing_fan02/MTorso_ShortSleeve_Sameehn_base.png (Stored with Git LFS)

Binary file not shown.

BIN
sources/avatar/clothing_fan02/MTorso_ShortSleeve_Sameehn_tint1.png (Stored with Git LFS)

Binary file not shown.

BIN
sources/avatar/clothing_fan02/MTorso_Xsleeve_RFD_Base.png (Stored with Git LFS)

Binary file not shown.

BIN
sources/avatar/clothing_fan02/MTorso_Xsleeve_RFD_tint1.png (Stored with Git LFS)

Binary file not shown.

BIN
sources/avatar/clothing_fan02/MTorso_Xsleeve_RFD_tint2.png (Stored with Git LFS)

Binary file not shown.

BIN
sources/avatar/clothing_fan02/UTorso_ExpEmpSleeve_base.png (Stored with Git LFS)

Binary file not shown.

BIN
sources/avatar/clothing_mysterium/FTorso_ShortSleeve_Mysterium2024_Base.png (Stored with Git LFS)

Binary file not shown.

BIN
sources/avatar/clothing_mysterium/FTorso_ShortSleeve_Mysterium2024_Tint1.png (Stored with Git LFS)

Binary file not shown.

BIN
sources/avatar/clothing_mysterium/FTorso_ShortSleeve_Mysterium2024_Tint2.png (Stored with Git LFS)

Binary file not shown.

BIN
sources/avatar/clothing_mysterium/Icon_UTorso_Shirt_Mysterium2024.png (Stored with Git LFS)

Binary file not shown.

BIN
sources/avatar/clothing_mysterium/MTorso_ShortSleeve_Mysterium2024_Base.png (Stored with Git LFS)

Binary file not shown.

BIN
sources/avatar/clothing_mysterium/MTorso_ShortSleeve_Mysterium2024_Tint1.png (Stored with Git LFS)

Binary file not shown.

BIN
sources/avatar/clothing_mysterium/MTorso_ShortSleeve_Mysterium2024_Tint2.png (Stored with Git LFS)

Binary file not shown.

95
sources/avatar/clothing_mysterium/mysterium.json

@ -93,7 +93,11 @@
"Icon_UTorso_Shirt_Mysterium2023.png", "Icon_UTorso_Shirt_Mysterium2023.png",
"MTorso_ShortSleeve_Mysterium2023_Base.png", "MTorso_ShortSleeve_Mysterium2023_Base.png",
"MTorso_ShortSleeve_Mysterium2023_Tint1.png", "MTorso_ShortSleeve_Mysterium2023_Tint1.png",
"MTorso_ShortSleeve_Mysterium2023_Tint2.png" "MTorso_ShortSleeve_Mysterium2023_Tint2.png",
"Icon_UTorso_Shirt_Mysterium2024.png",
"MTorso_ShortSleeve_Mysterium2024_Base.png",
"MTorso_ShortSleeve_Mysterium2024_Tint1.png",
"MTorso_ShortSleeve_Mysterium2024_Tint2.png"
], ],
"clItems": [ "clItems": [
{ {
@ -1258,6 +1262,48 @@
} }
} }
] ]
},
{
"name": "MReward_SSMysterium2024",
"type": "Shirt",
"group": "Male",
"icon": "Icon_UTorso_Shirt_Mysterium2024.png",
"tint1": [0, 0, 0],
"tint2": [1, 1, 1],
"desc": "ColorLabel1=Shirt; ColorLabel2=Back Logo; isLogoFor=MReward_SSMysterium2000; GroupName = Mysterium; nonStandard",
"text": "Mysterium 2024 T-Shirt",
"meshes": [
{
"name": "MHTorso08_SMsh",
"page": "Male01"
},
{
"name": "MMTorso_SMsh",
"page": "Male01"
},
{
"name": "MLTorso_SMsh",
"page": "Male01"
}
],
"elements": [
{
"name": "Chest",
"layers": {
"0": "MTorso_ShortSleeve_Mysterium2024_Base.png",
"8": "MTorso_ShortSleeve_Mysterium2024_Tint1.png",
"9": "MTorso_ShortSleeve_Mysterium2024_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"
}
}
]
} }
] ]
}, },
@ -1354,7 +1400,11 @@
"Icon_UTorso_Shirt_Mysterium2023.png", "Icon_UTorso_Shirt_Mysterium2023.png",
"FTorso_ShortSleeve_Mysterium2023_Base.png", "FTorso_ShortSleeve_Mysterium2023_Base.png",
"FTorso_ShortSleeve_Mysterium2023_Tint1.png", "FTorso_ShortSleeve_Mysterium2023_Tint1.png",
"FTorso_ShortSleeve_Mysterium2023_Tint2.png" "FTorso_ShortSleeve_Mysterium2023_Tint2.png",
"Icon_UTorso_Shirt_Mysterium2024.png",
"FTorso_ShortSleeve_Mysterium2024_Base.png",
"FTorso_ShortSleeve_Mysterium2024_Tint1.png",
"FTorso_ShortSleeve_Mysterium2024_Tint2.png"
], ],
"clItems": [ "clItems": [
{ {
@ -2491,6 +2541,47 @@
} }
} }
] ]
},
{
"name": "FReward_SSMysterium2024",
"type": "Shirt",
"group": "Female",
"icon": "Icon_UTorso_Shirt_Mysterium2024.png",
"tint1": [0, 0, 0],
"tint2": [1, 1, 1],
"desc": "ColorLabel1=Shirt; ColorLabel2=Back Logo; isLogoFor=FReward_SSMysterium2000; GroupName = Mysterium; nonStandard",
"text": "Mysterium 2024 T-Shirt",
"meshes": [
{
"name": "FHTorso12_SMsh",
"page": "Female01"
},
{
"name": "FMTorso12_SMsh",
"page": "Female01"
},
{
"name": "FLTorso12_SMsh",
"page": "Female01"
}
],
"elements": [
{
"name": "Chest",
"layers": {
"0": "FTorso_ShortSleeve_Mysterium2024_Base.png",
"8": "FTorso_ShortSleeve_Mysterium2024_Tint1.png",
"9": "FTorso_ShortSleeve_Mysterium2024_Tint2.png"
}
},
{
"name": "Arm",
"layers": {
"1": "mtorso_shortsleevearm_skin*0#0.hsm",
"8": "fsleeve04t02l1*0#0.hsm"
}
}
]
} }
] ]
} }

Loading…
Cancel
Save