Skip to content

Commit

Permalink
Merge branch 'Staging'
Browse files Browse the repository at this point in the history
# Conflicts:
#	Loadout/Data/Materials/Custom Additive Axis Aligned Soft Edge Z_2.pbt
#	Loadout/Data/Materials/Custom Basic Material_matte black.pbt
#	Loadout/Data/Materials/Custom Ceramic Tiles Square 01.pbt
#	Loadout/Data/Materials/Custom Emissive Glow Transparent.pbt
#	Loadout/Data/Materials/Custom Fabric Space Insulation 03.pbt
#	Loadout/Data/Materials/Custom Food Citrus 01.pbt
#	Loadout/Data/Materials/Custom Hay 01.pbt
#	Loadout/Data/Materials/Custom Hay 01_1.pbt
#	Loadout/Data/Materials/Custom Leaves from Bush 01.pbt
#	Loadout/Data/Materials/Custom Leaves from Bush 01_1.pbt
#	Loadout/Data/Materials/Custom Leaves from Bush 01_2.pbt
#	Loadout/Data/Materials/Custom Metal Iron Rusted 02.pbt
#	Loadout/Data/Materials/Custom Radar Screen Transparent.pbt
#	Loadout/Data/Materials/Custom Wood Planks.pbt
#	Loadout/Data/Materials/Destiny Fade Glow.pbt
#	Loadout/Data/Materials/Destiny Neon Glow.pbt
#	Loadout/Data/Materials/Dots.pbt
#	Loadout/Data/Materials/EMat2.pbt
#	Loadout/Data/Materials/Melted Additive Axis Aligned Soft Edge Z_1.pbt
#	Loadout/Data/Materials/Melted Metal Basic 01.pbt
#	Loadout/Data/Materials/Opaque Glow Bright.pbt
#	Loadout/Data/Templates/Bat_GraFiXXSkin.pbt
#	Loadout/Data/Templates/Bat_Nail.pbt
#	Loadout/Data/Templates/Buck Cane.pbt
#	Loadout/Data/Templates/Burger HK99.pbt
#	Loadout/Data/Templates/Burger HK_Scope.pbt
#	Loadout/Data/Templates/Burst Pistol Scope GraFiXXSkin.pbt
#	Loadout/Data/Templates/Burst Pistol_GraFiXXSkin.pbt
#	Loadout/Data/Templates/Corn Dog Pistol.pbt
#	Loadout/Data/Templates/Corn Dog Pistol_Scope.pbt
#	Loadout/Data/Templates/Default_Assault_Scope_GraFiXXSkin.pbt
#	Loadout/Data/Templates/Default_Assault_Scope_Leatherbound.pbt
#	Loadout/Data/Templates/Default_LMG_Scope_GraFiXXSkin.pbt
#	Loadout/Data/Templates/Default_Marksman_Scope_GraFIXXSkin.pbt
#	Loadout/Data/Templates/Default_Marksman_Scope_Skin_9.pbt
#	Loadout/Data/Templates/Default_Pan_GraFiXXSkin.pbt
#	Loadout/Data/Templates/Default_SMG_Scope_GraFiXXSkin.pbt
#	Loadout/Data/Templates/Default_Shotgun_Scope_GraFiXXSkin.pbt
#	Loadout/Data/Templates/Default_Sniper_Scope_GraFiXXSkin.pbt
#	Loadout/Data/Templates/Demon HK_Scope.pbt
#	Loadout/Data/Templates/Demon Nemo_Scope_1.pbt
#	Loadout/Data/Templates/Destiny_Skin_Scope.pbt
#	Loadout/Data/Templates/Easter 45.pbt
#	Loadout/Data/Templates/Easter 45_Scope.pbt
#	Loadout/Data/Templates/Easter Bunny Staff.pbt
#	Loadout/Data/Templates/Easter Burst Pistol.pbt
#	Loadout/Data/Templates/Easter Burst Pistol_Scope.pbt
#	Loadout/Data/Templates/Easter HK99.pbt
#	Loadout/Data/Templates/Easter HK_Scope.pbt
#	Loadout/Data/Templates/Easter Mamba.pbt
#	Loadout/Data/Templates/Easter Mamba_Scope.pbt
#	Loadout/Data/Templates/Easter Nemo.pbt
#	Loadout/Data/Templates/Easter Nemo_Scope.pbt
#	Loadout/Data/Templates/Easter Rocket Launcher.pbt
#	Loadout/Data/Templates/Easter Rocket Launcher_Scope.pbt
#	Loadout/Data/Templates/Easter SP99.pbt
#	Loadout/Data/Templates/Easter SP99_Scope.pbt
#	Loadout/Data/Templates/Easter SVAA.pbt
#	Loadout/Data/Templates/Easter SVAA_Scope.pbt
#	Loadout/Data/Templates/Easter Shotgun.pbt
#	Loadout/Data/Templates/Easter Shotgun_Scope.pbt
#	Loadout/Data/Templates/EquipmentHandler.pbt
#	Loadout/Data/Templates/Fish Fillet Nemo.pbt
#	Loadout/Data/Templates/Fish Fillet Nemo_Scope.pbt
#	Loadout/Data/Templates/French Bread.pbt
#	Loadout/Data/Templates/HK99_DestinySkin.pbt
#	Loadout/Data/Templates/HK99_GraFiXXSkin.pbt
#	Loadout/Data/Templates/Hot Dog SVAA.pbt
#	Loadout/Data/Templates/Hot Dog SVAA_Scope.pbt
#	Loadout/Data/Templates/Large Fries Shotgun.pbt
#	Loadout/Data/Templates/Large Fries Shotgun_Scope.pbt
#	Loadout/Data/Templates/Levi Manteo_GraFiXXSkin.pbt
#	Loadout/Data/Templates/Levi Manteo_MeltedSkin.pbt
#	Loadout/Data/Templates/LilRipper_GraFiXXSkin.pbt
#	Loadout/Data/Templates/Mamba_SPR_GraFiXXSkin.pbt
#	Loadout/Data/Templates/Mamba_SPR_MeltedSkin.pbt
#	Loadout/Data/Templates/Melted Burst Scope.pbt
#	Loadout/Data/Templates/Melted_Shotgun_Scope.pbt
#	Loadout/Data/Templates/Melted_Sniper_Scope.pbt
#	Loadout/Data/Templates/Mustard Burst Pistol_Scope.pbt
#	Loadout/Data/Templates/Mustard Gun.pbt
#	Loadout/Data/Templates/Nemo_GraFiXXSkin.pbt
#	Loadout/Data/Templates/PainBow.pbt
#	Loadout/Data/Templates/Pistol Muzzle Flash_GunRange.pbt
#	Loadout/Data/Templates/Pistol Muzzle Flash_Spectator.pbt
#	Loadout/Data/Templates/Pistol Scope GraFiXX Skin.pbt
#	Loadout/Data/Templates/Pistol_MeltedSkin.pbt
#	Loadout/Data/Templates/Proto Submachine Gun Muzzle Flash.pbt
#	Loadout/Data/Templates/SP99_GraFiXXSkin.pbt
#	Loadout/Data/Templates/SVAA_GraFIXXSkin.pbt
#	Loadout/Data/Templates/ShockRock.pbt
#	Loadout/Data/Templates/Shower Brush.pbt
#	Loadout/Data/Templates/Skin_Golden_Bat.pbt
#	Loadout/Data/Templates/Soda Pop Mamba.pbt
#	Loadout/Data/Templates/Soda Pop Mamba_Scope.pbt
#	Loadout/Data/Templates/Spector 45_GraFiXXSkin.pbt
#	Loadout/Data/Templates/St_ Patty's 45.pbt
#	Loadout/Data/Templates/St_ Patty's 45_Scope.pbt
#	Loadout/Data/Templates/St_ Patty's Burst.pbt
#	Loadout/Data/Templates/St_ Patty's Burst_Scope.pbt
#	Loadout/Data/Templates/St_ Patty's HK.pbt
#	Loadout/Data/Templates/St_ Patty's HK_Scope.pbt
#	Loadout/Data/Templates/St_ Patty's Mamba.pbt
#	Loadout/Data/Templates/St_ Patty's Mamba_Scope.pbt
#	Loadout/Data/Templates/St_ Patty's Nemo.pbt
#	Loadout/Data/Templates/St_ Patty's Nemo_Scope.pbt
#	Loadout/Data/Templates/St_ Patty's SP99.pbt
#	Loadout/Data/Templates/St_ Patty's SP99_Scope.pbt
#	Loadout/Data/Templates/St_ Patty's SVAA.pbt
#	Loadout/Data/Templates/St_ Patty's SVAA_Scope.pbt
#	Loadout/Data/Templates/St_ Patty's Shotgun.pbt
#	Loadout/Data/Templates/St_ Patty's Shotgun_Scope.pbt
#	Loadout/Data/Templates/Taco SP99.pbt
#	Loadout/Data/Templates/Taco SP99_Scope.pbt
#	README.md
#	Strike Team/Data/Tree/AssetManifest.pbt
#	Strike Team/Data/Tree/Blake/Tree.pbt
#	Strike Team/Data/Tree/Brent/Tree.pbt
  • Loading branch information
blaking707 committed Mar 18, 2021
2 parents 123c1ce + 82839c7 commit 1bcc6ce
Show file tree
Hide file tree
Showing 3,670 changed files with 1,151,033 additions and 328,146 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
11 changes: 11 additions & 0 deletions .luacheckrc
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,7 @@ stds.core = {
"CoreObject.visibility",
"CoreObject.isCollidable",
"CoreObject.collision",
"CoreObject.cameraCollision",
"CoreObject.isEnabled",
"CoreObject.lifeSpan",
"CoreObject.isStatic",
Expand Down Expand Up @@ -210,6 +211,7 @@ stds.core = {
"CoreObject.GetAttachedToSocketName",
"CoreObject.IsVisibleInHierarchy",
"CoreObject.IsCollidableInHierarchy",
"CoreObject.IsCameraCollidableInHierarchy",
"CoreObject.IsEnabledInHierarchy",
"CoreObject.FindAncestorByName",
"CoreObject.FindChildByName",
Expand Down Expand Up @@ -619,6 +621,7 @@ stds.core = {
"UIButton.SetDisabledColor",
"UIButton.GetFontColor",
"UIButton.SetFontColor",
"UIButton.SetFont",
"UIButton.IsA",
"UIContainer",
"UIContainer.type",
Expand Down Expand Up @@ -673,6 +676,7 @@ stds.core = {
"UIText.GetColor",
"UIText.SetColor",
"UIText.ComputeApproximateSize",
"UIText.SetFont",
"UIText.IsA",
"Vector2",
"Vector2.x",
Expand Down Expand Up @@ -753,6 +757,7 @@ stds.core = {
"WorldText.type",
"WorldText.GetColor",
"WorldText.SetColor",
"WorldText.SetFont",
"WorldText.IsA",
-- Namespaces
"Chat",
Expand Down Expand Up @@ -785,6 +790,12 @@ stds.core = {
"BroadcastEventResultCode.EXCEEDED_SIZE_LIMIT",
"BroadcastEventResultCode.EXCEEDED_RATE_WARNING_LIMIT",
"BroadcastEventResultCode.EXCEEDED_RATE_LIMIT",
"BroadcastMessageResultCode",
"BroadcastMessageResultCode.SUCCESS",
"BroadcastMessageResultCode.FAILURE",
"BroadcastMessageResultCode.EXCEEDED_SIZE_LIMIT",
"BroadcastMessageResultCode.EXCEEDED_RATE_WARNING_LIMIT",
"BroadcastMessageResultCode.EXCEEDED_RATE_LIMIT",
"Collision",
"Collision.INHERIT",
"Collision.FORCE_ON",
Expand Down
3 changes: 3 additions & 0 deletions .vs/ProjectSettings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"CurrentProjectSetting": null
}
Binary file added .vs/slnx.sqlite
Binary file not shown.
2 changes: 1 addition & 1 deletion Loadout/CommunityContent/EaseUI/Scripts/EaseUI.asset.pbt
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: 76
SerializationVersion: 78
DirectlyPublished: true
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ Assets {
PlatformAssetType: 3
TextAsset {
}
SerializationVersion: 76
SerializationVersion: 78
}
5 changes: 4 additions & 1 deletion Loadout/CommunityContent/EaseUI/Templates/EaseUI_bundle.pbt
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@ Assets {
Z: 1
}
}
CameraCollidable {
Value: "mc:ecollisionsetting:inheritfromparent"
}
Folder {
BundleDummy {
ReferencedAssets {
Expand All @@ -40,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: 76
SerializationVersion: 78
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Assets {
Id: 7783635921745398739
Name: "Banana"
PlatformAssetType: 13
SerializationVersion: 76
SerializationVersion: 78
CustomMaterialAsset {
BaseMaterialId: 4399777814431567982
ParameterOverrides {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Assets {
Id: 1722020304934909528
Name: "Belly"
PlatformAssetType: 13
SerializationVersion: 76
SerializationVersion: 78
CustomMaterialAsset {
BaseMaterialId: 4399777814431567982
ParameterOverrides {
Expand Down
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: 76
SerializationVersion: 78
CustomMaterialAsset {
BaseMaterialId: 16935986695289001649
ParameterOverrides {
Expand Down
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: 76
SerializationVersion: 78
CustomMaterialAsset {
BaseMaterialId: 13206135842285396679
ParameterOverrides {
Expand Down
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: 76
SerializationVersion: 78
CustomMaterialAsset {
BaseMaterialId: 5351428073291024820
ParameterOverrides {
Expand Down
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: 76
SerializationVersion: 78
CustomMaterialAsset {
BaseMaterialId: 14128145843334160491
ParameterOverrides {
Expand Down
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: 76
SerializationVersion: 78
CustomMaterialAsset {
BaseMaterialId: 14128145843334160491
ParameterOverrides {
Expand Down
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: 76
SerializationVersion: 78
CustomMaterialAsset {
BaseMaterialId: 6278985560465791740
ParameterOverrides {
Expand Down
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: 76
SerializationVersion: 78
CustomMaterialAsset {
BaseMaterialId: 4632948014714388163
ParameterOverrides {
Expand Down
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: 76
SerializationVersion: 78
CustomMaterialAsset {
BaseMaterialId: 7783051016444679852
ParameterOverrides {
Expand Down
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: 76
SerializationVersion: 78
CustomMaterialAsset {
BaseMaterialId: 132672053610873933
ParameterOverrides {
Expand Down
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: 76
SerializationVersion: 78
CustomMaterialAsset {
BaseMaterialId: 643713811288060970
ParameterOverrides {
Expand Down
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: 76
SerializationVersion: 78
CustomMaterialAsset {
BaseMaterialId: 12782940202352343062
ParameterOverrides {
Expand Down
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: 76
SerializationVersion: 78
CustomMaterialAsset {
BaseMaterialId: 445867743109748230
ParameterOverrides {
Expand Down
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: 76
SerializationVersion: 78
CustomMaterialAsset {
BaseMaterialId: 445867743109748230
ParameterOverrides {
Expand Down
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: 76
SerializationVersion: 78
CustomMaterialAsset {
BaseMaterialId: 6981698627626169233
ParameterOverrides {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Assets {
Id: 18228963767469514389
Name: "Eye"
PlatformAssetType: 13
SerializationVersion: 76
SerializationVersion: 78
CustomMaterialAsset {
BaseMaterialId: 643713811288060970
ParameterOverrides {
Expand Down
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: 76
SerializationVersion: 78
CustomMaterialAsset {
BaseMaterialId: 4399777814431567982
ParameterOverrides {
Expand Down
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: 76
SerializationVersion: 78
CustomMaterialAsset {
BaseMaterialId: 6278985560465791740
ParameterOverrides {
Expand Down
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: 76
SerializationVersion: 78
CustomMaterialAsset {
BaseMaterialId: 14435918643864210506
ParameterOverrides {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Assets {
Id: 3974599256057972256
Name: "Teeth"
PlatformAssetType: 13
SerializationVersion: 76
SerializationVersion: 78
CustomMaterialAsset {
BaseMaterialId: 12537868752084607232
ParameterOverrides {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ Assets {
PlatformAssetType: 3
TextAsset {
}
SerializationVersion: 76
SerializationVersion: 78
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ Assets {
PlatformAssetType: 3
TextAsset {
}
SerializationVersion: 76
SerializationVersion: 78
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ Assets {
PlatformAssetType: 3
TextAsset {
}
SerializationVersion: 76
SerializationVersion: 78
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ Assets {
PlatformAssetType: 3
TextAsset {
}
SerializationVersion: 76
SerializationVersion: 78
}
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@ Assets {
}
}
}
SerializationVersion: 76
SerializationVersion: 78
}
Original file line number Diff line number Diff line change
Expand Up @@ -40,5 +40,5 @@ Assets {
}
}
}
SerializationVersion: 76
SerializationVersion: 78
}
Original file line number Diff line number Diff line change
Expand Up @@ -80,5 +80,5 @@ Assets {
}
}
}
SerializationVersion: 76
SerializationVersion: 78
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ Assets {
PlatformAssetType: 3
TextAsset {
}
SerializationVersion: 76
SerializationVersion: 78
}
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,5 @@ Assets {
}
}
}
SerializationVersion: 76
SerializationVersion: 78
}
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,5 @@ Assets {
}
}
}
SerializationVersion: 76
SerializationVersion: 78
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ Assets {
PlatformAssetType: 3
TextAsset {
}
SerializationVersion: 76
SerializationVersion: 78
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ Assets {
PlatformAssetType: 3
TextAsset {
}
SerializationVersion: 76
SerializationVersion: 78
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ Assets {
PlatformAssetType: 3
TextAsset {
}
SerializationVersion: 76
SerializationVersion: 78
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ Assets {
PlatformAssetType: 3
TextAsset {
}
SerializationVersion: 76
SerializationVersion: 78
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ Assets {
PlatformAssetType: 3
TextAsset {
}
SerializationVersion: 76
SerializationVersion: 78
}

0 comments on commit 1bcc6ce

Please sign in to comment.