Merge branch 'SP3-2-Physics' into PlayerControllerWIthNewPhysics

scene changes
Fixed auto mass serialisation and colliders not recomputing mass on size change
2023-03-04 21:28:19 +08:00 · 2023-03-04 20:47:39 +08:00 · 2023-03-04 20:28:09 +08:00 · 2023-03-04 19:50:53 +08:00 · 2023-03-04 17:42:47 +08:00 · 2023-03-04 17:33:57 +08:00
693 changed files with 48042 additions and 55557 deletions
--- a/Clips/MD_HomeownerV2Anims.shanimcontainer
+++ b/Clips/MD_HomeownerV2Anims.shanimcontainer
--- a/Clips/MD_HomeownerV2Anims.shanimcontainer.shmeta
+++ b/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
--- a/Clips/MD_RigTest01_SkinningTestAnims.shanimcontainer
+++ b/Clips/MD_RigTest01_SkinningTestAnims.shanimcontainer
--- a/Clips/MD_RigTest01_SkinningTestAnims.shanimcontainer.shmeta
+++ b/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
--- a/Clips/racoonAnims.shanimcontainer
+++ b/Clips/racoonAnims.shanimcontainer
--- a/Clips/racoonAnims.shanimcontainer.shmeta
+++ b/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
--- a/Assets/Application.SHConfig
+++ b/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
--- a/Assets/Audio/Cinematics.bank
+++ b/Assets/Audio/Cinematics.bank
--- a/Assets/Audio/Cinematics.bank.shmeta
+++ b/Assets/Audio/Cinematics.bank.shmeta
@ -1,3 +0,0 @@
-Name: Cinematics
-ID: 197932678
-Type: 11
--- a/Assets/Audio/Master.bank
+++ b/Assets/Audio/Master.bank
--- a/Assets/Audio/Master.bank.shmeta
+++ b/Assets/Audio/Master.bank.shmeta
@ -1,3 +0,0 @@
-Name: Master
-ID: 187131295
-Type: 11
--- a/Assets/Audio/Master.strings.bank
+++ b/Assets/Audio/Master.strings.bank
--- a/Assets/Audio/Master.strings.bank.shmeta
+++ b/Assets/Audio/Master.strings.bank.shmeta
@ -1,3 +0,0 @@
-Name: Master.strings
-ID: 184993030
-Type: 11
--- a/Assets/Audio/Music.bank
+++ b/Assets/Audio/Music.bank
--- a/Assets/Audio/Music.bank.shmeta
+++ b/Assets/Audio/Music.bank.shmeta
@ -1,3 +0,0 @@
-Name: Music
-ID: 187337426
-Type: 11
--- a/Assets/Audio/SFX.bank
+++ b/Assets/Audio/SFX.bank
--- a/Assets/Audio/SFX.bank.shmeta
+++ b/Assets/Audio/SFX.bank.shmeta
@ -1,3 +0,0 @@
-Name: SFX
-ID: 200039123
-Type: 11
--- a/Assets/Audio/UI.bank
+++ b/Assets/Audio/UI.bank
--- a/Assets/Audio/UI.bank.shmeta
+++ b/Assets/Audio/UI.bank.shmeta
@ -1,3 +0,0 @@
-Name: UI
-ID: 185075145
-Type: 11
--- a/Assets/CollisionTags.SHConfig
+++ b/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
--- a/Assets/Materials/AnimatedHomeowner.shmat
+++ b/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}
--- a/Assets/Materials/AnimatedHomeowner.shmat.shmeta
+++ b/Assets/Materials/AnimatedHomeowner.shmat.shmeta
@ -1,3 +0,0 @@
-Name: AnimatedHomeowner
-ID: 121518381
-Type: 7
--- a/Assets/Materials/CutScene/CutScene_04a.shmat
+++ b/Assets/Materials/CutScene/CutScene_04a.shmat
@ -3,6 +3,6 @@
  SubPass: UI
  Properties:
    data.color: {x: 1, y: 1, z: 1, w: 1}
-    data.textureIndex: 59076169
+    data.textureIndex: 51238312
    data.alpha: 1
    data.beta: {x: 1, y: 1, z: 1}
--- a/Assets/Materials/CutScene/CutScene_04b.shmat
+++ b/Assets/Materials/CutScene/CutScene_04b.shmat
@ -3,6 +3,6 @@
  SubPass: UI
  Properties:
    data.color: {x: 1, y: 1, z: 1, w: 1}
-    data.textureIndex: 66572525
+    data.textureIndex: 61471971
    data.alpha: 1
    data.beta: {x: 1, y: 1, z: 1}
--- a/Assets/Materials/CutScene/CutScene_04c.shmat
+++ b/Assets/Materials/CutScene/CutScene_04c.shmat
@ -3,6 +3,6 @@
  SubPass: UI
  Properties:
    data.color: {x: 1, y: 1, z: 1, w: 1}
-    data.textureIndex: 66182834
+    data.textureIndex: 58217538
    data.alpha: 1
    data.beta: {x: 1, y: 1, z: 1}
--- a/Assets/Materials/CutScene/CutScene_05a.shmat
+++ b/Assets/Materials/CutScene/CutScene_05a.shmat
@ -3,6 +3,6 @@
  SubPass: UI
  Properties:
    data.color: {x: 1, y: 1, z: 1, w: 1}
-    data.textureIndex: 58009216
+    data.textureIndex: 61980534
    data.alpha: 1
    data.beta: {x: 1, y: 1, z: 1}
--- a/Assets/Materials/CutScene/CutScene_05b.shmat
+++ b/Assets/Materials/CutScene/CutScene_05b.shmat
@ -3,6 +3,6 @@
  SubPass: UI
  Properties:
    data.color: {x: 1, y: 1, z: 1, w: 1}
-    data.textureIndex: 55022275
+    data.textureIndex: 51561286
    data.alpha: 1
    data.beta: {x: 1, y: 1, z: 1}
--- a/Assets/Materials/UI/UIMat_MainMenu.shmat
+++ b/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}
--- a/Assets/Materials/UIMat_Credits.shmat
+++ b/Assets/Materials/UIMat_Credits.shmat
@ -3,6 +3,6 @@
  SubPass: UI
  Properties:
    data.color: {x: 1, y: 1, z: 1, w: 1}
-    data.textureIndex: 55278388
+    data.textureIndex: 59379300
    data.alpha: 1
    data.beta: {x: 1, y: 1, z: 1}
--- a/Assets/Materials/UIMat_MenuBG.shmat
+++ b/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}
--- a/Assets/Materials/UIMat_MenuBG.shmat.shmeta
+++ b/Assets/Materials/UIMat_MenuBG.shmat.shmeta
@ -1,3 +0,0 @@
-Name: UIMat_MenuBG
-ID: 130823048
-Type: 7
--- a/Assets/Materials/UIMat_SliderBG.shmat
+++ b/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}
--- a/Assets/Materials/UIMat_SliderBG.shmat.shmeta
+++ b/Assets/Materials/UIMat_SliderBG.shmat.shmeta
@ -1,3 +0,0 @@
-Name: UIMat_SliderBG
-ID: 117587364
-Type: 7
--- a/Assets/Materials/UIMat_Slider_BGM.shmat
+++ b/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}
--- a/Assets/Materials/UIMat_Slider_BGM.shmat.shmeta
+++ b/Assets/Materials/UIMat_Slider_BGM.shmat.shmeta
@ -1,3 +0,0 @@
-Name: UIMat_Slider_BGM
-ID: 129354037
-Type: 7
--- a/Assets/Materials/UIMat_Slider_FOV.shmat
+++ b/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}
--- a/Assets/Materials/UIMat_Slider_FOV.shmat.shmeta
+++ b/Assets/Materials/UIMat_Slider_FOV.shmat.shmeta
@ -1,3 +0,0 @@
-Name: UIMat_Slider_FOV
-ID: 117651669
-Type: 7
--- a/Assets/Materials/UIMat_Slider_SFX.shmat
+++ b/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}
--- a/Assets/Materials/UIMat_Slider_SFX.shmat.shmeta
+++ b/Assets/Materials/UIMat_Slider_SFX.shmat.shmeta
@ -1,3 +0,0 @@
-Name: UIMat_Slider_SFX
-ID: 122820018
-Type: 7
--- a/Assets/Materials/UIMat_Slider_Textured.shmat
+++ b/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}
--- a/Assets/Materials/UIMat_Transistion.shmat
+++ b/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}
--- a/Assets/Materials/UIMat_Transistion.shmat.shmeta
+++ b/Assets/Materials/UIMat_Transistion.shmat.shmeta
@ -1,3 +0,0 @@
-Name: UIMat_Transistion
-ID: 132131066
-Type: 7
--- a/Assets/Materials/UI_Result.shmat
+++ b/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}
--- a/Assets/Materials/UI_Result.shmat.shmeta
+++ b/Assets/Materials/UI_Result.shmat.shmeta
@ -1,3 +0,0 @@
-Name: UI_Result
-ID: 130179375
-Type: 7
--- a/Assets/Materials/default_racoon.shmat
+++ b/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}
--- a/Assets/Materials/default_racoon.shmat.shmeta
+++ b/Assets/Materials/default_racoon.shmat.shmeta
@ -1,3 +0,0 @@
-Name: default_racoon
-ID: 125722190
-Type: 7
--- a/Assets/Models/BoneIKTest4.gltf
+++ b/Assets/Models/BoneIKTest4.gltf
--- a/Assets/Models/BoneIKTest4.shmodel
+++ b/Assets/Models/BoneIKTest4.shmodel
--- a/Assets/Models/BoneIKTest4.shmodel.shmeta
+++ b/Assets/Models/BoneIKTest4.shmodel.shmeta
@ -0,0 +1,7 @@
+Name: BoneIKTest4
+ID: 81814706
+Type: 4
+Sub Assets:
+Name: Cube
+ID: 137599708
+Type: 8
--- a/Assets/Models/MD_Birdnest.gltf
+++ b/Assets/Models/MD_Birdnest.gltf
--- a/Assets/Models/MD_Birdnest.shmodel
+++ b/Assets/Models/MD_Birdnest.shmodel
--- a/Assets/Models/MD_Birdnest.shmodel.shmeta
+++ b/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
--- a/Assets/Models/MD_CeilingFan.gltf
+++ b/Assets/Models/MD_CeilingFan.gltf
--- a/Assets/Models/MD_CeilingFan.shmodel
+++ b/Assets/Models/MD_CeilingFan.shmodel
--- a/Assets/Models/MD_CeilingFan.shmodel.shmeta
+++ b/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
--- a/Assets/Models/MD_DarkCorridor.gltf
+++ b/Assets/Models/MD_DarkCorridor.gltf
--- a/Assets/Models/MD_DarkCorridor.shmodel
+++ b/Assets/Models/MD_DarkCorridor.shmodel
--- a/Assets/Models/MD_DarkCorridor.shmodel.shmeta
+++ b/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
--- a/Assets/Models/MD_HomeownerV2.gltf
+++ b/Assets/Models/MD_HomeownerV2.gltf
--- a/Assets/Models/MD_HomeownerV2.shmodel
+++ b/Assets/Models/MD_HomeownerV2.shmodel
--- a/Assets/Models/MD_HomeownerV2.shmodel.shmeta
+++ b/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
--- a/Assets/Models/MD_RigTest01_SkinningTest.gltf
+++ b/Assets/Models/MD_RigTest01_SkinningTest.gltf
--- a/Assets/Models/MD_RigTest01_SkinningTest.shmodel
+++ b/Assets/Models/MD_RigTest01_SkinningTest.shmodel
--- a/Assets/Models/MD_RigTest01_SkinningTest.shmodel.shmeta
+++ b/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
--- a/Assets/Models/MD_RigTest02_HierachyTest1.gltf
+++ b/Assets/Models/MD_RigTest02_HierachyTest1.gltf
--- a/Assets/Models/MD_RigTest02_HierachyTest1.shmodel
+++ b/Assets/Models/MD_RigTest02_HierachyTest1.shmodel
--- a/Assets/Models/MD_RigTest02_HierachyTest1.shmodel.shmeta
+++ b/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
--- a/Assets/Models/MD_RigTest03_HierachyTest2.gltf
+++ b/Assets/Models/MD_RigTest03_HierachyTest2.gltf
--- a/Assets/Models/MD_RigTest03_HierachyTest2.shmodel
+++ b/Assets/Models/MD_RigTest03_HierachyTest2.shmodel
--- a/Assets/Models/MD_RigTest03_HierachyTest2.shmodel.shmeta
+++ b/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
--- a/Assets/Models/MD_RigTest04_BakedIKLegTest.gltf
+++ b/Assets/Models/MD_RigTest04_BakedIKLegTest.gltf
--- a/Assets/Models/MD_RigTest04_BakedIKLegTest.shmodel
+++ b/Assets/Models/MD_RigTest04_BakedIKLegTest.shmodel
--- a/Assets/Models/MD_RigTest04_BakedIKLegTest.shmodel.shmeta
+++ b/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
--- a/Assets/Models/MD_RigTest05_MeshDeformTest.gltf
+++ b/Assets/Models/MD_RigTest05_MeshDeformTest.gltf
--- a/Assets/Models/MD_RigTest05_MeshDeformTest.shmodel
+++ b/Assets/Models/MD_RigTest05_MeshDeformTest.shmodel
--- a/Assets/Models/MD_RigTest05_MeshDeformTest.shmodel.shmeta
+++ b/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
--- a/Assets/Models/MD_RigTest06_Piston.gltf
+++ b/Assets/Models/MD_RigTest06_Piston.gltf
--- a/Assets/Models/MD_RigTest06_Piston.shmodel
+++ b/Assets/Models/MD_RigTest06_Piston.shmodel
--- a/Assets/Models/MD_RigTest06_Piston.shmodel.shmeta
+++ b/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
--- a/Assets/Models/MD_RubbishBinV2.gltf
+++ b/Assets/Models/MD_RubbishBinV2.gltf
--- a/Assets/Models/MD_RubbishBinV2.shmodel
+++ b/Assets/Models/MD_RubbishBinV2.shmodel
--- a/Assets/Models/MD_RubbishBinV2.shmodel.shmeta
+++ b/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
--- a/Assets/Models/MD_ShelvesItems.gltf
+++ b/Assets/Models/MD_ShelvesItems.gltf
--- a/Assets/Models/MD_ShelvesItems.shmodel
+++ b/Assets/Models/MD_ShelvesItems.shmodel
--- a/Assets/Models/MD_ShelvesItems.shmodel.shmeta
+++ b/Assets/Models/MD_ShelvesItems.shmodel.shmeta
@ -1,28 +0,0 @@
-Name: MD_ShelvesItems
-ID: 80837524
-Type: 4
-Sub Assets:
-Name: Cube.026
-ID: 149990626
-Type: 8
-Name: Cube.033
-ID: 148931934
-Type: 8
-Name: Cube.043
-ID: 150010583
-Type: 8
-Name: PottedPlant
-ID: 136851231
-Type: 8
-Name: Cube.140
-ID: 141518062
-Type: 8
-Name: Cube.079
-ID: 139864675
-Type: 8
-Name: Cube.061
-ID: 147649979
-Type: 8
-Name: Cube.062
-ID: 137537688
-Type: 8
--- a/Assets/Models/racoon.shmodel
+++ b/Assets/Models/racoon.shmodel
--- a/Data/Level1_NavData.shnav
+++ b/Data/Level1_NavData.shnav
--- a/Data/Level1_NavData.shnav.shmeta
+++ b/Data/Level1_NavData.shnav.shmeta
@ -1,3 +0,0 @@
-Name: Level1_NavData
-ID: 257298636
-Type: 15
--- a/Data/Level2_AITest_NavData.shnav
+++ b/Data/Level2_AITest_NavData.shnav
--- a/Data/Level2_AITest_NavData.shnav.shmeta
+++ b/Data/Level2_AITest_NavData.shnav.shmeta
@ -1,3 +0,0 @@
-Name: Level2_AITest_NavData
-ID: 254149790
-Type: 15
--- a/Data/Level2_NavData.shnav
+++ b/Data/Level2_NavData.shnav
--- a/Data/Level2_NavData.shnav.shmeta
+++ b/Data/Level2_NavData.shnav.shmeta
@ -1,3 +0,0 @@
-Name: Level2_NavData
-ID: 260674210
-Type: 15
--- a/Data/Level3_NavData.shnav
+++ b/Data/Level3_NavData.shnav
--- a/Data/Level3_NavData.shnav.shmeta
+++ b/Data/Level3_NavData.shnav.shmeta
@ -1,3 +0,0 @@
-Name: Level3_NavData
-ID: 252819653
-Type: 15
--- a/Assets/Scenes/Breakables.shade
+++ b/Assets/Scenes/Breakables.shade
@ -0,0 +1,276 @@
+- EID: 0
+  Name: Main Camera
+  IsActive: true
+  NumberOfChildren: 0
+  Components:
+    Transform Component:
+      Translate: {x: 0, y: 0.472120881, z: 2.53064919}
+      Rotate: {x: 0, y: 0, z: 0}
+      Scale: {x: 1, y: 1, z: 1}
+      IsActive: true
+    Camera Component:
+      Position: {x: 0, y: 0.472120881, z: 2.53064919}
+      Pitch: 0
+      Yaw: 0
+      Roll: 0
+      Width: 1920
+      Height: 1080
+      Near: 0.00999999978
+      Far: 10000
+      Perspective: true
+      IsActive: true
+  Scripts: ~
+- EID: 2
+  Name: Light
+  IsActive: true
+  NumberOfChildren: 0
+  Components:
+    Light Component:
+      Position: {x: 0, y: 0, z: 0}
+      Type: Directional
+      Direction: {x: 0, y: 0, z: 1}
+      Color: {x: 1, y: 1, z: 1, w: 1}
+      Layer: 4294967295
+      Strength: 0
+      IsActive: true
+  Scripts: ~
+- EID: 1
+  Name: Plate
+  IsActive: true
+  NumberOfChildren: 4
+  Components:
+    Transform Component:
+      Translate: {x: 0.00451920554, y: 0.829197884, z: 1.75}
+      Rotate: {x: -0, y: 0, z: -0}
+      Scale: {x: 0.999979734, y: 1, z: 0.999979734}
+      IsActive: true
+    Renderable Component:
+      Mesh: 140964851
+      Material: 126974645
+      IsActive: true
+    RigidBody Component:
+      Type: Dynamic
+      Drag: 0.00999999978
+      Angular Drag: 0.00999999978
+      Use Gravity: true
+      Interpolate: true
+      Sleeping Enabled: true
+      Freeze Position X: false
+      Freeze Position Y: false
+      Freeze Position Z: false
+      Freeze Rotation X: false
+      Freeze Rotation Y: false
+      Freeze Rotation Z: false
+      IsActive: true
+    Collider Component:
+      Colliders:
+        - Is Trigger: false
+          Type: Box
+          Half Extents: {x: 0.200000003, y: 0.100000001, z: 0.200000003}
+          Friction: 0.400000006
+          Bounciness: 0
+          Density: 1
+          Position Offset: {x: 0, y: 0, z: 0}
+          Rotation Offset: {x: 0, y: 0, z: 0}
+      IsActive: true
+  Scripts:
+    - Type: Breakable
+      Enabled: true
+      threshHold: 0
+      force: 1
+- EID: 4
+  Name: Piece1
+  IsActive: true
+  NumberOfChildren: 0
+  Components:
+    Transform Component:
+      Translate: {x: 3.2922253e-07, y: 0, z: -0.0171992779}
+      Rotate: {x: -1.31316483e-07, y: 3.60887498e-09, z: 5.27542454e-11}
+      Scale: {x: 1, y: 1, z: 1}
+      IsActive: true
+    Renderable Component:
+      Mesh: 146557542
+      Material: 124370424
+      IsActive: true
+    RigidBody Component:
+      Type: Dynamic
+      Drag: 0.00999999978
+      Angular Drag: 0.00999999978
+      Use Gravity: true
+      Interpolate: true
+      Sleeping Enabled: true
+      Freeze Position X: false
+      Freeze Position Y: false
+      Freeze Position Z: false
+      Freeze Rotation X: false
+      Freeze Rotation Y: false
+      Freeze Rotation Z: false
+      IsActive: true
+    Collider Component:
+      Colliders:
+        - Is Trigger: false
+          Type: Box
+          Half Extents: {x: 0.100000001, y: 0.0500000007, z: 0.150000006}
+          Friction: 0.400000006
+          Bounciness: 0
+          Density: 1
+          Position Offset: {x: 0, y: 0, z: 0}
+          Rotation Offset: {x: 0, y: 0, z: 0}
+      IsActive: true
+  Scripts: ~
+- EID: 5
+  Name: Piece2
+  IsActive: true
+  NumberOfChildren: 0
+  Components:
+    Transform Component:
+      Translate: {x: 2.47731805e-07, y: 0, z: 0.0325666666}
+      Rotate: {x: 0, y: 0, z: 0}
+      Scale: {x: 1, y: 1, z: 1}
+      IsActive: true
+    Renderable Component:
+      Mesh: 145439064
+      Material: 124370424
+      IsActive: true
+    RigidBody Component:
+      Type: Dynamic
+      Drag: 0.00999999978
+      Angular Drag: 0.00999999978
+      Use Gravity: true
+      Interpolate: true
+      Sleeping Enabled: true
+      Freeze Position X: false
+      Freeze Position Y: false
+      Freeze Position Z: false
+      Freeze Rotation X: false
+      Freeze Rotation Y: false
+      Freeze Rotation Z: false
+      IsActive: true
+    Collider Component:
+      Colliders:
+        - Is Trigger: false
+          Type: Box
+          Half Extents: {x: 0.100000001, y: 0.0500000007, z: 0.200000003}
+          Friction: 0.400000006
+          Bounciness: 0
+          Density: 1
+          Position Offset: {x: 0, y: 0, z: 0}
+          Rotation Offset: {x: 0, y: 0, z: 0}
+      IsActive: true
+  Scripts: ~
+- EID: 6
+  Name: Piece3
+  IsActive: true
+  NumberOfChildren: 0
+  Components:
+    Transform Component:
+      Translate: {x: -0.0502781346, y: 1.18017197e-05, z: 6.97374344e-05}
+      Rotate: {x: 0.021297913, y: 0.00146768149, z: -5.48749846e-08}
+      Scale: {x: 1, y: 1, z: 1}
+      IsActive: true
+    Renderable Component:
+      Mesh: 139411134
+      Material: 124370424
+      IsActive: true
+    RigidBody Component:
+      Type: Dynamic
+      Drag: 0.00999999978
+      Angular Drag: 0.00999999978
+      Use Gravity: true
+      Interpolate: true
+      Sleeping Enabled: true
+      Freeze Position X: false
+      Freeze Position Y: false
+      Freeze Position Z: false
+      Freeze Rotation X: false
+      Freeze Rotation Y: false
+      Freeze Rotation Z: false
+      IsActive: true
+    Collider Component:
+      Colliders:
+        - Is Trigger: false
+          Type: Box
+          Half Extents: {x: 0.100000001, y: 0.0500000007, z: 0.150000006}
+          Friction: 0.400000006
+          Bounciness: 0
+          Density: 1
+          Position Offset: {x: 0, y: 0, z: 0}
+          Rotation Offset: {x: 0, y: 0, z: 0}
+      IsActive: true
+  Scripts: ~
+- EID: 7
+  Name: Piece4
+  IsActive: true
+  NumberOfChildren: 0
+  Components:
+    Transform Component:
+      Translate: {x: 0.0364143178, y: 7.39097595e-06, z: 6.61611557e-05}
+      Rotate: {x: 0, y: 0, z: 0}
+      Scale: {x: 1, y: 1, z: 1}
+      IsActive: true
+    Renderable Component:
+      Mesh: 136742160
+      Material: 124370424
+      IsActive: true
+    RigidBody Component:
+      Type: Dynamic
+      Drag: 0.00999999978
+      Angular Drag: 0.00999999978
+      Use Gravity: true
+      Interpolate: true
+      Sleeping Enabled: true
+      Freeze Position X: false
+      Freeze Position Y: false
+      Freeze Position Z: false
+      Freeze Rotation X: false
+      Freeze Rotation Y: false
+      Freeze Rotation Z: false
+      IsActive: true
+    Collider Component:
+      Colliders:
+        - Is Trigger: false
+          Type: Box
+          Half Extents: {x: 0.100000001, y: 0.0500000007, z: 0.150000006}
+          Friction: 0.400000006
+          Bounciness: 0
+          Density: 1
+          Position Offset: {x: 0, y: 0, z: 0}
+          Rotation Offset: {x: 0, y: 0, z: 0}
+      IsActive: true
+  Scripts: ~
+- EID: 3
+  Name: Ground
+  IsActive: true
+  NumberOfChildren: 0
+  Components:
+    Transform Component:
+      Translate: {x: 0, y: -0.414889663, z: 0}
+      Rotate: {x: -0, y: 0, z: -0}
+      Scale: {x: 5, y: 1, z: 5}
+      IsActive: true
+    RigidBody Component:
+      Type: Static
+      Drag: 0.00999999978
+      Angular Drag: 0.00999999978
+      Use Gravity: true
+      Interpolate: true
+      Sleeping Enabled: true
+      Freeze Position X: false
+      Freeze Position Y: false
+      Freeze Position Z: false
+      Freeze Rotation X: false
+      Freeze Rotation Y: false
+      Freeze Rotation Z: false
+      IsActive: true
+    Collider Component:
+      Colliders:
+        - Is Trigger: false
+          Type: Box
+          Half Extents: {x: 1, y: 1, z: 1}
+          Friction: 0.400000006
+          Bounciness: 0
+          Density: 1
+          Position Offset: {x: 0, y: 0, z: 0}
+          Rotation Offset: {x: 0, y: 0, z: 0}
+      IsActive: true
+  Scripts: ~
--- a/Assets/Scenes/Breakables.shade.shmeta
+++ b/Assets/Scenes/Breakables.shade.shmeta
@ -0,0 +1,3 @@
+Name: Breakables
+ID: 85040588
+Type: 5
--- a/Assets/Scenes/CreditsScene.shade
+++ b/Assets/Scenes/CreditsScene.shade
@ -1,174 +0,0 @@
- NavData: 0
- EID: 0
-  Name: Camera
-  IsActive: true
-  NumberOfChildren: 0
-  Components:
-    Transform Component:
-      Translate: {x: 0, y: 0, z: 0}
-      Rotate: {x: 0, y: 0, z: 0}
-      Scale: {x: 1, y: 1, z: 1}
-      IsActive: true
-    Camera Component:
-      Position: {x: 0, y: 0, z: 0}
-      Pitch: 0
-      Yaw: 0
-      Roll: 0
-      Width: 1920
-      Near: 0.00999999978
-      Far: 10000
-      Perspective: true
-      FOV: 90
-      IsActive: true
-  Scripts: ~
- EID: 46
-  Name: Credits Canvas
-  IsActive: true
-  NumberOfChildren: 3
-  Components:
-    Canvas Component:
-      Canvas Width: 1920
-      Canvas Height: 1080
-      Scale by canvas width: false
-      IsActive: true
-  Scripts: ~
- EID: 47
-  Name: Scrolling Credits
-  IsActive: true
-  NumberOfChildren: 0
-  Components:
-    Transform Component:
-      Translate: {x: 0, y: -3800, z: 1.5}
-      Rotate: {x: 0, y: 0, z: 0}
-      Scale: {x: 1920, y: 8026, z: 1}
-      IsActive: true
-    Renderable Component:
-      Mesh: 141771688
-      Material: 120332672
-      IsActive: true
-    UI Component:
-      Canvas ID: 46
-      Hovered: false
-      Clicked: false
-      IsActive: true
-  Scripts:
-    - Type: SHADE_Scripting.UI.ScrollingCredits
-      Enabled: true
-      endY: 4300
-      duration: 27
-      levelTransition: 619
-    - Type: SHADE_Scripting.UI.TransitToMainMenu
-      Enabled: true
-      timeToTransit: 27
-      sceneToChange: 97158628
- EID: 49
-  Name: Credits Title Text
-  IsActive: false
-  NumberOfChildren: 0
-  Components:
-    Transform Component:
-      Translate: {x: -150, y: 400, z: 0.100000001}
-      Rotate: {x: 0, y: 0, z: 0}
-      Scale: {x: 100, y: 100, z: 1}
-      IsActive: false
-    Text Renderer Component:
-      Text: Credits
-      Font: 174412429
-      Color: {x: 0, y: 0, z: 0, w: 1}
-      Text Size: {x: 1, y: 1, z: 1}
-      IsActive: false
-    UI Component:
-      Canvas ID: 46
-      Hovered: false
-      Clicked: false
-      IsActive: false
-  Scripts: ~
- EID: 55
-  Name: BackGround
-  IsActive: false
-  NumberOfChildren: 0
-  Components:
-    Transform Component:
-      Translate: {x: 0, y: 0, z: 1.5}
-      Rotate: {x: 0, y: 0, z: 0}
-      Scale: {x: 1920, y: 1080, z: 1}
-      IsActive: false
-    Renderable Component:
-      Mesh: 141771688
-      Material: 121834459
-      IsActive: false
-    UI Component:
-      Canvas ID: 46
-      Hovered: false
-      Clicked: false
-      IsActive: false
-  Scripts: ~
- EID: 54
-  Name: TweenManager
-  IsActive: true
-  NumberOfChildren: 0
-  Components: ~
-  Scripts:
-    - Type: TweenManager
-      Enabled: true
- EID: 619
-  Name: LevelTransistionCanvas
-  IsActive: true
-  NumberOfChildren: 2
-  Components:
-    Canvas Component:
-      Canvas Width: 1920
-      Canvas Height: 1080
-      Scale by canvas width: false
-      IsActive: true
-  Scripts:
-    - Type: LevelTransistion
-      Enabled: true
-      logo: 618
-      bg: 617
-      duration: 0.5
-      bgEndPositionX: 3000
-      logoEndPositionX: 3000
-      rotAndScale: false
-      rotationAmt: 360
-      scaleAmt: 631
- EID: 618
-  Name: LevelTransistionLogo
-  IsActive: true
-  NumberOfChildren: 0
-  Components:
-    Transform Component:
-      Translate: {x: 0, y: 0, z: 0.100000001}
-      Rotate: {x: 0, y: 0, z: 0}
-      Scale: {x: 631, y: 631, z: 1}
-      IsActive: true
-    Renderable Component:
-      Mesh: 141771688
-      Material: 126117259
-      IsActive: true
-    UI Component:
-      Canvas ID: 619
-      Hovered: false
-      Clicked: false
-      IsActive: true
-  Scripts: ~
- EID: 617
-  Name: LevelTransistionBG
-  IsActive: true
-  NumberOfChildren: 0
-  Components:
-    Transform Component:
-      Translate: {x: 0, y: 0, z: 0.200000003}
-      Rotate: {x: 0, y: 0, z: 0}
-      Scale: {x: 4000, y: 4000, z: 1}
-      IsActive: true
-    Renderable Component:
-      Mesh: 141771688
-      Material: 132131066
-      IsActive: true
-    UI Component:
-      Canvas ID: 619
-      Hovered: false
-      Clicked: false
-      IsActive: true
-  Scripts: ~
--- a/Assets/Scenes/CreditsScene.shade.shmeta
+++ b/Assets/Scenes/CreditsScene.shade.shmeta
@ -1,3 +0,0 @@
-Name: CreditsScene
-ID: 97376761
-Type: 5
--- a/Assets/Scenes/CutSceneEnd.shade
+++ b/Assets/Scenes/CutSceneEnd.shade
@ -1,4 +1,3 @@
- NavData: 0
 - EID: 1
  Name: Canvas4
  IsActive: true
@ -67,7 +66,7 @@
  NumberOfChildren: 0
  Components:
    Transform Component:
-      Translate: {x: -2000, y: -275, z: 0.300000012}
+      Translate: {x: -1000, y: -275, z: 0.300000012}
      Rotate: {x: 0, y: 0, z: 0}
      Scale: {x: 1848, y: 575, z: 1}
      IsActive: true
@ -153,7 +152,7 @@
  Scripts:
    - Type: CutsceneEnd
      Enabled: true
-      nextScene: 97376761
+      nextScene: 0
      duration: 1
      skipDuration: 0.100000001
      cutscene4Points: 4
@ -162,7 +161,6 @@
      cutscene5Pics: 15
      canvas4: 1
      canvas5: 14
-      levelTransition: 619
 - EID: 4
  Name: CutScene4Points
  IsActive: true
@ -290,7 +288,7 @@
  NumberOfChildren: 0
  Components:
    Transform Component:
-      Translate: {x: 250, y: -500, z: 0.300000012}
+      Translate: {x: 250, y: -500, z: 0.100000001}
      Rotate: {x: 0, y: 0, z: 0}
      Scale: {x: 50, y: 50, z: 50}
      IsActive: true
@ -334,72 +332,3 @@
      Scale: {x: 1, y: 1, z: 1}
      IsActive: true
  Scripts: ~
- EID: 619
-  Name: LevelTransistionCanvas
-  IsActive: true
-  NumberOfChildren: 2
-  Components:
-    Canvas Component:
-      Canvas Width: 1920
-      Canvas Height: 1080
-      Scale by canvas width: false
-      IsActive: true
-  Scripts:
-    - Type: LevelTransistion
-      Enabled: true
-      logo: 618
-      bg: 617
-      duration: 0.5
-      bgEndPositionX: 3000
-      logoEndPositionX: 3000
-      rotAndScale: false
-      rotationAmt: 360
-      scaleAmt: 631
- EID: 618
-  Name: LevelTransistionLogo
-  IsActive: true
-  NumberOfChildren: 0
-  Components:
-    Transform Component:
-      Translate: {x: 0, y: 0, z: 0.100000001}
-      Rotate: {x: 0, y: 0, z: 0}
-      Scale: {x: 631, y: 631, z: 1}
-      IsActive: true
-    Renderable Component:
-      Mesh: 141771688
-      Material: 126117259
-      IsActive: true
-    UI Component:
-      Canvas ID: 619
-      Hovered: false
-      Clicked: false
-      IsActive: true
-  Scripts: ~
- EID: 617
-  Name: LevelTransistionBG
-  IsActive: true
-  NumberOfChildren: 0
-  Components:
-    Transform Component:
-      Translate: {x: 0, y: 0, z: 0.200000003}
-      Rotate: {x: 0, y: 0, z: 0}
-      Scale: {x: 4000, y: 4000, z: 1}
-      IsActive: true
-    Renderable Component:
-      Mesh: 141771688
-      Material: 132131066
-      IsActive: true
-    UI Component:
-      Canvas ID: 619
-      Hovered: false
-      Clicked: false
-      IsActive: true
-  Scripts: ~
- EID: 616
-  Name: TweenManager
-  IsActive: true
-  NumberOfChildren: 0
-  Components: ~
-  Scripts:
-    - Type: TweenManager
-      Enabled: true
--- a/Assets/Scenes/CutSceneIntro.shade
+++ b/Assets/Scenes/CutSceneIntro.shade
@ -1,4 +1,3 @@
- NavData: 0
 - EID: 1
  Name: Canvas1
  IsActive: true
@ -165,7 +164,6 @@
      canvas1: 1
      canvas2: 13
      canvas3: 24
-      levelTransition: 619
 - EID: 4
  Name: CutScene1Points
  IsActive: true
@ -179,7 +177,7 @@
  Components:
    Transform Component:
      Translate: {x: -550, y: 0, z: 0.5}
-      Rotate: {x: 500.5, y: -274.5, z: 0.600000024}
+      Rotate: {x: 0, y: 0, z: 0}
      Scale: {x: 1, y: 1, z: 1}
      IsActive: true
  Scripts: ~
@ -396,7 +394,7 @@
  NumberOfChildren: 0
  Components:
    Transform Component:
-      Translate: {x: -1375, y: 250, z: 0.899999976}
+      Translate: {x: -1375, y: 250, z: 0.5}
      Rotate: {x: 0, y: 0, z: 0}
      Scale: {x: 982, y: 527, z: 1}
      IsActive: true
@ -416,7 +414,7 @@
  NumberOfChildren: 0
  Components:
    Transform Component:
-      Translate: {x: 200, y: 1200, z: 0.800000012}
+      Translate: {x: 200, y: 1200, z: 0.400000006}
      Rotate: {x: 0, y: 0, z: 0}
      Scale: {x: 625, y: 579, z: 1}
      IsActive: true
@ -436,7 +434,7 @@
  NumberOfChildren: 0
  Components:
    Transform Component:
-      Translate: {x: 1700, y: 200, z: 0.699999988}
+      Translate: {x: 1700, y: 200, z: 0.300000012}
      Rotate: {x: 0, y: 0, z: 0}
      Scale: {x: 529, y: 670, z: 1}
      IsActive: true
@ -456,7 +454,7 @@
  NumberOfChildren: 0
  Components:
    Transform Component:
-      Translate: {x: -1600, y: -200, z: 0.899999976}
+      Translate: {x: -1800, y: -200, z: 0.5}
      Rotate: {x: 0, y: 0, z: 0}
      Scale: {x: 1299, y: 575, z: 1}
      IsActive: true
@ -476,7 +474,7 @@
  NumberOfChildren: 0
  Components:
    Transform Component:
-      Translate: {x: 500, y: -1275, z: 0.899999976}
+      Translate: {x: 500, y: -1275, z: 0.5}
      Rotate: {x: 0, y: 0, z: 0}
      Scale: {x: 866, y: 483, z: 1}
      IsActive: true
@ -496,7 +494,7 @@
  NumberOfChildren: 0
  Components:
    Transform Component:
-      Translate: {x: 0, y: 0, z: 0.99000001}
+      Translate: {x: 0, y: 0, z: 0.699999988}
      Rotate: {x: 0, y: 0, z: 0}
      Scale: {x: 1920, y: 1080, z: 1}
      IsActive: true
@ -516,7 +514,7 @@
  NumberOfChildren: 0
  Components:
    Transform Component:
-      Translate: {x: 250, y: -500, z: 0.400000006}
+      Translate: {x: 250, y: -500, z: 0.100000001}
      Rotate: {x: 0, y: 0, z: 0}
      Scale: {x: 50, y: 50, z: 50}
      IsActive: true
@ -544,7 +542,7 @@
  NumberOfChildren: 0
  Components:
    Transform Component:
-      Translate: {x: -375, y: 250, z: 0.899999976}
+      Translate: {x: -375, y: 250, z: 0.5}
      Rotate: {x: 0, y: 0, z: 0}
      Scale: {x: 1, y: 1, z: 1}
      IsActive: true
@ -555,7 +553,7 @@
  NumberOfChildren: 0
  Components:
    Transform Component:
-      Translate: {x: 200, y: 200, z: 0.800000012}
+      Translate: {x: 200, y: 200, z: 0.400000006}
      Rotate: {x: 0, y: 0, z: 0}
      Scale: {x: 1, y: 1, z: 1}
      IsActive: true
@ -566,7 +564,7 @@
  NumberOfChildren: 0
  Components:
    Transform Component:
-      Translate: {x: 700, y: 200, z: 0.699999988}
+      Translate: {x: 700, y: 200, z: 0.300000012}
      Rotate: {x: 0, y: 0, z: 0}
      Scale: {x: 1, y: 1, z: 1}
      IsActive: true
@ -577,7 +575,7 @@
  NumberOfChildren: 0
  Components:
    Transform Component:
-      Translate: {x: -225, y: -200, z: 0.600000024}
+      Translate: {x: -225, y: -200, z: 0.200000003}
      Rotate: {x: 0, y: 0, z: 0}
      Scale: {x: 1, y: 1, z: 1}
      IsActive: true
@ -588,77 +586,8 @@
  NumberOfChildren: 0
  Components:
    Transform Component:
-      Translate: {x: 500, y: -275, z: 0.5}
+      Translate: {x: 500, y: -275, z: 0.100000001}
      Rotate: {x: 0, y: 0, z: 0}
      Scale: {x: 1, y: 1, z: 1}
      IsActive: true
  Scripts: ~
- EID: 619
-  Name: LevelTransistionCanvas
-  IsActive: true
-  NumberOfChildren: 2
-  Components:
-    Canvas Component:
-      Canvas Width: 1920
-      Canvas Height: 1080
-      Scale by canvas width: false
-      IsActive: true
-  Scripts:
-    - Type: LevelTransistion
-      Enabled: true
-      logo: 618
-      bg: 617
-      duration: 0.5
-      bgEndPositionX: 3000
-      logoEndPositionX: 3000
-      rotAndScale: false
-      rotationAmt: 360
-      scaleAmt: 631
- EID: 618
-  Name: LevelTransistionLogo
-  IsActive: true
-  NumberOfChildren: 0
-  Components:
-    Transform Component:
-      Translate: {x: 0, y: 0, z: 0.100000001}
-      Rotate: {x: 0, y: 0, z: 0}
-      Scale: {x: 631, y: 631, z: 1}
-      IsActive: true
-    Renderable Component:
-      Mesh: 141771688
-      Material: 126117259
-      IsActive: true
-    UI Component:
-      Canvas ID: 619
-      Hovered: false
-      Clicked: false
-      IsActive: true
-  Scripts: ~
- EID: 617
-  Name: LevelTransistionBG
-  IsActive: true
-  NumberOfChildren: 0
-  Components:
-    Transform Component:
-      Translate: {x: 0, y: 0, z: 0.200000003}
-      Rotate: {x: 0, y: 0, z: 0}
-      Scale: {x: 4000, y: 4000, z: 1}
-      IsActive: true
-    Renderable Component:
-      Mesh: 141771688
-      Material: 132131066
-      IsActive: true
-    UI Component:
-      Canvas ID: 619
-      Hovered: false
-      Clicked: false
-      IsActive: true
-  Scripts: ~
- EID: 616
-  Name: TweenManager
-  IsActive: true
-  NumberOfChildren: 0
-  Components: ~
-  Scripts:
-    - Type: TweenManager
-      Enabled: true
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Glence	799cac0924	Merge branch 'SP3-2-Physics' into PlayerControllerWIthNewPhysics	2023-03-04 21:28:19 +08:00
Glence	7ad0ca6183	scene changes	2023-03-04 20:47:39 +08:00
Diren D Bharwani	02b21f2694	Fixed auto mass serialisation and colliders not recomputing mass on size change	2023-03-04 20:28:09 +08:00
Diren D Bharwani	9b2c5a1804	Added math helpers for checking if a number is infinity or invalid	2023-03-04 19:50:53 +08:00
Diren D Bharwani	5a2401bec2	Reverted tolerances for ConvexVSConvex	2023-03-04 17:42:47 +08:00
Glence	90dc4ef750	Merge branch 'SP3-2-Physics' into PlayerControllerWIthNewPhysics	2023-03-04 17:33:57 +08:00
Diren D Bharwani	20fe6c4877	Fixed incorrect distances for AABB raycast results	2023-03-04 17:32:05 +08:00
Diren D Bharwani	e293094b6d	Another attempt to fix invalid error bias	2023-03-04 17:31:50 +08:00
Glence	ab4a874bb1	Merge remote-tracking branch 'origin/PlayerControllerWIthNewPhysics' into PlayerControllerWIthNewPhysics	2023-03-04 17:30:14 +08:00
Brandon Mak	4530c96ffc	Merge remote-tracking branch 'origin/PlayerControllerWIthNewPhysics' into PlayerControllerWIthNewPhysics	2023-03-04 15:49:51 +08:00
Brandon Mak	c7c8e0046d	Updated shiny effect shader	2023-03-04 15:49:41 +08:00
Glence	59eb2d767f	Merge branch 'SP3-2-Physics' into PlayerControllerWIthNewPhysics	2023-03-04 15:20:20 +08:00
Diren D Bharwani	ea97dc3b50	Fixed Managed vector3 forward & back	2023-03-04 15:17:29 +08:00
Glence	9a7ad8ee17	Merge branch 'SP3-2-Physics' into PlayerControllerWIthNewPhysics	2023-03-04 15:17:20 +08:00
Diren D Bharwani	b9c9f30ce0	Fixed heap corruption caused by out-of-sync collider active states	2023-03-04 14:31:07 +08:00
Diren D Bharwani	a691d2ff28	Fixed imgui error caused by merge	2023-03-04 13:50:10 +08:00
Diren D Bharwani	15bbf6892f	Merge branch 'main' into SP3-2-Physics	2023-03-04 13:44:53 +08:00
Diren D Bharwani	e2d96569b5	Collision shapes will only be added to broadphase if the collider is active	2023-03-04 13:30:29 +08:00
Glence	c6f49e45e4	Merge branch 'main' into PlayerControllerWIthNewPhysics	2023-03-04 13:16:38 +08:00
Sri Sham Haran	51d4b26e3d	off mouse centering on pause/stop	2023-03-04 10:37:01 +08:00
Sri Sham Haran	fff2c73994	editor set mouse visibility	2023-03-04 10:27:51 +08:00
Brandon Mak	90dd589430	No editor rendering fix	2023-03-04 01:20:27 +08:00
Glence	ac99eb9ba0	Merge branch 'SP3-2-Physics' into PlayerControllerWIthNewPhysics	2023-03-04 00:27:38 +08:00
Glence	0c4f154c24	Merge remote-tracking branch 'origin/PlayerControllerWIthNewPhysics' into PlayerControllerWIthNewPhysics	2023-03-04 00:05:34 +08:00
Glence	daad6699f1	fix raycast for player	2023-03-04 00:05:26 +08:00
Xiao Qi	c4d2091b99	Camera system update for line without editor	2023-03-03 23:54:16 +08:00
Diren D Bharwani	6200e3f533	Fixed bug where collision & trigger state were called more than once	2023-03-03 23:47:39 +08:00
SHAM-DP	98d0021b32	sheditor ifdef checks	2023-03-03 21:57:20 +08:00
Diren D Bharwani	446db133d2	Fixed errors with publish build in physics debug draw	2023-03-03 21:39:59 +08:00
Diren D Bharwani	8743ae52fa	Fixed errors with publish build in physics debug draw	2023-03-03 21:38:57 +08:00
Diren D Bharwani	337ec82dbf	Removed random commented code	2023-03-03 21:19:49 +08:00
Glence	ebf2bb8d85	Merge branch 'main' into PlayerControllerWIthNewPhysics	2023-03-03 21:19:00 +08:00
Diren D Bharwani	5cb4c54757	I didn't commit the change oop	2023-03-03 21:16:44 +08:00
Diren D Bharwani	5c38244ce4	Changed casts	2023-03-03 21:16:18 +08:00
Diren D Bharwani	74c32457a8	Merge branch 'main' into Revert-Revert-SHPhysics	2023-03-03 21:07:59 +08:00
Diren D Bharwani	5c803105b2	Merge branch 'SP3-2-Physics' into Revert-Revert-SHPhysics	2023-03-03 20:10:11 +08:00
Diren D Bharwani	4047699544	Auto stash before revert of "Revert "Implemented a custom physics engine""	2023-03-03 20:09:59 +08:00
XiaoQiDigipen	fc0d7ad052	Revert "Revert "Implemented a custom physics engine"" This reverts commit `3ff2e6bb92`.	2023-03-03 20:09:46 +08:00
Glence	cae0061ac3	minor fix	2023-03-03 18:10:03 +08:00
Glence	eba64126f8	Merge branch 'SP3-2-Physics' into PlayerControllerWIthNewPhysics	2023-03-03 17:48:41 +08:00
Diren D Bharwani	c9ebe73a7a	Merge branch 'main' into SHPhysics	2023-03-03 16:46:54 +08:00
Diren D Bharwani	a80089c893	pointless changes	2023-03-03 15:55:43 +08:00
Diren D Bharwani	87d2afbd9a	Merge branch 'main' into SHPhysics	2023-03-02 16:26:49 +08:00
Diren D Bharwani	e43089e6ff	Fixed bug where box colliders weren't being deleted on scene destroy	2023-03-02 13:52:54 +08:00
Diren D Bharwani	991912f7b4	Fixed bug where reduced manifold would attempt to grab an invalid contact	2023-03-02 07:09:14 +08:00
Diren D Bharwani	199a9aa025	Fixed infinite positional error bias	2023-03-02 07:08:45 +08:00
Diren D Bharwani	f4b7618fc2	Fixed incorrect edge preference for convex vs convex	2023-03-02 05:23:08 +08:00
Diren D Bharwani	aebf1fc6ec	Reverted some changes	2023-03-02 04:27:07 +08:00
Diren D Bharwani	f7ea42f58e	Reverted computing point offsets in local space Force is applied in world space, so contact points should also be in world space	2023-03-02 04:15:40 +08:00
Diren D Bharwani	2d2c8a1b20	Fixed clipping of contacts against reference planes	2023-03-01 21:30:00 +08:00
Diren D Bharwani	0e3a84a06b	Fixed bug where changing scenes would not clear drawn colliders	2023-03-01 04:34:20 +08:00
Diren D Bharwani	3a454953ce	Solved Sphere VS Convex in local space	2023-03-01 04:34:06 +08:00
Diren D Bharwani	f620ef226e	Fixed bug where AABB nodes were not updating on collider size change	2023-03-01 02:58:05 +08:00
Diren D Bharwani	abdf614083	Contacts are solved locally on each body	2023-03-01 00:55:44 +08:00
Diren D Bharwani	9d8d1ee19d	Fixed edge-edge contact points being beyond the range of the edge	2023-01-26 01:17:14 +08:00
Diren D Bharwani	6b9a64233e	Ray direction are automatically normalised	2023-01-26 01:11:57 +08:00