Compare commits

..

7 Commits

Author SHA1 Message Date
Sri Sham Haran 6524639409 Can finally deserialize starting scene, play and stop which saves and reloads the scene. 2022-11-01 21:07:56 +08:00
Sri Sham Haran 8b4ebc557c Merge branch 'main' into SP3-305-configurations 2022-11-01 20:08:09 +08:00
Sri Sham Haran 87f6252d3e some fixes. still cant reload scene. jesus wept 2022-11-01 01:57:55 +08:00
Xiao Qi 943f756721 Added file name and extensions to path to save asset 2022-11-01 01:19:50 +08:00
Sri Sham Haran 7ac13b370f Merge branch 'main' into SP3-305-configurations 2022-11-01 01:09:19 +08:00
Sri Sham Haran 67ad65a2d5 get window from application for now 2022-11-01 00:41:37 +08:00
Sri Sham Haran 917009a5cb Scene loading 2022-10-31 22:04:19 +08:00
1399 changed files with 30298 additions and 146444 deletions

View File

@ -1,27 +0,0 @@
---
name: Bug report
about: Report a bug that should be fixed
title: ''
labels: ''
assignees: ''
---
**Describe the bug**
A clear and concise description of what the bug is.
**To Reproduce**
Steps to reproduce the behavior:
1. Go to '...'
2. Click on '....'
3. Scroll down to '....'
4. See error
**Expected behavior**
A clear and concise description of what you expected to happen.
**Screenshots**
If applicable, add screenshots to help explain your problem.
**Additional context**
Add any other context about the problem here.

View File

@ -1,20 +0,0 @@
---
name: Feature request
about: Suggest a feature for the project
title: ''
labels: ''
assignees: ''
---
**Is your feature request related to a problem? Please describe.**
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
**Describe the solution you'd like**
A clear and concise description of what you want to happen.
**Describe alternatives you've considered**
A clear and concise description of any alternative solutions or features you've considered.
**Additional context**
Add any other context or screenshots about the feature request here.

3
.gitignore vendored
View File

@ -363,7 +363,4 @@ MigrationBackup/
*.filters
JSON/Schemas/Catalog/
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
Starting Scene ID: 97158628
Starting Scene ID: 94511900
Window Size: {x: 1920, y: 1080}
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

BIN
Assets/Audio/footsteps.bank Normal file

Binary file not shown.

View File

@ -1,96 +0,0 @@
7
Controller Look Horizontal
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 +0,0 @@
0 StaticObject 1101000000000000
1 Furniture 1101000000000000
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
11 12 0000000000000000
12 13 0000000000000000
13 14 0000000000000000
14 15 0000000000000000
15 16 0000000000000000

BIN
Assets/Cube.003.shmesh Normal file

Binary file not shown.

View File

@ -0,0 +1,3 @@
Name: Cube.003
ID: 71245919
Type: 4

BIN
Assets/Cube.012.shmesh Normal file

Binary file not shown.

View File

@ -0,0 +1,3 @@
Name: Cube.012
ID: 80365422
Type: 4

View File

@ -1,16 +1,16 @@
[Window][MainStatusBar]
Pos=0,1007
Pos=0,1060
Size=1920,20
Collapsed=0
[Window][SHEditorMenuBar]
Pos=0,48
Size=1920,959
Size=1920,1012
Collapsed=0
[Window][Hierarchy Panel]
Pos=0,189
Size=308,818
Pos=0,197
Size=308,863
Collapsed=0
DockId=0x00000004,0
@ -21,13 +21,13 @@ Collapsed=0
[Window][Inspector]
Pos=1528,48
Size=392,959
Size=392,1012
Collapsed=0
DockId=0x00000006,0
[Window][Profiler]
Pos=0,48
Size=308,139
Size=308,147
Collapsed=0
DockId=0x00000003,0
@ -76,7 +76,7 @@ DockId=0x0000000B,0
[Window][ Viewport]
Pos=310,48
Size=1216,662
Size=1216,715
Collapsed=0
DockId=0x0000000B,0
@ -93,19 +93,13 @@ Collapsed=0
DockId=0x0000000A,0
[Window][ Asset Browser]
Pos=310,712
Pos=310,765
Size=1216,295
Collapsed=0
DockId=0x0000000C,0
[Window][Material Inspector]
Pos=1528,48
Size=392,959
Collapsed=0
DockId=0x00000006,1
[Docking][Data]
DockSpace ID=0xC5C9B8AB Window=0xBE4044E9 Pos=0,71 Size=1920,959 Split=X
DockSpace ID=0xC5C9B8AB Window=0xBE4044E9 Pos=8,79 Size=1920,1012 Split=X
DockNode ID=0x00000005 Parent=0xC5C9B8AB SizeRef=1526,1036 Split=X
DockNode ID=0x00000001 Parent=0x00000005 SizeRef=308,1036 Split=Y Selected=0x1E6EB881
DockNode ID=0x00000003 Parent=0x00000001 SizeRef=225,147 Selected=0x1E6EB881
@ -117,5 +111,5 @@ DockSpace ID=0xC5C9B8AB Window=0xBE4044E9 Pos=0,71 Size=1920,959 Split
DockNode ID=0x0000000C Parent=0x00000009 SizeRef=1501,295 Selected=0xB128252A
DockNode ID=0x0000000A Parent=0x00000007 SizeRef=1501,310 Selected=0xD446F7B6
DockNode ID=0x00000008 Parent=0x00000002 SizeRef=1501,338 Selected=0xD9F31532
DockNode ID=0x00000006 Parent=0xC5C9B8AB SizeRef=392,1036 Selected=0xD3697FB6
DockNode ID=0x00000006 Parent=0xC5C9B8AB SizeRef=392,1036 Selected=0xE7039252

Binary file not shown.

View File

@ -1,3 +0,0 @@
Name: ALGER
ID: 182525173
Type: 10

Binary file not shown.

Binary file not shown.

View File

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

Binary file not shown.

Binary file not shown.

View File

@ -1,3 +0,0 @@
Name: SegoeUI
ID: 176667660
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: 39210065
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: BagMaterial
ID: 123745521
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: 61918518
data.alpha: 0
data.beta: {x: 1, y: 1, z: 1}

View File

@ -1,3 +0,0 @@
Name: HouseMaterial
ID: 127069936
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: 57342922
data.alpha: 0
data.beta: {x: 1, y: 1, z: 1}

View File

@ -1,3 +0,0 @@
Name: MT_ColorPaletteDefault
ID: 131956078
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: 54797199
data.alpha: 0
data.beta: {x: 1, y: 1, z: 1}

View File

@ -1,3 +0,0 @@
Name: MT_Homeowner
ID: 129495479
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: 39210065
FragmentShader: 46377769
SubPass: G-Buffer Write
Properties:
data.color: {x: 1, y: 1, z: 1, w: 1}
data.textureIndex: 53438927
data.alpha: 0
data.beta: {x: 1, y: 1, z: 1}

View File

@ -1,3 +0,0 @@
Name: MT_House_Palette4
ID: 132690168
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,3 +0,0 @@
Name: TX_HouseInterior_Palette3
ID: 61918518
Type: 3

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

View File

@ -1,3 +0,0 @@
Name: TestMat
ID: 126974645
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}

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