add node merge

Assets/Animation Clips/MD_HomeownerV2Anims.shanimcontainer.shmeta

@@ -1,67 +0,0 @@
-Name: MD_HomeownerV2Anims
-ID: 217758867
-Type: 12
-Sub Assets:
-Name: Full
-ID: 227644717
-Type: 13
-Name: TPose
-ID: 221337587
-Type: 13
-Name: Idle
-ID: 224442713
-Type: 13
-Name: Walk
-ID: 229189609
-Type: 13
-Name: Alerted_by_Racoon
-ID: 227890696
-Type: 13
-Name: Alerted_Idle
-ID: 234046577
-Type: 13
-Name: Alerted_Run
-ID: 230172366
-Type: 13
-Name: Interact
-ID: 220088098
-Type: 13
-Name: Distracted
-ID: 229108322
-Type: 13
-Name: StunStartFront
-ID: 223296233
-Type: 13
-Name: StunLoopFront
-ID: 230129276
-Type: 13
-Name: StunEndFront
-ID: 224141761
-Type: 13
-Name: StunStartBack
-ID: 218547923
-Type: 13
-Name: StunLoopBack
-ID: 219563559
-Type: 13
-Name: StunEndBack
-ID: 226668516
-Type: 13
-Name: React_to_Broken_Stuff
-ID: 228323560
-Type: 13
-Name: Pickup_Item
-ID: 227002263
-Type: 13
-Name: Return_Item
-ID: 222655168
-Type: 13
-Name: Attack_Windup
-ID: 223078653
-Type: 13
-Name: Attack_Hold
-ID: 228250554
-Type: 13
-Name: Attack_Sequence
-ID: 226129627
-Type: 13

Assets/Animation Clips/MD_RigTest01_SkinningTestAnims.shanimcontainer.shmeta

@@ -1,7 +0,0 @@
-Name: MD_RigTest01_SkinningTestAnims
-ID: 203438081
-Type: 12
-Sub Assets:
-Name: Full
-ID: 231416496
-Type: 13

Assets/Animation Clips/racoonAnims.shanimcontainer.shmeta

@@ -1,40 +0,0 @@
-Name: racoonAnims
-ID: 201804216
-Type: 12
-Sub Assets:
-Name: TPose
-ID: 231493784
-Type: 13
-Name: Idle
-ID: 227450439
-Type: 13
-Name: Run
-ID: 229125027
-Type: 13
-Name: Pickup
-ID: 219605278
-Type: 13
-Name: Carry_Idle
-ID: 231128260
-Type: 13
-Name: Carry_Run
-ID: 227671720
-Type: 13
-Name: Throw
-ID: 223399345
-Type: 13
-Name: Sprint
-ID: 228149757
-Type: 13
-Name: Jump_Start
-ID: 223009573
-Type: 13
-Name: Jump_Loop
-ID: 230974023
-Type: 13
-Name: Jump_End
-ID: 228134756
-Type: 13
-Name: Full
-ID: 223752972
-Type: 13

Assets/Application.SHConfig

@@ -1,4 +1,4 @@
 Start in Fullscreen: false
-Starting Scene ID: 97158628
+Starting Scene ID: 86098106
 Window Size: {x: 1920, y: 1080}
 Window Title: SHADE Engine

Assets/Audio/Cinematics.bank.shmeta

@@ -1,3 +0,0 @@
-Name: Cinematics
-ID: 197932678
-Type: 11

Assets/Audio/Master.bank.shmeta

@@ -1,3 +0,0 @@
-Name: Master
-ID: 187131295
-Type: 11

Assets/Audio/Master.strings.bank.shmeta

@@ -1,3 +0,0 @@
-Name: Master.strings
-ID: 184993030
-Type: 11

Assets/Audio/Music.bank.shmeta

@@ -1,3 +0,0 @@
-Name: Music
-ID: 187337426
-Type: 11

Assets/Audio/SFX.bank.shmeta

@@ -1,3 +0,0 @@
-Name: SFX
-ID: 200039123
-Type: 11

Assets/Audio/UI.bank.shmeta

@@ -1,3 +0,0 @@
-Name: UI
-ID: 185075145
-Type: 11

Assets/CollisionTags.SHConfig

@@ -1,14 +1,14 @@
-0 StaticObject 1101000000000000
-1 Furniture 1101000000000000
+0 StaticObject 1110000000000000
+1 Player 1100000000000000
 2 Food 1000000000000000
 3 Breakable 1100000000000000
 4 ScoringWallCollider 0110000000000000
 5 Homeowner 1100000000000000
 6 Camera 0010000000000000
-7 StaticWithCameraCollision 1111000000000000
-8 Floor 1100000000000000
-9 Navigation 0001000000000000
-10 Player 1100000000000000
+7 8 0000000000000000
+8 9 0000000000000000
+9 10 0000000000000000
+10 11 0000000000000000
 11 12 0000000000000000
 12 13 0000000000000000
 13 14 0000000000000000

Assets/Materials/AnimatedHomeowner.shmat

@@ -1,8 +0,0 @@
-- VertexShader: 47911992
-  FragmentShader: 46377769
-  SubPass: G-Buffer Write
-  Properties:
-    data.color: {x: 1, y: 1, z: 1, w: 1}
-    data.textureIndex: 54758364
-    data.alpha: 0
-    data.beta: {x: 1, y: 1, z: 1}

Assets/Materials/AnimatedHomeowner.shmat.shmeta

@@ -1,3 +0,0 @@
-Name: AnimatedHomeowner
-ID: 121518381
-Type: 7

Assets/Materials/CutScene/CutScene_04a.shmat

@@ -1,8 +0,0 @@
-- VertexShader: 46580970
-  FragmentShader: 35983630
-  SubPass: UI
-  Properties:
-    data.color: {x: 1, y: 1, z: 1, w: 1}
-    data.textureIndex: 59076169
-    data.alpha: 1
-    data.beta: {x: 1, y: 1, z: 1}

Assets/Materials/CutScene/CutScene_04a.shmat.shmeta

@@ -1,3 +0,0 @@
-Name: CutScene_04a
-ID: 130935405
-Type: 7

Assets/Materials/CutScene/CutScene_04b.shmat

@@ -1,8 +0,0 @@
-- VertexShader: 46580970
-  FragmentShader: 35983630
-  SubPass: UI
-  Properties:
-    data.color: {x: 1, y: 1, z: 1, w: 1}
-    data.textureIndex: 66572525
-    data.alpha: 1
-    data.beta: {x: 1, y: 1, z: 1}

Assets/Materials/CutScene/CutScene_04b.shmat.shmeta

@@ -1,3 +0,0 @@
-Name: CutScene_04b
-ID: 122461516
-Type: 7

Assets/Materials/CutScene/CutScene_04c.shmat

@@ -1,8 +0,0 @@
-- VertexShader: 46580970
-  FragmentShader: 35983630
-  SubPass: UI
-  Properties:
-    data.color: {x: 1, y: 1, z: 1, w: 1}
-    data.textureIndex: 66182834
-    data.alpha: 1
-    data.beta: {x: 1, y: 1, z: 1}

Assets/Materials/CutScene/CutScene_04c.shmat.shmeta

@@ -1,3 +0,0 @@
-Name: CutScene_04c
-ID: 124507864
-Type: 7

Assets/Materials/CutScene/CutScene_05a.shmat

@@ -1,8 +0,0 @@
-- VertexShader: 46580970
-  FragmentShader: 35983630
-  SubPass: UI
-  Properties:
-    data.color: {x: 1, y: 1, z: 1, w: 1}
-    data.textureIndex: 58009216
-    data.alpha: 1
-    data.beta: {x: 1, y: 1, z: 1}

Assets/Materials/CutScene/CutScene_05a.shmat.shmeta

@@ -1,3 +0,0 @@
-Name: CutScene_05a
-ID: 118069989
-Type: 7

Assets/Materials/CutScene/CutScene_05b.shmat

@@ -1,8 +0,0 @@
-- VertexShader: 46580970
-  FragmentShader: 35983630
-  SubPass: UI
-  Properties:
-    data.color: {x: 1, y: 1, z: 1, w: 1}
-    data.textureIndex: 55022275
-    data.alpha: 1
-    data.beta: {x: 1, y: 1, z: 1}

Assets/Materials/CutScene/CutScene_05b.shmat.shmeta

@@ -1,3 +0,0 @@
-Name: CutScene_05b
-ID: 132945336
-Type: 7

Assets/Materials/UI/Instruction_01.shmat

@@ -3,6 +3,6 @@
   SubPass: UI
   Properties:
     data.color: {x: 1, y: 1, z: 1, w: 1}
-    data.textureIndex: 52834559
+    data.textureIndex: 62200943
     data.alpha: 1
     data.beta: {x: 1, y: 1, z: 1}

Assets/Materials/UI/Instruction_02.shmat

@@ -3,6 +3,6 @@
   SubPass: UI
   Properties:
     data.color: {x: 1, y: 1, z: 1, w: 1}
-    data.textureIndex: 60762613
+    data.textureIndex: 53303669
     data.alpha: 1
     data.beta: {x: 1, y: 1, z: 1}

Assets/Materials/UI/Instruction_03.shmat

@@ -3,6 +3,6 @@
   SubPass: UI
   Properties:
     data.color: {x: 1, y: 1, z: 1, w: 1}
-    data.textureIndex: 53309226
+    data.textureIndex: 61780097
     data.alpha: 1
     data.beta: {x: 1, y: 1, z: 1}

Assets/Materials/UI/Instruction_04.shmat

@@ -3,6 +3,6 @@
   SubPass: UI
   Properties:
     data.color: {x: 1, y: 1, z: 1, w: 1}
-    data.textureIndex: 63002526
+    data.textureIndex: 59178524
     data.alpha: 1
     data.beta: {x: 1, y: 1, z: 1}

Assets/Materials/UI/UIMat_Black.shmat

@@ -1,6 +1,6 @@
 - VertexShader: 46580970
   FragmentShader: 50110174
-  SubPass: UI Translucent
+  SubPass: UI
   Properties:
     data.color: {x: 0, y: 0, z: 0, w: 1}
     data.textureIndex: 0

Assets/Materials/UI/UIMat_MainMenu.shmat

@@ -3,6 +3,6 @@
   SubPass: UI
   Properties:
     data.color: {x: 1, y: 1, z: 1, w: 1}
-    data.textureIndex: 56004904
+    data.textureIndex: 54429632
     data.alpha: 1
     data.beta: {x: 1, y: 1, z: 1}

Assets/Materials/UIMat_Credits.shmat

@@ -1,8 +0,0 @@
-- VertexShader: 46580970
-  FragmentShader: 35983630
-  SubPass: UI
-  Properties:
-    data.color: {x: 1, y: 1, z: 1, w: 1}
-    data.textureIndex: 55278388
-    data.alpha: 1
-    data.beta: {x: 1, y: 1, z: 1}

Assets/Materials/UIMat_Credits.shmat.shmeta

@@ -1,3 +0,0 @@
-Name: UIMat_Credits
-ID: 120332672
-Type: 7

Assets/Materials/UIMat_MenuBG.shmat

@@ -1,8 +0,0 @@
-- VertexShader: 46580970
-  FragmentShader: 35983630
-  SubPass: UI
-  Properties:
-    data.color: {x: 1, y: 1, z: 1, w: 1}
-    data.textureIndex: 60776650
-    data.alpha: 1
-    data.beta: {x: 1, y: 1, z: 1}

Assets/Materials/UIMat_MenuBG.shmat.shmeta

@@ -1,3 +0,0 @@
-Name: UIMat_MenuBG
-ID: 130823048
-Type: 7

Assets/Materials/UIMat_Multiplier.shmat

@@ -1,8 +0,0 @@
-- VertexShader: 46580970
-  FragmentShader: 35983630
-  SubPass: UI
-  Properties:
-    data.color: {x: 1, y: 1, z: 1, w: 1}
-    data.textureIndex: 52018575
-    data.alpha: 1
-    data.beta: {x: 1, y: 1, z: 1}

Assets/Materials/UIMat_Multiplier.shmat.shmeta

@@ -1,3 +0,0 @@
-Name: UIMat_Multiplier
-ID: 133784677
-Type: 7

Assets/Materials/UIMat_Score.shmat

@@ -1,8 +0,0 @@
-- VertexShader: 46580970
-  FragmentShader: 35983630
-  SubPass: UI
-  Properties:
-    data.color: {x: 1, y: 1, z: 1, w: 1}
-    data.textureIndex: 54238246
-    data.alpha: 1
-    data.beta: {x: 1, y: 1, z: 1}

Assets/Materials/UIMat_Score.shmat.shmeta

@@ -1,3 +0,0 @@
-Name: UIMat_Score
-ID: 127527215
-Type: 7

Assets/Materials/UIMat_SliderBG.shmat

@@ -1,8 +0,0 @@
-- VertexShader: 46580970
-  FragmentShader: 35983630
-  SubPass: UI
-  Properties:
-    data.color: {x: 1, y: 1, z: 1, w: 1}
-    data.textureIndex: 64816540
-    data.alpha: 1
-    data.beta: {x: 1, y: 1, z: 1}

Assets/Materials/UIMat_SliderBG.shmat.shmeta

@@ -1,3 +0,0 @@
-Name: UIMat_SliderBG
-ID: 117587364
-Type: 7

Assets/Materials/UIMat_Slider_BGM.shmat

@@ -1,11 +0,0 @@
-- VertexShader: 46580970
-  FragmentShader: 43211183
-  SubPass: UI
-  Properties:
-    data.color: {x: 1, y: 1, z: 1, w: 1}
-    data.textureIndex: 50370514
-    data.alpha: 1
-    data.beta: {x: 1, y: 1, z: 1}
-    data.sliderThreshold: 1
-    data.sliderStartColor: {x: 0.36500001, y: 0.783999979, z: 0.878000021, w: 1}
-    data.sliderBarColor: {x: 1, y: 1, z: 1, w: 1}

Assets/Materials/UIMat_Slider_BGM.shmat.shmeta

@@ -1,3 +0,0 @@
-Name: UIMat_Slider_BGM
-ID: 129354037
-Type: 7

Assets/Materials/UIMat_Slider_FOV.shmat

@@ -1,11 +0,0 @@
-- VertexShader: 46580970
-  FragmentShader: 43211183
-  SubPass: UI
-  Properties:
-    data.color: {x: 1, y: 1, z: 1, w: 1}
-    data.textureIndex: 50370514
-    data.alpha: 1
-    data.beta: {x: 1, y: 1, z: 1}
-    data.sliderThreshold: 1
-    data.sliderStartColor: {x: 0.624000013, y: 0.211999997, z: 0.949000001, w: 1}
-    data.sliderBarColor: {x: 1, y: 1, z: 1, w: 1}

Assets/Materials/UIMat_Slider_FOV.shmat.shmeta

@@ -1,3 +0,0 @@
-Name: UIMat_Slider_FOV
-ID: 117651669
-Type: 7

Assets/Materials/UIMat_Slider_SFX.shmat

@@ -1,11 +0,0 @@
-- VertexShader: 46580970
-  FragmentShader: 43211183
-  SubPass: UI
-  Properties:
-    data.color: {x: 1, y: 1, z: 1, w: 1}
-    data.textureIndex: 50370514
-    data.alpha: 1
-    data.beta: {x: 1, y: 1, z: 1}
-    data.sliderThreshold: 1
-    data.sliderStartColor: {x: 0.949000001, y: 0.689999998, z: 0.211999997, w: 1}
-    data.sliderBarColor: {x: 1, y: 1, z: 1, w: 1}

Assets/Materials/UIMat_Slider_SFX.shmat.shmeta

@@ -1,3 +0,0 @@
-Name: UIMat_Slider_SFX
-ID: 122820018
-Type: 7

Assets/Materials/UIMat_Slider_Textured.shmat

@@ -3,9 +3,7 @@
   SubPass: UI
   Properties:
     data.color: {x: 1, y: 1, z: 1, w: 1}
-    data.textureIndex: 50370514
+    data.textureIndex: 51995224
     data.alpha: 1
     data.beta: {x: 1, y: 1, z: 1}
-    data.sliderThreshold: 1
-    data.sliderStartColor: {x: 0.254901886, y: 0.321500003, z: 0.909799993, w: 1}
-    data.sliderBarColor: {x: 1, y: 1, z: 1, w: 1}
+    data.sliderThreshold: 1

Assets/Materials/UIMat_Timer.shmat

@@ -1,8 +0,0 @@
-- VertexShader: 46580970
-  FragmentShader: 35983630
-  SubPass: UI
-  Properties:
-    data.color: {x: 1, y: 1, z: 1, w: 1}
-    data.textureIndex: 60494030
-    data.alpha: 1
-    data.beta: {x: 1, y: 1, z: 1}

Assets/Materials/UIMat_Timer.shmat.shmeta

@@ -1,3 +0,0 @@
-Name: UIMat_Timer
-ID: 126220632
-Type: 7

Assets/Materials/UIMat_Transistion.shmat

@@ -1,8 +0,0 @@
-- VertexShader: 46580970
-  FragmentShader: 40208610
-  SubPass: UI
-  Properties:
-    data.color: {x: 1, y: 1, z: 1, w: 1}
-    data.textureIndex: 50770098
-    data.alpha: 1
-    data.beta: {x: 1, y: 1, z: 1}

Assets/Materials/UIMat_Transistion.shmat.shmeta

@@ -1,3 +0,0 @@
-Name: UIMat_Transistion
-ID: 132131066
-Type: 7

Assets/Materials/UI_Result.shmat

@@ -1,8 +0,0 @@
-- VertexShader: 46580970
-  FragmentShader: 35983630
-  SubPass: UI
-  Properties:
-    data.color: {x: 1, y: 1, z: 1, w: 1}
-    data.textureIndex: 55490391
-    data.alpha: 1
-    data.beta: {x: 1, y: 1, z: 1}

Assets/Materials/UI_Result.shmat.shmeta

@@ -1,3 +0,0 @@
-Name: UI_Result
-ID: 130179375
-Type: 7

Assets/Materials/default_racoon.shmat

@@ -1,8 +0,0 @@
-- VertexShader: 39210065
-  FragmentShader: 46377769
-  SubPass: G-Buffer Write
-  Properties:
-    data.color: {x: 1, y: 1, z: 1, w: 1}
-    data.textureIndex: 64651793
-    data.alpha: 0
-    data.beta: {x: 1, y: 1, z: 1}

Assets/Materials/default_racoon.shmat.shmeta

@@ -1,3 +0,0 @@
-Name: default_racoon
-ID: 125722190
-Type: 7

Assets/Models/BoneIKTest4.shmodel.shmeta

@@ -0,0 +1,7 @@
+Name: BoneIKTest4
+ID: 81814706
+Type: 4
+Sub Assets:
+Name: Cube
+ID: 137599708
+Type: 8

Assets/Models/MD_Birdnest.shmodel.shmeta

@@ -1,7 +0,0 @@
-Name: MD_Birdnest
-ID: 75951674
-Type: 4
-Sub Assets:
-Name: Birdnest
-ID: 148793058
-Type: 8

Assets/Models/MD_CeilingFan.shmodel.shmeta

@@ -1,7 +0,0 @@
-Name: MD_CeilingFan
-ID: 73062062
-Type: 4
-Sub Assets:
-Name: Sphere.005
-ID: 135521751
-Type: 8

Assets/Models/MD_DarkCorridor.shmodel.shmeta

@@ -1,7 +0,0 @@
-Name: MD_DarkCorridor
-ID: 83188665
-Type: 4
-Sub Assets:
-Name: CorridorPiece
-ID: 136332265
-Type: 8

Assets/Models/MD_HomeownerV2.shmodel.shmeta

@@ -1,7 +0,0 @@
-Name: MD_HomeownerV2
-ID: 76586906
-Type: 4
-Sub Assets:
-Name: Cube
-ID: 148542784
-Type: 8

Assets/Models/MD_RigTest01_SkinningTest.shmodel.shmeta

@@ -0,0 +1,7 @@
+Name: MD_RigTest01_SkinningTest
+ID: 72178939
+Type: 4
+Sub Assets:
+Name: Cube
+ID: 141097368
+Type: 8

Assets/Models/MD_RigTest02_HierachyTest1.shmodel.shmeta

@@ -0,0 +1,7 @@
+Name: MD_RigTest02_HierachyTest1
+ID: 80500944
+Type: 4
+Sub Assets:
+Name: Cube.001
+ID: 135102560
+Type: 8

Assets/Models/MD_RigTest03_HierachyTest2.shmodel.shmeta

@@ -0,0 +1,7 @@
+Name: MD_RigTest03_HierachyTest2
+ID: 72063399
+Type: 4
+Sub Assets:
+Name: Cube.001
+ID: 140361184
+Type: 8

Assets/Models/MD_RigTest04_BakedIKLegTest.shmodel.shmeta

@@ -0,0 +1,7 @@
+Name: MD_RigTest04_BakedIKLegTest
+ID: 80728853
+Type: 4
+Sub Assets:
+Name: Cube
+ID: 149723808
+Type: 8

Assets/Models/MD_RigTest05_MeshDeformTest.shmodel.shmeta

@@ -0,0 +1,7 @@
+Name: MD_RigTest05_MeshDeformTest
+ID: 82124728
+Type: 4
+Sub Assets:
+Name: Sphere
+ID: 138773466
+Type: 8

Assets/Models/MD_RigTest06_Piston.shmodel.shmeta

@@ -0,0 +1,7 @@
+Name: MD_RigTest06_Piston
+ID: 76715962
+Type: 4
+Sub Assets:
+Name: Cube
+ID: 134911040
+Type: 8

Assets/Models/MD_RubbishBinV2.shmodel.shmeta

@@ -1,7 +0,0 @@
-Name: MD_RubbishBinV2
-ID: 71821168
-Type: 4
-Sub Assets:
-Name: RubbishBin02
-ID: 141767450
-Type: 8