Skip to content

fix: Rogue dashing on pillars and out of bounds #543

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 10 commits into from
Closed

fix: Rogue dashing on pillars and out of bounds #543

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
24c0500
navmeshmodifier added to pillars/doors/chest, nav mesh rebaked
fernando-cortez Mar 11, 2022
3234447
pathfinding reworked to eliminate clipping & warping to tops of pillars
fernando-cortez Mar 11, 2022
c03c013
removing double getcomponents
fernando-cortez Mar 11, 2022
56df969
updating only navmesh generated
fernando-cortez Mar 11, 2022
2ce7b34
Merge branch 'fix/nav-mesh-floaters-removed' into fix/rogue-dashing-o…
fernando-cortez Mar 11, 2022
3ac66fc
Merge branch 'release/GDC2022' into fix/rogue-dashing-on-pillars
fernando-cortez Mar 14, 2022
cd57e26
environment layer introduced, ground raycast can detect multiple grou…
fernando-cortez Mar 15, 2022
23766a3
optimized sorting
fernando-cortez Mar 15, 2022
06cdd18
arrows working with layer change
fernando-cortez Mar 15, 2022
2b3e99a
merge release
fernando-cortez Mar 18, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Assets/BossRoom/Prefabs/Dungeon/Dungeon Pieces/animated/env_door_boss_ani.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ GameObject:
- component: {fileID: 8184890942973508939}
- component: {fileID: 4897062626467851486}
- component: {fileID: 8778471712971589033}
m_Layer: 8
m_Layer: 10
m_Name: env_door_boss_ani
m_TagString: Untagged
m_Icon: {fileID: 0}
Expand Down
19 changes: 18 additions & 1 deletion Assets/BossRoom/Prefabs/Dungeon/Dungeon Pieces/animated/env_treasure_chest_ani.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ GameObject:
- component: {fileID: 445632146649864073}
- component: {fileID: 7463718357983197496}
- component: {fileID: 3577683239110096990}
m_Layer: 8
- component: {fileID: 4533873789762061175}
m_Layer: 10
m_Name: env_treasure_chest_ani
m_TagString: Untagged
m_Icon: {fileID: 0}
Expand Down Expand Up @@ -95,3 +96,19 @@ BoxCollider:
serializedVersion: 2
m_Size: {x: 3.641676, y: 3.8060122, z: 4.927659}
m_Center: {x: -0.013105154, y: 1.8930116, z: 0.00000023841858}
--- !u!114 &4533873789762061175
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4371491365999748502}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 1e3fdca004f2d45fe8abbed571a8abd5, type: 3}
m_Name:
m_EditorClassIdentifier:
m_OverrideArea: 1
m_Area: 1
m_IgnoreFromBuild: 0
m_AffectedAgents: ffffffff
19 changes: 18 additions & 1 deletion Assets/BossRoom/Prefabs/Dungeon/Dungeon Pieces/env_Door.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@ GameObject:
- component: {fileID: 8184890942973508939}
- component: {fileID: 4897062626467851486}
- component: {fileID: 8778471712971589033}
m_Layer: 8
- component: {fileID: 8106763230213914577}
m_Layer: 10
m_Name: env_Door
m_TagString: Untagged
m_Icon: {fileID: 0}
Expand Down Expand Up @@ -109,3 +110,19 @@ BoxCollider:
serializedVersion: 2
m_Size: {x: 2.13, y: 6.8740873, z: 2.58}
m_Center: {x: 0.86, y: 2.1874208, z: -0.0069583077}
--- !u!114 &8106763230213914577
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1899106884463111546}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 1e3fdca004f2d45fe8abbed571a8abd5, type: 3}
m_Name:
m_EditorClassIdentifier:
m_OverrideArea: 1
m_Area: 1
m_IgnoreFromBuild: 0
m_AffectedAgents: ffffffff
2 changes: 1 addition & 1 deletion Assets/BossRoom/Prefabs/Dungeon/Dungeon Pieces/env_barrier.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ GameObject:
- component: {fileID: 8801324764397981686}
- component: {fileID: 8184890942973508939}
- component: {fileID: 4897062626467851486}
m_Layer: 0
m_Layer: 10
m_Name: env_barrier
m_TagString: Untagged
m_Icon: {fileID: 0}
Expand Down
2 changes: 1 addition & 1 deletion Assets/BossRoom/Prefabs/Dungeon/Dungeon Pieces/env_pebbles.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ GameObject:
- component: {fileID: 3325143161705299546}
- component: {fileID: 445632146649864073}
- component: {fileID: 7463718357983197496}
m_Layer: 8
m_Layer: 10
m_Name: env_pebbles
m_TagString: Untagged
m_Icon: {fileID: 0}
Expand Down
2 changes: 1 addition & 1 deletion Assets/BossRoom/Prefabs/Dungeon/Dungeon Pieces/env_rock.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ GameObject:
- component: {fileID: 445632146649864073}
- component: {fileID: 7463718357983197496}
- component: {fileID: 6664442740537142151}
m_Layer: 0
m_Layer: 10
m_Name: env_rock
m_TagString: Untagged
m_Icon: {fileID: 0}
Expand Down
19 changes: 18 additions & 1 deletion Assets/BossRoom/Prefabs/Dungeon/Dungeon Pieces/env_spawn_door.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,8 @@ GameObject:
- component: {fileID: 8184890942973508939}
- component: {fileID: 4897062626467851486}
- component: {fileID: 8778471712971589033}
m_Layer: 8
- component: {fileID: 9048744774741283463}
m_Layer: 10
m_Name: env_spawn_door
m_TagString: Untagged
m_Icon: {fileID: 0}
Expand Down Expand Up @@ -340,6 +341,22 @@ BoxCollider:
serializedVersion: 2
m_Size: {x: 2.13, y: 6.8740873, z: 2.58}
m_Center: {x: 0.49, y: 2.1874208, z: -0.0069583077}
--- !u!114 &9048744774741283463
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1899106884463111546}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 1e3fdca004f2d45fe8abbed571a8abd5, type: 3}
m_Name:
m_EditorClassIdentifier:
m_OverrideArea: 1
m_Area: 1
m_IgnoreFromBuild: 0
m_AffectedAgents: ffffffff
--- !u!1 &2461863967486524451
GameObject:
m_ObjectHideFlags: 0
Expand Down
2 changes: 1 addition & 1 deletion Assets/BossRoom/Prefabs/Dungeon/Dungeon Pieces/env_torch.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ GameObject:
- component: {fileID: 3325143161705299546}
- component: {fileID: 445632146649864073}
- component: {fileID: 7463718357983197496}
m_Layer: 0
m_Layer: 10
m_Name: env_torch
m_TagString: Untagged
m_Icon: {fileID: 0}
Expand Down
2 changes: 1 addition & 1 deletion Assets/BossRoom/Prefabs/Dungeon/Dungeon Pieces/env_torch2.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ GameObject:
- component: {fileID: 445632146649864073}
- component: {fileID: 7463718357983197496}
- component: {fileID: 8610266421428556183}
m_Layer: 8
m_Layer: 10
m_Name: env_torch2
m_TagString: Untagged
m_Icon: {fileID: 0}
Expand Down
2 changes: 1 addition & 1 deletion Assets/BossRoom/Prefabs/Dungeon/Dungeon Pieces/env_wall1_base_corner_1.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ GameObject:
- component: {fileID: 7463718357983197496}
- component: {fileID: 8940407398543633114}
- component: {fileID: 1897298181903638196}
m_Layer: 8
m_Layer: 10
m_Name: env_wall1_base_corner_1
m_TagString: Untagged
m_Icon: {fileID: 0}
Expand Down
4 changes: 2 additions & 2 deletions Assets/BossRoom/Prefabs/Dungeon/Dungeon Pieces/env_wall1_base_diagonal_1.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ GameObject:
- component: {fileID: 4437348436208465204}
- component: {fileID: 3432985996055369824}
- component: {fileID: 2212805465033422730}
m_Layer: 8
m_Layer: 10
m_Name: env_wall1_base_diagonal_1
m_TagString: Untagged
m_Icon: {fileID: 0}
Expand Down Expand Up @@ -92,7 +92,7 @@ GameObject:
m_Component:
- component: {fileID: 5915529853195630635}
- component: {fileID: 7898993292670171814}
m_Layer: 8
m_Layer: 10
m_Name: Diagonal_Collider
m_TagString: Untagged
m_Icon: {fileID: 0}
Expand Down
4 changes: 2 additions & 2 deletions Assets/BossRoom/Prefabs/Dungeon/Dungeon Pieces/env_wall1_base_diagonal_2.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ GameObject:
- component: {fileID: 2698721903467665021}
- component: {fileID: 3792955485091636975}
- component: {fileID: 2036526519701997008}
m_Layer: 8
m_Layer: 10
m_Name: env_wall1_base_diagonal_2
m_TagString: Untagged
m_Icon: {fileID: 0}
Expand Down Expand Up @@ -92,7 +92,7 @@ GameObject:
m_Component:
- component: {fileID: 8193510332667705931}
- component: {fileID: 1064781519039568672}
m_Layer: 8
m_Layer: 10
m_Name: Diagonal_Collider
m_TagString: Untagged
m_Icon: {fileID: 0}
Expand Down
4 changes: 2 additions & 2 deletions Assets/BossRoom/Prefabs/Dungeon/Dungeon Pieces/env_wall1_base_diagonal_3.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ GameObject:
- component: {fileID: 2698721903467665021}
- component: {fileID: 3792955485091636975}
- component: {fileID: 2036526519701997008}
m_Layer: 8
m_Layer: 10
m_Name: env_wall1_base_diagonal_3
m_TagString: Untagged
m_Icon: {fileID: 0}
Expand Down Expand Up @@ -92,7 +92,7 @@ GameObject:
m_Component:
- component: {fileID: 8193510332667705931}
- component: {fileID: 1064781519039568672}
m_Layer: 8
m_Layer: 10
m_Name: Diagonal_Collider
m_TagString: Untagged
m_Icon: {fileID: 0}
Expand Down
2 changes: 1 addition & 1 deletion Assets/BossRoom/Prefabs/Dungeon/Dungeon Pieces/env_wall1_base_straight_1.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ GameObject:
- component: {fileID: 8239492390622286820}
- component: {fileID: 1148747288013210730}
- component: {fileID: 8619486518123324128}
m_Layer: 8
m_Layer: 10
m_Name: env_wall1_base_straight_1
m_TagString: Untagged
m_Icon: {fileID: 0}
Expand Down
2 changes: 1 addition & 1 deletion Assets/BossRoom/Prefabs/Dungeon/Dungeon Pieces/env_wall1_base_straight_2.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ GameObject:
- component: {fileID: 8239492390622286820}
- component: {fileID: 1148747288013210730}
- component: {fileID: 8619486518123324128}
m_Layer: 8
m_Layer: 10
m_Name: env_wall1_base_straight_2
m_TagString: Untagged
m_Icon: {fileID: 0}
Expand Down
2 changes: 1 addition & 1 deletion Assets/BossRoom/Prefabs/Dungeon/Dungeon Pieces/env_wall1_base_straight_3.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ GameObject:
- component: {fileID: 8239492390622286820}
- component: {fileID: 1148747288013210730}
- component: {fileID: 8619486518123324128}
m_Layer: 8
m_Layer: 10
m_Name: env_wall1_base_straight_3
m_TagString: Untagged
m_Icon: {fileID: 0}
Expand Down
2 changes: 1 addition & 1 deletion Assets/BossRoom/Prefabs/Dungeon/Dungeon Pieces/env_wall1_base_straight_cap_1.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ GameObject:
- component: {fileID: 8239492390622286820}
- component: {fileID: 1148747288013210730}
- component: {fileID: 8619486518123324128}
m_Layer: 8
m_Layer: 10
m_Name: env_wall1_base_straight_cap_1
m_TagString: Untagged
m_Icon: {fileID: 0}
Expand Down
2 changes: 1 addition & 1 deletion Assets/BossRoom/Prefabs/Dungeon/Dungeon Pieces/env_wall1_top_corner_1.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ GameObject:
- component: {fileID: 3325143161705299546}
- component: {fileID: 445632146649864073}
- component: {fileID: 7463718357983197496}
m_Layer: 8
m_Layer: 10
m_Name: env_wall1_top_corner_1
m_TagString: Untagged
m_Icon: {fileID: 0}
Expand Down
2 changes: 1 addition & 1 deletion Assets/BossRoom/Prefabs/Dungeon/Dungeon Pieces/env_wall1_top_diagonal_1.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ GameObject:
- component: {fileID: 4437348436208465204}
- component: {fileID: 3432985996055369824}
- component: {fileID: 2212805465033422730}
m_Layer: 8
m_Layer: 10
m_Name: env_wall1_top_diagonal_1
m_TagString: Untagged
m_Icon: {fileID: 0}
Expand Down
2 changes: 1 addition & 1 deletion Assets/BossRoom/Prefabs/Dungeon/Dungeon Pieces/env_wall1_top_diagonal_2.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ GameObject:
- component: {fileID: 3325143161705299546}
- component: {fileID: 445632146649864073}
- component: {fileID: 7463718357983197496}
m_Layer: 8
m_Layer: 10
m_Name: env_wall1_top_diagonal_2
m_TagString: Untagged
m_Icon: {fileID: 0}
Expand Down
2 changes: 1 addition & 1 deletion Assets/BossRoom/Prefabs/Dungeon/Dungeon Pieces/env_wall1_top_diagonal_3.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ GameObject:
- component: {fileID: 3325143161705299546}
- component: {fileID: 445632146649864073}
- component: {fileID: 7463718357983197496}
m_Layer: 8
m_Layer: 10
m_Name: env_wall1_top_diagonal_3
m_TagString: Untagged
m_Icon: {fileID: 0}
Expand Down
2 changes: 1 addition & 1 deletion Assets/BossRoom/Prefabs/Dungeon/Dungeon Pieces/env_wall1_top_straight_1.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ GameObject:
- component: {fileID: 2698721903467665021}
- component: {fileID: 3792955485091636975}
- component: {fileID: 2036526519701997008}
m_Layer: 8
m_Layer: 10
m_Name: env_wall1_top_straight_1
m_TagString: Untagged
m_Icon: {fileID: 0}
Expand Down
2 changes: 1 addition & 1 deletion Assets/BossRoom/Prefabs/Dungeon/Dungeon Pieces/env_wall1_top_straight_2.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ GameObject:
- component: {fileID: 2698721903467665021}
- component: {fileID: 3792955485091636975}
- component: {fileID: 2036526519701997008}
m_Layer: 8
m_Layer: 10
m_Name: env_wall1_top_straight_2
m_TagString: Untagged
m_Icon: {fileID: 0}
Expand Down
2 changes: 1 addition & 1 deletion Assets/BossRoom/Prefabs/Dungeon/Dungeon Pieces/env_wall1_top_straight_3.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ GameObject:
- component: {fileID: 2698721903467665021}
- component: {fileID: 3792955485091636975}
- component: {fileID: 2036526519701997008}
m_Layer: 8
m_Layer: 10
m_Name: env_wall1_top_straight_3
m_TagString: Untagged
m_Icon: {fileID: 0}
Expand Down
2 changes: 1 addition & 1 deletion Assets/BossRoom/Prefabs/Dungeon/Dungeon Pieces/env_wall1_top_straight_cap_1.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ GameObject:
- component: {fileID: 2698721903467665021}
- component: {fileID: 3792955485091636975}
- component: {fileID: 2036526519701997008}
m_Layer: 8
m_Layer: 10
m_Name: env_wall1_top_straight_cap_1
m_TagString: Untagged
m_Icon: {fileID: 0}
Expand Down
19 changes: 18 additions & 1 deletion Assets/BossRoom/Prefabs/Dungeon/Dungeon Pieces/pillar/env_pillar.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ GameObject:
- component: {fileID: 8801324764397981686}
- component: {fileID: 8184890942973508939}
- component: {fileID: 4897062626467851486}
m_Layer: 8
- component: {fileID: -2186674669870047598}
m_Layer: 10
m_Name: env_pillar
m_TagString: Untagged
m_Icon: {fileID: 0}
Expand Down Expand Up @@ -95,3 +96,19 @@ BoxCollider:
serializedVersion: 2
m_Size: {x: 3.7650332, y: 8.287147, z: 3.510577}
m_Center: {x: 2.0017188, y: 4.1465364, z: -1.1517731}
--- !u!114 &-2186674669870047598
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1899106884463111546}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 1e3fdca004f2d45fe8abbed571a8abd5, type: 3}
m_Name:
m_EditorClassIdentifier:
m_OverrideArea: 1
m_Area: 1
m_IgnoreFromBuild: 0
m_AffectedAgents: ffffffff
17 changes: 17 additions & 0 deletions Assets/BossRoom/Prefabs/Dungeon/Dungeon Pieces/pillar/env_pillar2.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ GameObject:
- component: {fileID: 7980115660496427320}
- component: {fileID: 8801324764397981686}
- component: {fileID: 8184890942973508939}
- component: {fileID: 6371680955712932979}
m_Layer: 0
m_Name: env_pillar2
m_TagString: Untagged
Expand Down Expand Up @@ -81,3 +82,19 @@ MeshRenderer:
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!114 &6371680955712932979
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1899106884463111546}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 1e3fdca004f2d45fe8abbed571a8abd5, type: 3}
m_Name:
m_EditorClassIdentifier:
m_OverrideArea: 1
m_Area: 1
m_IgnoreFromBuild: 0
m_AffectedAgents: ffffffff
2 changes: 1 addition & 1 deletion Assets/BossRoom/Prefabs/Dungeon/Dungeon Pieces/pots/env_pot_heavy.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ GameObject:
- component: {fileID: 445632146649864073}
- component: {fileID: 7463718357983197496}
- component: {fileID: 3496288370208538997}
m_Layer: 8
m_Layer: 10
m_Name: env_pot_heavy
m_TagString: Untagged
m_Icon: {fileID: 0}
Expand Down
Loading