Compare commits

..

No commits in common. "main" and "revert-316-SHPhysics" have entirely different histories.

1047 changed files with 38279 additions and 97803 deletions

3
.gitignore vendored
View File

@ -363,7 +363,8 @@ MigrationBackup/
*.filters *.filters
Assets/Editor/Layouts/UserLayout.ini
JSON/Schemas/Catalog/ JSON/Schemas/Catalog/
Assets/Editor/Editor.SHConfig Assets/Editor/Editor.SHConfig
Assets/Editor/Layouts/UserLayout.ini

View File

@ -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

View File

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

View File

@ -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

View File

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

Binary file not shown.

View File

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

Binary file not shown.

View File

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

Binary file not shown.

View File

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

Binary file not shown.

View File

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

Binary file not shown.

View File

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

Binary file not shown.

View File

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

View File

@ -1,96 +1 @@
7
Controller Look Horizontal
0 0
0
5
0.2
5
0
0
0
1
18
0
Controller Look Vertical
0
0
5
0.2
5
0
0
0
1
19
0
Horizontal
0
0
5
0.2
5
1
2
39
68
2
37
65
2
3
16
1
2
Jump
0
0
1000
0.2
1000
0
1
32
0
1
10
0
Mouse Look Horizontal
1
0
1
0.2
1
0
0
0
0
0
Mouse Look Vertical
2
0
1
0.2
1
0
0
0
0
0
Vertical
0
0
5
0.2
5
1
2
38
87
2
40
83
2
0
17
1
1

View File

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

View File

@ -0,0 +1,4 @@
Start Maximized: true
Working Scene ID: 97161771
Window Size: {x: 1920, y: 1080}
Style: 0

Binary file not shown.

View File

@ -1,3 +0,0 @@
Name: Dangrek-Regular
ID: 174412429
Type: 10

Binary file not shown.

View File

@ -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: 58303057
data.alpha: 0
data.beta: {x: 1, y: 1, z: 1}

View File

@ -1,3 +0,0 @@
Name: AnimatedBag
ID: 117923942
Type: 7

View File

@ -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}

View File

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

View File

@ -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: 64651793
data.alpha: 0
data.beta: {x: 1, y: 1, z: 1}

View File

@ -1,3 +0,0 @@
Name: AnimatedRaccoon
ID: 128805346
Type: 7

View File

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

View File

@ -1,3 +0,0 @@
Name: CutScene_01a
ID: 120028153
Type: 7

View File

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

View File

@ -1,3 +0,0 @@
Name: CutScene_01b
ID: 130271494
Type: 7

View File

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

View File

@ -1,3 +0,0 @@
Name: CutScene_01c
ID: 118957569
Type: 7

View File

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

View File

@ -1,3 +0,0 @@
Name: CutScene_02a
ID: 120947645
Type: 7

View File

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

View File

@ -1,3 +0,0 @@
Name: CutScene_02b
ID: 129923341
Type: 7

View File

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

View File

@ -1,3 +0,0 @@
Name: CutScene_02c
ID: 133191310
Type: 7

View File

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

View File

@ -1,3 +0,0 @@
Name: CutScene_03a
ID: 129620984
Type: 7

View File

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

View File

@ -1,3 +0,0 @@
Name: CutScene_03b
ID: 119078830
Type: 7

View File

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

View File

@ -1,3 +0,0 @@
Name: CutScene_03c
ID: 133041695
Type: 7

View File

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

View File

@ -1,3 +0,0 @@
Name: CutScene_03d
ID: 117751129
Type: 7

View File

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

View File

@ -1,3 +0,0 @@
Name: CutScene_03e
ID: 131504451
Type: 7

View File

@ -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}

View File

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

View File

@ -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}

View File

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

View File

@ -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}

View File

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

View File

@ -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}

View File

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

View File

@ -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}

View File

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

View File

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

View File

@ -1,3 +0,0 @@
Name: CutScene_bg
ID: 117531460
Type: 7

View File

@ -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: 50821588
data.alpha: 1
data.beta: {x: 1, y: 1, z: 1}

View File

@ -1,3 +0,0 @@
Name: MT_HousePaletteLevel3
ID: 126223465
Type: 7

View File

@ -1,8 +0,0 @@
- VertexShader: 37048829
FragmentShader: 45685219
SubPass: G-Buffer Write With VFX
Properties:
data.color: {x: 1, y: 1, z: 1, w: 1}
data.textureIndex: 57342922
data.alpha: 0
data.beta: {x: 1, y: 1, z: 1}

View File

@ -1,3 +0,0 @@
Name: ShinyHightlight
ID: 122370915
Type: 7

View File

@ -1,8 +0,0 @@
- VertexShader: 38847805
FragmentShader: 42962441
SubPass: Object VFX Subpass No Depth
Properties:
data.color: {x: 1, y: 1, z: 1, w: 1}
data.textureIndex: 0
data.alpha: 0
data.beta: {x: 1, y: 1, z: 1}

View File

@ -1,3 +0,0 @@
Name: Silhouette
ID: 126391182
Type: 7

View File

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

View File

@ -1,3 +0,0 @@
Name: GameIcon
ID: 126117259
Type: 7

View File

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

View File

@ -1,3 +0,0 @@
Name: Instruction_01
ID: 124926341
Type: 7

View File

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

View File

@ -1,3 +0,0 @@
Name: Instruction_02
ID: 128721520
Type: 7

View File

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

View File

@ -1,3 +0,0 @@
Name: Instruction_03
ID: 124482180
Type: 7

View File

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

View File

@ -1,3 +0,0 @@
Name: Instruction_04
ID: 129768803
Type: 7

View File

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

View File

@ -1,3 +0,0 @@
Name: Steal_Food
ID: 127459277
Type: 7

View File

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

View File

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

View File

@ -1,3 +0,0 @@
Name: UIMat_Black
ID: 120016136
Type: 7

View File

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

View File

@ -1,12 +0,0 @@
- VertexShader: 46580970
FragmentShader: 48832081
SubPass: UI
Properties:
data.color: {x: 1, y: 1, z: 1, w: 1}
data.textureIndex: 64651793
data.alpha: 1
data.beta: {x: 1, y: 1, z: 1}
data.sliderThreshold: 1
data.sliderStartColor: {x: 0, y: 1, z: 0, w: 1}
data.sliderEndColor: {x: 1, y: 0, z: 0, w: 1}
data.sliderBarColor: {x: 1, y: 1, z: 1, w: 1}

View File

@ -1,3 +0,0 @@
Name: UIMat_Slider
ID: 128676209
Type: 7

View File

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

View File

@ -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}

View File

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

View File

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

View File

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

View File

@ -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}

View File

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

Some files were not shown because too many files have changed in this diff Show More