Merge branch 'main' of https://gitea.deprived.dev/Sveskejuice/fgm24

WallColliders
blood fbx fix
2024-02-03 22:32:09 +01:00 · 2024-02-03 22:29:16 +01:00 · 2024-02-03 13:26:04 -08:00
9 changed files with 20653 additions and 3 deletions
--- a/Assets/Resources/Enviroment/Walls.prefab
+++ b/Assets/Resources/Enviroment/Walls.prefab
--- a/Assets/Resources/Enviroment/Walls.prefab.meta
+++ b/Assets/Resources/Enviroment/Walls.prefab.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 4272a1edbb0783e4c9af0d318ea4e861
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Scenes/GameScene
+++ b/Assets/Scenes/GameScene
--- a/Assets/Scripts/Dust.blend1.meta
+++ b/Assets/Scripts/Dust.blend1.meta
@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 8ae14ba256def45b8a6943fc4a194a25
+guid: 0ee23d331f1b2094ca2a3b7a70953ebf
 DefaultImporter:
  externalObjects: {}
  userData: 
--- a/Assets/Scenes/GameScene.unity
+++ b/Assets/Scenes/GameScene.unity
@ -5388,7 +5388,7 @@ MonoBehaviour:
  m_EditorClassIdentifier: 
  numParticles: 1000000
  bloodCompute: {fileID: 7200000, guid: 99867deda8cf464cd87542adcc3c08f2, type: 3}
-  mesh: {fileID: 6466198060863859617, guid: 803eb7ed90ad4b9388c2563597bd6db2, type: 3}
+  mesh: {fileID: 6466198060863859617, guid: 8df0bcbfe7962dd48b16de520cfea3db, type: 3}
  instancedMaterial: {fileID: 2100000, guid: 0d09c46ae354e8c49b2688cc4325b256, type: 2}
  size: 0.05
  scoreMult: 1
--- a/Assets/Scripts/Dust.blend
+++ b/Assets/Scripts/Dust.blend
--- a/Assets/Scripts/Dust.blend1
+++ b/Assets/Scripts/Dust.blend1
--- a/Assets/Scripts/Dust.fbx
+++ b/Assets/Scripts/Dust.fbx
--- a/Assets/Scripts/Dust.blend.meta
+++ b/Assets/Scripts/Dust.blend.meta
@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 803eb7ed90ad4b9388c2563597bd6db2
+guid: 8df0bcbfe7962dd48b16de520cfea3db
 ModelImporter:
  serializedVersion: 22200
  internalIDToNameTable: []
Author	SHA1	Message	Date
kimrdd	5ad484f57d	Merge branch 'main' of https://gitea.deprived.dev/Sveskejuice/fgm24	2024-02-03 22:32:09 +01:00
kimrdd	9b7ddaec94	WallColliders	2024-02-03 22:29:16 +01:00
Sveske Juice	955f098790	blood fbx fix	2024-02-03 13:26:04 -08:00