Chirr emotes.

Moffein · Dec 28, 2022 · 3499400 · 3499400
1 parent 8b75185
commit 3499400
Show file tree

Hide file tree

Showing 14 changed files with 4,373 additions and 7 deletions.
diff --git a/Starstorm 2/Assets/assetstorm b/Starstorm 2/Assets/assetstorm
diff --git a/Starstorm 2/Starstorm2-Unity/AssetBundles/StandaloneWindows/StandaloneWindows b/Starstorm 2/Starstorm2-Unity/AssetBundles/StandaloneWindows/StandaloneWindows
diff --git a/Starstorm 2/Starstorm2-Unity/AssetBundles/StandaloneWindows/StandaloneWindows.manifest b/Starstorm 2/Starstorm2-Unity/AssetBundles/StandaloneWindows/StandaloneWindows.manifest
@@ -1,5 +1,5 @@
 ManifestFileVersion: 0
-CRC: 2262860340
+CRC: 959184201
 AssetBundleManifest:
   AssetBundleInfos:
     Info_0:

diff --git a/Starstorm 2/Starstorm2-Unity/AssetBundles/StandaloneWindows/assetstorm b/Starstorm 2/Starstorm2-Unity/AssetBundles/StandaloneWindows/assetstorm
diff --git a/Starstorm 2/Starstorm2-Unity/AssetBundles/StandaloneWindows/assetstorm.manifest b/Starstorm 2/Starstorm2-Unity/AssetBundles/StandaloneWindows/assetstorm.manifest
@@ -1,9 +1,9 @@
 ManifestFileVersion: 0
-CRC: 3500648319
+CRC: 3859626801
 Hashes:
   AssetFileHash:
     serializedVersion: 2
-    Hash: a937a24f4fbb85919309c8684aed4e1a
+    Hash: 60cd1e6e82489000cad67e5131740f73
   TypeTreeHash:
     serializedVersion: 2
     Hash: 7aec747c424dad58343d1828cf4a71ef
@@ -97,6 +97,7 @@ Assets:
 - Assets/AssetBundle/Items/MoltenCoin/Molten_Coin_EmissionMask.png
 - Assets/AssetBundle/Cyborg/Animations/Fall.anim
 - Assets/AssetBundle/Items/ShackledLamp/LampItem.png
+- Assets/AssetBundle/Chirr/animChirrEmote.prefab
 - Assets/AssetBundle/Nemmando/Materials/matHitboxPreview.mat
 - Assets/AssetBundle/Nemmando/VFX/Textures/Slash2.tga
 - Assets/AssetBundle/Nemmando/Materials/matNemmandoMGS.mat
@@ -349,6 +350,7 @@ Assets:
 - Assets/AssetBundle/Cyborg/Animations/animCyborgMenu.controller
 - Assets/AssetBundle/Enemies/Wayfarer/mdlWayfarer.prefab
 - Assets/AssetBundle/Items/ErraticGadget/gadgettex.png
+- Assets/AssetBundle/Chirr/Chirr_emoteskeleton.fbx
 - Assets/AssetBundle/Items/MoltenCoin/MoltenCoinDiffuse2.png
 - Assets/AssetBundle/Items/HuntersSigil/HuntersSigil_Icon.png
 - Assets/AssetBundle/Items/ErraticGadget/matErraticGadget.mat

diff --git a/Starstorm 2/Starstorm2-Unity/Assets/AssetBundle/Chirr/Chirr_emoteskeleton.fbx b/Starstorm 2/Starstorm2-Unity/Assets/AssetBundle/Chirr/Chirr_emoteskeleton.fbx