Skip to content

Commit

Permalink
Merge branch 'Staging'
Browse files Browse the repository at this point in the history
  • Loading branch information
@Rolok
Rolok committed Apr 6, 2021
2 parents e4c98b0 + 5fbc036 commit 5b1e6a3
Show file tree
Hide file tree
Showing 4,783 changed files with 2,175,741 additions and 2,623,908 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
2 changes: 1 addition & 1 deletion Loadout/CommunityContent/EaseUI/Scripts/EaseUI.asset.pbt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@ Assets {
Marketplace {
Description: "EaseUI is a utility that allows for both simple and advanced UI animations! Full customizability to you, the creator!\r\n\r\nRead the script for more information."
}
SerializationVersion: 78
SerializationVersion: 81
DirectlyPublished: true
}
2 changes: 1 addition & 1 deletion Loadout/CommunityContent/EaseUI/Scripts/EasingEquations.asset.pbt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ Assets {
PlatformAssetType: 3
TextAsset {
}
SerializationVersion: 78
SerializationVersion: 81
}
2 changes: 1 addition & 1 deletion Loadout/CommunityContent/EaseUI/Templates/EaseUI_bundle.pbt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,5 +43,5 @@ Assets {
Version: "1.10.0"
Description: "EaseUI is a utility that allows for both simple and advanced UI animations! Full customizability to you, the creator!\r\n\r\nRead the script for more information."
}
SerializationVersion: 78
SerializationVersion: 81
}
2 changes: 1 addition & 1 deletion Loadout/CommunityContent/META Cosmetic Store/Materials/Banana.pbt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Assets {
Id: 7783635921745398739
Name: "Banana"
PlatformAssetType: 13
SerializationVersion: 78
SerializationVersion: 81
CustomMaterialAsset {
BaseMaterialId: 4399777814431567982
ParameterOverrides {
Expand Down
2 changes: 1 addition & 1 deletion Loadout/CommunityContent/META Cosmetic Store/Materials/Belly.pbt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Assets {
Id: 1722020304934909528
Name: "Belly"
PlatformAssetType: 13
SerializationVersion: 78
SerializationVersion: 81
CustomMaterialAsset {
BaseMaterialId: 4399777814431567982
ParameterOverrides {
Expand Down
2 changes: 1 addition & 1 deletion ...nityContent/META Cosmetic Store/Materials/Custom Base Material from Curtains Straight.pbt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Assets {
Id: 15876642778562215914
Name: "Custom Base Material from Curtains Straight"
PlatformAssetType: 13
SerializationVersion: 78
SerializationVersion: 81
CustomMaterialAsset {
BaseMaterialId: 16935986695289001649
ParameterOverrides {
Expand Down
2 changes: 1 addition & 1 deletion ...out/CommunityContent/META Cosmetic Store/Materials/Custom Emissive Glow Transparent_1.pbt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Assets {
Id: 5688267647354306428
Name: "Custom Emissive Glow Transparent_1"
PlatformAssetType: 13
SerializationVersion: 78
SerializationVersion: 81
CustomMaterialAsset {
BaseMaterialId: 13206135842285396679
ParameterOverrides {
Expand Down
2 changes: 1 addition & 1 deletion Loadout/CommunityContent/META Cosmetic Store/Materials/Custom Emissive Glow.pbt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Assets {
Id: 17100543768545550232
Name: "Custom Emissive Glow"
PlatformAssetType: 13
SerializationVersion: 78
SerializationVersion: 81
CustomMaterialAsset {
BaseMaterialId: 5351428073291024820
ParameterOverrides {
Expand Down
2 changes: 1 addition & 1 deletion Loadout/CommunityContent/META Cosmetic Store/Materials/Custom Food Fruit 01.pbt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Assets {
Id: 9581600225183942494
Name: "Custom Food Fruit 01"
PlatformAssetType: 13
SerializationVersion: 78
SerializationVersion: 81
CustomMaterialAsset {
BaseMaterialId: 14128145843334160491
ParameterOverrides {
Expand Down
2 changes: 1 addition & 1 deletion Loadout/CommunityContent/META Cosmetic Store/Materials/Custom Food Fruit 01_1.pbt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Assets {
Id: 2751194053934808083
Name: "Custom Food Fruit 01"
PlatformAssetType: 13
SerializationVersion: 78
SerializationVersion: 81
CustomMaterialAsset {
BaseMaterialId: 14128145843334160491
ParameterOverrides {
Expand Down
2 changes: 1 addition & 1 deletion Loadout/CommunityContent/META Cosmetic Store/Materials/Custom Food Strawberry 01.pbt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Assets {
Id: 16601547243139457500
Name: "Custom Food Strawberry 01"
PlatformAssetType: 13
SerializationVersion: 78
SerializationVersion: 81
CustomMaterialAsset {
BaseMaterialId: 6278985560465791740
ParameterOverrides {
Expand Down
2 changes: 1 addition & 1 deletion Loadout/CommunityContent/META Cosmetic Store/Materials/Custom Leaves from Bush 01.pbt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Assets {
Id: 1951304554822312938
Name: "Custom Leaves from Bush 01"
PlatformAssetType: 13
SerializationVersion: 78
SerializationVersion: 81
CustomMaterialAsset {
BaseMaterialId: 4632948014714388163
ParameterOverrides {
Expand Down
2 changes: 1 addition & 1 deletion Loadout/CommunityContent/META Cosmetic Store/Materials/Custom Pineapple.pbt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Assets {
Id: 3794692595264009628
Name: "Custom Pineapple"
PlatformAssetType: 13
SerializationVersion: 78
SerializationVersion: 81
CustomMaterialAsset {
BaseMaterialId: 7783051016444679852
ParameterOverrides {
Expand Down
2 changes: 1 addition & 1 deletion Loadout/CommunityContent/META Cosmetic Store/Materials/Custom Plastic Matte.pbt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Assets {
Id: 8405812014756430410
Name: "Custom Plastic Matte"
PlatformAssetType: 13
SerializationVersion: 78
SerializationVersion: 81
CustomMaterialAsset {
BaseMaterialId: 132672053610873933
ParameterOverrides {
Expand Down
2 changes: 1 addition & 1 deletion Loadout/CommunityContent/META Cosmetic Store/Materials/Custom Plastic Shiny_1.pbt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Assets {
Id: 2997141209528142122
Name: "Custom Plastic Shiny_1"
PlatformAssetType: 13
SerializationVersion: 78
SerializationVersion: 81
CustomMaterialAsset {
BaseMaterialId: 643713811288060970
ParameterOverrides {
Expand Down
2 changes: 1 addition & 1 deletion Loadout/CommunityContent/META Cosmetic Store/Materials/Custom Wallpaper Chevron 01.pbt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Assets {
Id: 17084071588398133651
Name: "Custom Wallpaper Chevron 01"
PlatformAssetType: 13
SerializationVersion: 78
SerializationVersion: 81
CustomMaterialAsset {
BaseMaterialId: 12782940202352343062
ParameterOverrides {
Expand Down
2 changes: 1 addition & 1 deletion Loadout/CommunityContent/META Cosmetic Store/Materials/Custom Wallpaper Polka Dot 01.pbt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Assets {
Id: 12895965915146500700
Name: "Custom Wallpaper Polka Dot 01"
PlatformAssetType: 13
SerializationVersion: 78
SerializationVersion: 81
CustomMaterialAsset {
BaseMaterialId: 445867743109748230
ParameterOverrides {
Expand Down
2 changes: 1 addition & 1 deletion Loadout/CommunityContent/META Cosmetic Store/Materials/Custom Wallpaper Polka Dot 01_1.pbt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Assets {
Id: 13633415728774562040
Name: "Custom Wallpaper Polka Dot 01_1"
PlatformAssetType: 13
SerializationVersion: 78
SerializationVersion: 81
CustomMaterialAsset {
BaseMaterialId: 445867743109748230
ParameterOverrides {
Expand Down
2 changes: 1 addition & 1 deletion Loadout/CommunityContent/META Cosmetic Store/Materials/Essence_Pearl_Mat.pbt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Assets {
Id: 2527241970037245040
Name: "Essence_Pearl_Mat"
PlatformAssetType: 13
SerializationVersion: 78
SerializationVersion: 81
CustomMaterialAsset {
BaseMaterialId: 6981698627626169233
ParameterOverrides {
Expand Down
2 changes: 1 addition & 1 deletion Loadout/CommunityContent/META Cosmetic Store/Materials/Eye.pbt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Assets {
Id: 18228963767469514389
Name: "Eye"
PlatformAssetType: 13
SerializationVersion: 78
SerializationVersion: 81
CustomMaterialAsset {
BaseMaterialId: 643713811288060970
ParameterOverrides {
Expand Down
2 changes: 1 addition & 1 deletion Loadout/CommunityContent/META Cosmetic Store/Materials/FROG GGREEN.pbt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Assets {
Id: 13985418031297956916
Name: "FROG GGREEN"
PlatformAssetType: 13
SerializationVersion: 78
SerializationVersion: 81
CustomMaterialAsset {
BaseMaterialId: 4399777814431567982
ParameterOverrides {
Expand Down
2 changes: 1 addition & 1 deletion Loadout/CommunityContent/META Cosmetic Store/Materials/Mouth Tongue.pbt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Assets {
Id: 11723021503723497540
Name: "Mouth Tongue"
PlatformAssetType: 13
SerializationVersion: 78
SerializationVersion: 81
CustomMaterialAsset {
BaseMaterialId: 6278985560465791740
ParameterOverrides {
Expand Down
2 changes: 1 addition & 1 deletion Loadout/CommunityContent/META Cosmetic Store/Materials/Store BG.pbt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Assets {
Id: 10715446121918744315
Name: "Store BG"
PlatformAssetType: 13
SerializationVersion: 78
SerializationVersion: 81
CustomMaterialAsset {
BaseMaterialId: 14435918643864210506
ParameterOverrides {
Expand Down
2 changes: 1 addition & 1 deletion Loadout/CommunityContent/META Cosmetic Store/Materials/Teeth.pbt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Assets {
Id: 3974599256057972256
Name: "Teeth"
PlatformAssetType: 13
SerializationVersion: 78
SerializationVersion: 81
CustomMaterialAsset {
BaseMaterialId: 12537868752084607232
ParameterOverrides {
Expand Down
2 changes: 1 addition & 1 deletion Loadout/CommunityContent/META Cosmetic Store/Scripts/BaseUserInterfaceUpdater.asset.pbt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ Assets {
PlatformAssetType: 3
TextAsset {
}
SerializationVersion: 78
SerializationVersion: 81
}
2 changes: 1 addition & 1 deletion Loadout/CommunityContent/META Cosmetic Store/Scripts/Deque.asset.pbt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ Assets {
PlatformAssetType: 3
TextAsset {
}
SerializationVersion: 78
SerializationVersion: 81
}
2 changes: 1 addition & 1 deletion Loadout/CommunityContent/META Cosmetic Store/Scripts/FilterButtonClient.asset.pbt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ Assets {
PlatformAssetType: 3
TextAsset {
}
SerializationVersion: 78
SerializationVersion: 81
}
2 changes: 1 addition & 1 deletion Loadout/CommunityContent/META Cosmetic Store/Scripts/GenderSwitcherButtonClient.asset.pbt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ Assets {
PlatformAssetType: 3
TextAsset {
}
SerializationVersion: 78
SerializationVersion: 81
}
2 changes: 1 addition & 1 deletion Loadout/CommunityContent/META Cosmetic Store/Scripts/ReliableEvents.asset.pbt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@ Assets {
}
}
}
SerializationVersion: 78
SerializationVersion: 81
}
2 changes: 1 addition & 1 deletion Loadout/CommunityContent/META Cosmetic Store/Scripts/STORE_CurrencyDef.asset.pbt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,5 +40,5 @@ Assets {
}
}
}
SerializationVersion: 78
SerializationVersion: 81
}
2 changes: 1 addition & 1 deletion Loadout/CommunityContent/META Cosmetic Store/Scripts/STORE_ItemInfo.asset.pbt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,5 +80,5 @@ Assets {
}
}
}
SerializationVersion: 78
SerializationVersion: 81
}
2 changes: 1 addition & 1 deletion Loadout/CommunityContent/META Cosmetic Store/Scripts/STORE_Logic_README.asset.pbt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ Assets {
PlatformAssetType: 3
TextAsset {
}
SerializationVersion: 78
SerializationVersion: 81
}
2 changes: 1 addition & 1 deletion Loadout/CommunityContent/META Cosmetic Store/Scripts/STORE_TagDef.asset.pbt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,5 @@ Assets {
}
}
}
SerializationVersion: 78
SerializationVersion: 81
}
2 changes: 1 addition & 1 deletion Loadout/CommunityContent/META Cosmetic Store/Scripts/STORE_TypeDef.asset.pbt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,5 @@ Assets {
}
}
}
SerializationVersion: 78
SerializationVersion: 81
}
2 changes: 1 addition & 1 deletion Loadout/CommunityContent/META Cosmetic Store/Scripts/ShopCloseButtonClient.asset.pbt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ Assets {
PlatformAssetType: 3
TextAsset {
}
SerializationVersion: 78
SerializationVersion: 81
}
2 changes: 1 addition & 1 deletion Loadout/CommunityContent/META Cosmetic Store/Scripts/StoreConsole.asset.pbt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ Assets {
PlatformAssetType: 3
TextAsset {
}
SerializationVersion: 78
SerializationVersion: 81
}
2 changes: 1 addition & 1 deletion Loadout/CommunityContent/META Cosmetic Store/Scripts/StoreScript.asset.pbt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ Assets {
PlatformAssetType: 3
TextAsset {
}
SerializationVersion: 78
SerializationVersion: 81
}
2 changes: 1 addition & 1 deletion Loadout/CommunityContent/META Cosmetic Store/Scripts/StoreScriptClient.asset.pbt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ Assets {
PlatformAssetType: 3
TextAsset {
}
SerializationVersion: 78
SerializationVersion: 81
}
2 changes: 1 addition & 1 deletion Loadout/CommunityContent/META Cosmetic Store/Scripts/_CosmeticStore.asset.pbt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ Assets {
PlatformAssetType: 3
TextAsset {
}
SerializationVersion: 78
SerializationVersion: 81
}
2 changes: 1 addition & 1 deletion Loadout/CommunityContent/META Cosmetic Store/Templates/META Cosmetic Store_bundle.pbt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,5 +43,5 @@ Assets {
Version: "1.2.0"
Description: "This is a store component that allows creators to to sell cosmetic items in their game using currency tracked with player resource. The store is designed to make it easy \r\nfor creators to add and remove cosmetic items in the store and includes features such as type and rarity filters. This version of the store is also compatable with the PERKS\r\ncomponents featured in the Perks Examples Community Project.\r\n\r\nThis set comes with:\r\n 1) STORE_CosmeticStore\r\n 2) STORE_StoreContents\r\n 3) STORE_CurrenciesDefinitions \r\n 3) STORE_TagDefinitions\r\n 4) STORE_TypeDefinitions\r\n 5) STORE_SampleTrigger\r\n 6) STORE_SampleUI\r\n\r\nMake sure to read the META_CosmeticStore_README file for setup and configuration instructions\r\n\r\nMessage @Buckmonster or @estlogic in Discord with feedback or feature requests - https://discord.com/invite/core-creators\r\n\r\nThanks to:\r\n\342\200\242 @Montoli for scripting\r\n\342\200\242 @Mucusinator for first pass on UI\r\n\342\200\242 @KonzZwodrei for second pass on UI\r\n\342\200\242 @Buckmoster for implementing KonzZwodrei\'s UI and being META lead\r\n\342\200\242 @standardcombo for review and documentation template\r\n\342\200\242 @Aggripina for thumbnail design\r\n\r\nChangelog.\r\nv1.0.1\r\n* Cosmetic item purchases are now verified server-side.\r\n* Added support for multiple currencies.\r\n\r\nv1.0.2\r\n* Fixed a bug where selecting the filter buttons caused an error.\r\n* Added an additional function to handle server-side broadcasts (for Perks Examples)."
}
SerializationVersion: 78
SerializationVersion: 81
}

0 comments on commit 5b1e6a3

Please sign in to comment.