Skip to content

Commit

Permalink
Implement crouching (#78)
Browse files Browse the repository at this point in the history
* Implement crouching

* Reduce delay when crouching and uncrouching

* Adjust Pop Pixie sprite sort order

* Add crouch-only zone

* Adjust line of sight and movement checks for crouch zone

* Revert me: Launch into Test Scanner scene

* Fix test

* Revert "Revert me: Launch into Test Scanner scene"

This reverts commit f021af9.

* Add crouch button icon
  • Loading branch information
12joan authored Dec 18, 2024
1 parent 436f46f commit bd195b1
Show file tree
Hide file tree
Showing 49 changed files with 3,492 additions and 414 deletions.
75 changes: 71 additions & 4 deletions Assets/Resources/Sprites/Kb+M Button Icons.asset
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ Material:
m_PrefabAsset: {fileID: 0}
m_Name: TextMeshPro/Sprite
m_Shader: {fileID: 4800000, guid: cf81c85f95fe47e1a27f6ae460cf182c, type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords: []
m_InvalidKeywords: []
m_LightmapFlags: 4
Expand All @@ -17,6 +19,7 @@ Material:
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
Expand Down Expand Up @@ -59,6 +62,7 @@ MonoBehaviour:
m_StyleName:
m_PointSize: 512
m_Scale: 1
m_UnitsPerEM: 0
m_LineHeight: 0
m_AscentLine: 0
m_CapLine: 0
Expand Down Expand Up @@ -178,6 +182,18 @@ MonoBehaviour:
m_Scale: 1
m_Name: Zoom Out
m_HashCode: 1504421913
- m_ElementType: 2
m_Unicode: 65534
m_GlyphIndex: 19
m_Scale: 1
m_Name: Move Stick
m_HashCode: 59048471
- m_ElementType: 2
m_Unicode: 65534
m_GlyphIndex: 20
m_Scale: 1
m_Name: Crouch
m_HashCode: -1621378944
m_SpriteGlyphTable:
- m_Index: 0
m_Metrics:
Expand All @@ -193,6 +209,7 @@ MonoBehaviour:
m_Height: 512
m_Scale: 1
m_AtlasIndex: 0
m_ClassDefinitionType: 0
sprite: {fileID: -596910041826341774, guid: 35adbf474f8044a3e83801c55bdd8263,
type: 3}
- m_Index: 1
Expand All @@ -209,6 +226,7 @@ MonoBehaviour:
m_Height: 512
m_Scale: 1
m_AtlasIndex: 0
m_ClassDefinitionType: 0
sprite: {fileID: -8792390930338893125, guid: 35adbf474f8044a3e83801c55bdd8263,
type: 3}
- m_Index: 2
Expand All @@ -225,6 +243,7 @@ MonoBehaviour:
m_Height: 512
m_Scale: 1
m_AtlasIndex: 0
m_ClassDefinitionType: 0
sprite: {fileID: 3844420415584056910, guid: 35adbf474f8044a3e83801c55bdd8263,
type: 3}
- m_Index: 3
Expand All @@ -241,6 +260,7 @@ MonoBehaviour:
m_Height: 512
m_Scale: 1
m_AtlasIndex: 0
m_ClassDefinitionType: 0
sprite: {fileID: 426292489809774385, guid: 35adbf474f8044a3e83801c55bdd8263, type: 3}
- m_Index: 4
m_Metrics:
Expand All @@ -256,6 +276,7 @@ MonoBehaviour:
m_Height: 512
m_Scale: 1
m_AtlasIndex: 0
m_ClassDefinitionType: 0
sprite: {fileID: 4808570210782194475, guid: 35adbf474f8044a3e83801c55bdd8263,
type: 3}
- m_Index: 5
Expand All @@ -272,6 +293,7 @@ MonoBehaviour:
m_Height: 512
m_Scale: 1
m_AtlasIndex: 0
m_ClassDefinitionType: 0
sprite: {fileID: -3935812450019674923, guid: 35adbf474f8044a3e83801c55bdd8263,
type: 3}
- m_Index: 6
Expand All @@ -288,6 +310,7 @@ MonoBehaviour:
m_Height: 512
m_Scale: 1
m_AtlasIndex: 0
m_ClassDefinitionType: 0
sprite: {fileID: -4751134802333804590, guid: 35adbf474f8044a3e83801c55bdd8263,
type: 3}
- m_Index: 7
Expand All @@ -304,6 +327,7 @@ MonoBehaviour:
m_Height: 512
m_Scale: 1
m_AtlasIndex: 0
m_ClassDefinitionType: 0
sprite: {fileID: 8940795741454000754, guid: 35adbf474f8044a3e83801c55bdd8263,
type: 3}
- m_Index: 8
Expand All @@ -320,6 +344,7 @@ MonoBehaviour:
m_Height: 512
m_Scale: 1
m_AtlasIndex: 0
m_ClassDefinitionType: 0
sprite: {fileID: 7166848539947827163, guid: 35adbf474f8044a3e83801c55bdd8263,
type: 3}
- m_Index: 9
Expand All @@ -336,6 +361,7 @@ MonoBehaviour:
m_Height: 512
m_Scale: 1
m_AtlasIndex: 0
m_ClassDefinitionType: 0
sprite: {fileID: -4787028191852508873, guid: 35adbf474f8044a3e83801c55bdd8263,
type: 3}
- m_Index: 10
Expand All @@ -352,6 +378,7 @@ MonoBehaviour:
m_Height: 512
m_Scale: 1
m_AtlasIndex: 0
m_ClassDefinitionType: 0
sprite: {fileID: 8940795741454000754, guid: 35adbf474f8044a3e83801c55bdd8263,
type: 3}
- m_Index: 11
Expand All @@ -368,6 +395,7 @@ MonoBehaviour:
m_Height: 512
m_Scale: 1
m_AtlasIndex: 0
m_ClassDefinitionType: 0
sprite: {fileID: -1013182636, guid: 35adbf474f8044a3e83801c55bdd8263, type: 3}
- m_Index: 12
m_Metrics:
Expand All @@ -383,6 +411,7 @@ MonoBehaviour:
m_Height: 512
m_Scale: 1
m_AtlasIndex: 0
m_ClassDefinitionType: 0
sprite: {fileID: -56107698, guid: 35adbf474f8044a3e83801c55bdd8263, type: 3}
- m_Index: 13
m_Metrics:
Expand All @@ -398,6 +427,7 @@ MonoBehaviour:
m_Height: 512
m_Scale: 1
m_AtlasIndex: 0
m_ClassDefinitionType: 0
sprite: {fileID: 1720355766, guid: 35adbf474f8044a3e83801c55bdd8263, type: 3}
- m_Index: 14
m_Metrics:
Expand All @@ -413,6 +443,7 @@ MonoBehaviour:
m_Height: 512
m_Scale: 1
m_AtlasIndex: 0
m_ClassDefinitionType: 0
sprite: {fileID: 873285356, guid: 35adbf474f8044a3e83801c55bdd8263, type: 3}
- m_Index: 15
m_Metrics:
Expand All @@ -428,13 +459,14 @@ MonoBehaviour:
m_Height: 512
m_Scale: 1
m_AtlasIndex: 0
m_ClassDefinitionType: 0
sprite: {fileID: -590750771, guid: 35adbf474f8044a3e83801c55bdd8263, type: 3}
- m_Index: 16
m_Metrics:
m_Width: 512
m_Height: 512
m_HorizontalBearingX: -256
m_HorizontalBearingY: 256
m_HorizontalBearingX: 0
m_HorizontalBearingY: 0
m_HorizontalAdvance: 512
m_GlyphRect:
m_X: 2560
Expand All @@ -443,14 +475,15 @@ MonoBehaviour:
m_Height: 512
m_Scale: 1
m_AtlasIndex: 0
m_ClassDefinitionType: 0
sprite: {fileID: -3935812450019674923, guid: 35adbf474f8044a3e83801c55bdd8263,
type: 3}
- m_Index: 17
m_Metrics:
m_Width: 512
m_Height: 512
m_HorizontalBearingX: -256
m_HorizontalBearingY: 256
m_HorizontalBearingX: 0
m_HorizontalBearingY: 0
m_HorizontalAdvance: 512
m_GlyphRect:
m_X: 7168
Expand All @@ -459,6 +492,7 @@ MonoBehaviour:
m_Height: 512
m_Scale: 1
m_AtlasIndex: 0
m_ClassDefinitionType: 0
sprite: {fileID: 873285356, guid: 35adbf474f8044a3e83801c55bdd8263, type: 3}
- m_Index: 18
m_Metrics:
Expand All @@ -474,6 +508,39 @@ MonoBehaviour:
m_Height: 512
m_Scale: 1
m_AtlasIndex: 0
m_ClassDefinitionType: 0
sprite: {fileID: -216481777, guid: 35adbf474f8044a3e83801c55bdd8263, type: 3}
- m_Index: 19
m_Metrics:
m_Width: 512
m_Height: 512
m_HorizontalBearingX: -256
m_HorizontalBearingY: 256
m_HorizontalAdvance: 512
m_GlyphRect:
m_X: 6656
m_Y: 0
m_Width: 512
m_Height: 512
m_Scale: 1
m_AtlasIndex: 0
m_ClassDefinitionType: 0
sprite: {fileID: 246259705, guid: 35adbf474f8044a3e83801c55bdd8263, type: 3}
- m_Index: 20
m_Metrics:
m_Width: 512
m_Height: 512
m_HorizontalBearingX: 0
m_HorizontalBearingY: 0
m_HorizontalAdvance: 512
m_GlyphRect:
m_X: 8192
m_Y: 0
m_Width: 512
m_Height: 512
m_Scale: 1
m_AtlasIndex: 0
m_ClassDefinitionType: 0
sprite: {fileID: -1844930750, guid: 35adbf474f8044a3e83801c55bdd8263, type: 3}
spriteInfoList: []
fallbackSpriteAssets: []
Loading

0 comments on commit bd195b1

Please sign in to comment.