-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
# 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
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.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
{ | ||
"CurrentProjectSetting": null | ||
} |
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -4,5 +4,5 @@ Assets { | |
PlatformAssetType: 3 | ||
TextAsset { | ||
} | ||
SerializationVersion: 76 | ||
SerializationVersion: 78 | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -4,5 +4,5 @@ Assets { | |
PlatformAssetType: 3 | ||
TextAsset { | ||
} | ||
SerializationVersion: 76 | ||
SerializationVersion: 78 | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -4,5 +4,5 @@ Assets { | |
PlatformAssetType: 3 | ||
TextAsset { | ||
} | ||
SerializationVersion: 76 | ||
SerializationVersion: 78 | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -4,5 +4,5 @@ Assets { | |
PlatformAssetType: 3 | ||
TextAsset { | ||
} | ||
SerializationVersion: 76 | ||
SerializationVersion: 78 | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -4,5 +4,5 @@ Assets { | |
PlatformAssetType: 3 | ||
TextAsset { | ||
} | ||
SerializationVersion: 76 | ||
SerializationVersion: 78 | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -12,5 +12,5 @@ Assets { | |
} | ||
} | ||
} | ||
SerializationVersion: 76 | ||
SerializationVersion: 78 | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -40,5 +40,5 @@ Assets { | |
} | ||
} | ||
} | ||
SerializationVersion: 76 | ||
SerializationVersion: 78 | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -80,5 +80,5 @@ Assets { | |
} | ||
} | ||
} | ||
SerializationVersion: 76 | ||
SerializationVersion: 78 | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -4,5 +4,5 @@ Assets { | |
PlatformAssetType: 3 | ||
TextAsset { | ||
} | ||
SerializationVersion: 76 | ||
SerializationVersion: 78 | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -32,5 +32,5 @@ Assets { | |
} | ||
} | ||
} | ||
SerializationVersion: 76 | ||
SerializationVersion: 78 | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -24,5 +24,5 @@ Assets { | |
} | ||
} | ||
} | ||
SerializationVersion: 76 | ||
SerializationVersion: 78 | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -4,5 +4,5 @@ Assets { | |
PlatformAssetType: 3 | ||
TextAsset { | ||
} | ||
SerializationVersion: 76 | ||
SerializationVersion: 78 | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -4,5 +4,5 @@ Assets { | |
PlatformAssetType: 3 | ||
TextAsset { | ||
} | ||
SerializationVersion: 76 | ||
SerializationVersion: 78 | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -4,5 +4,5 @@ Assets { | |
PlatformAssetType: 3 | ||
TextAsset { | ||
} | ||
SerializationVersion: 76 | ||
SerializationVersion: 78 | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -4,5 +4,5 @@ Assets { | |
PlatformAssetType: 3 | ||
TextAsset { | ||
} | ||
SerializationVersion: 76 | ||
SerializationVersion: 78 | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -4,5 +4,5 @@ Assets { | |
PlatformAssetType: 3 | ||
TextAsset { | ||
} | ||
SerializationVersion: 76 | ||
SerializationVersion: 78 | ||
} |
Oops, something went wrong.