Skip to content

ART - Bug Fixes for FX, warning messages, and NavMesh/Collision updates. #198

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

Merged
merged 11 commits into from
Mar 23, 2021
Merged

ART - Bug Fixes for FX, warning messages, and NavMesh/Collision updates. #198

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
7630129
Lots of fixes including faster arrows with weapon trails, revive work…
jdepuy Mar 17, 2021
aa33b64
Merge branch 'develop' into jdp_br_fx_update2
jdepuy Mar 17, 2021
47de777
Added collision to areas of the Bossroom that didn't have any(address…
jdepuy Mar 18, 2021
ea4546f
interim art checkin
jdepuy Mar 19, 2021
e9ea2ef
taking develop merge
jdepuy Mar 19, 2021
0281d72
interim art checkin
jdepuy Mar 22, 2021
ab84a25
getting Nav obstacles setup on prefabs
jdepuy Mar 22, 2021
1099262
interim art checkin
jdepuy Mar 23, 2021
56bc596
Fixed Simple Dissolve Shader, removed unused S_additive shader
jdepuy Mar 23, 2021
a631210
Collision/Path fixes, removed duplicate FX textures and shaders, Imp …
jdepuy Mar 23, 2021
053d1bd
taking develop merge
dwoodruffsf Mar 23, 2021
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
4 changes: 2 additions & 2 deletions Assets/BossRoom/Models/CharacterSet.fbx
View file
Open in desktop
Git LFS file not shown
4 changes: 2 additions & 2 deletions Assets/BossRoom/Models/DungeonPieces.FBX
View file
Open in desktop
Git LFS file not shown
2 changes: 1 addition & 1 deletion Assets/BossRoom/Models/DungeonPieces.FBX.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions Assets/BossRoom/Prefabs/CharGFX/BossGraphics.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2061,6 +2061,15 @@ MonoBehaviour:
m_SoundStartDelaySeconds: 0
m_VolumeMultiplier: 1
m_LoopSound: 0
- m_AnimatorNodeName: WalkRun
m_AnimatorNodeNameHash: -1624701500
m_Prefab: {fileID: -8608552164340512473, guid: 9336eb30e2a836544bfd5b5985fd0573, type: 3}
m_PrefabSpawnDelaySeconds: 0
m_PrefabCanBeAbortedUntilSecs: 0
m_SoundEffect: {fileID: 0}
m_SoundStartDelaySeconds: 0
m_VolumeMultiplier: 1
m_LoopSound: 0
m_EventsOnNodeExit: []
m_AudioSources:
- {fileID: 6900827550167648780}
Expand Down
9 changes: 9 additions & 0 deletions Assets/BossRoom/Prefabs/CharGFX/ImpGraphics.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1177,6 +1177,15 @@ MonoBehaviour:
m_SoundStartDelaySeconds: 0
m_VolumeMultiplier: 1
m_LoopSound: 0
- m_AnimatorNodeName: WalkRun
m_AnimatorNodeNameHash: -1624701500
m_Prefab: {fileID: -8608552164340512473, guid: 9336eb30e2a836544bfd5b5985fd0573, type: 3}
m_PrefabSpawnDelaySeconds: 0
m_PrefabCanBeAbortedUntilSecs: 0
m_SoundEffect: {fileID: 0}
m_SoundStartDelaySeconds: 0
m_VolumeMultiplier: 1
m_LoopSound: 0
m_EventsOnNodeExit: []
m_AudioSources:
- {fileID: -8069025211240352543}
Expand Down
100 changes: 98 additions & 2 deletions 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 @@ -14,7 +14,7 @@ GameObject:
- component: {fileID: 4897062626467851486}
- component: {fileID: 8778471712971589033}
m_Layer: 0
m_Name: door_boss
m_Name: env_door_boss_ani
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
Expand All @@ -30,7 +30,9 @@ Transform:
m_LocalRotation: {x: 0, y: -0.7071068, z: 0, w: 0.7071068}
m_LocalPosition: {x: 4.512451, y: 0, z: -2.0039945}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Children:
- {fileID: 1156891877009470545}
- {fileID: 1696276798478694816}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: -90, z: 0}
Expand Down Expand Up @@ -109,3 +111,97 @@ BoxCollider:
serializedVersion: 2
m_Size: {x: 4, y: 10, z: 4}
m_Center: {x: -3.01, y: 5, z: -0.0069583077}
--- !u!1 &4379244156181976366
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1696276798478694816}
- component: {fileID: 4890513172201749857}
m_Layer: 0
m_Name: Nav Mesh ObstacleL
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1696276798478694816
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4379244156181976366}
m_LocalRotation: {x: 0.000000021855696, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 7980115660496427320}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!208 &4890513172201749857
NavMeshObstacle:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4379244156181976366}
m_Enabled: 1
serializedVersion: 3
m_Shape: 1
m_Extents: {x: 2, y: 5, z: 2}
m_MoveThreshold: 0.1
m_Carve: 1
m_CarveOnlyStationary: 1
m_Center: {x: 6.83, y: 5, z: -0.006958308}
m_TimeToStationary: 0.5
--- !u!1 &4665358764812304309
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1156891877009470545}
- component: {fileID: 7592214511037232534}
m_Layer: 0
m_Name: Nav Mesh ObstacleR
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1156891877009470545
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4665358764812304309}
m_LocalRotation: {x: 0.000000021855696, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 7980115660496427320}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!208 &7592214511037232534
NavMeshObstacle:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4665358764812304309}
m_Enabled: 1
serializedVersion: 3
m_Shape: 1
m_Extents: {x: 2, y: 5, z: 2}
m_MoveThreshold: 0.1
m_Carve: 1
m_CarveOnlyStationary: 1
m_Center: {x: -3.01, y: 5, z: -0.006958308}
m_TimeToStationary: 0.5
100 changes: 98 additions & 2 deletions 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 @@ -14,7 +14,7 @@ GameObject:
- component: {fileID: 4897062626467851486}
- component: {fileID: 8778471712971589033}
m_Layer: 0
m_Name: Door
m_Name: env_Door
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
Expand All @@ -30,7 +30,9 @@ Transform:
m_LocalRotation: {x: 0.000000015454312, y: -0.7071068, z: 0.000000015454312, w: 0.7071068}
m_LocalPosition: {x: 4.512451, y: 0, z: -2.0039945}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Children:
- {fileID: 4759144014836690728}
- {fileID: 2466685165218909230}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
Expand Down Expand Up @@ -109,3 +111,97 @@ 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!1 &3092684120165297940
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 4759144014836690728}
- component: {fileID: 3734494079007086830}
m_Layer: 0
m_Name: Nav Mesh ObstacleR
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &4759144014836690728
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3092684120165297940}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 7980115660496427320}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!208 &3734494079007086830
NavMeshObstacle:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3092684120165297940}
m_Enabled: 1
serializedVersion: 3
m_Shape: 1
m_Extents: {x: 1.065, y: 3.4370434, z: 1.29}
m_MoveThreshold: 0.1
m_Carve: 1
m_CarveOnlyStationary: 1
m_Center: {x: 7.5, y: 2.187421, z: -0.006958308}
m_TimeToStationary: 0.5
--- !u!1 &6780016491442059760
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2466685165218909230}
- component: {fileID: 5819504366710638002}
m_Layer: 0
m_Name: Nav Mesh ObstacleL
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &2466685165218909230
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6780016491442059760}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 7980115660496427320}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!208 &5819504366710638002
NavMeshObstacle:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6780016491442059760}
m_Enabled: 1
serializedVersion: 3
m_Shape: 1
m_Extents: {x: 1.065, y: 3.4370434, z: 1.29}
m_MoveThreshold: 0.1
m_Carve: 1
m_CarveOnlyStationary: 1
m_Center: {x: 0.57, y: 2.187421, z: -0.006958308}
m_TimeToStationary: 0.5
17 changes: 17 additions & 0 deletions Assets/BossRoom/Prefabs/Dungeon/Dungeon Pieces/env_door_crystral_base.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ GameObject:
- component: {fileID: 8801324764397981686}
- component: {fileID: 8184890942973508939}
- component: {fileID: 4897062626467851486}
- component: {fileID: 3372118818997572424}
m_Layer: 0
m_Name: env_door_crystral_base
m_TagString: Untagged
Expand Down Expand Up @@ -95,3 +96,19 @@ BoxCollider:
serializedVersion: 2
m_Size: {x: 0.99753475, y: 3.8718717, z: 1.0420358}
m_Center: {x: 0.00000070035475, y: 1.9263498, z: 0.00000074505823}
--- !u!208 &3372118818997572424
NavMeshObstacle:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1899106884463111546}
m_Enabled: 1
serializedVersion: 3
m_Shape: 1
m_Extents: {x: 0.43800002, y: 0.791, z: 0.44400004}
m_MoveThreshold: 0.1
m_Carve: 1
m_CarveOnlyStationary: 1
m_Center: {x: 0, y: 0.781, z: 0}
m_TimeToStationary: 0.5
17 changes: 17 additions & 0 deletions Assets/BossRoom/Prefabs/Dungeon/Dungeon Pieces/env_floor_barrier_1.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ GameObject:
- component: {fileID: 7019901313856816375}
- component: {fileID: 7061959325340752229}
- component: {fileID: 3946375560253007557}
- component: {fileID: 1747537897787916121}
m_Layer: 8
m_Name: env_floor_barrier_1
m_TagString: Untagged
Expand Down Expand Up @@ -95,3 +96,19 @@ BoxCollider:
serializedVersion: 2
m_Size: {x: 1.0161152, y: 1.0000005, z: 4.000001}
m_Center: {x: 0.5080563, y: 0.50512767, z: 2.0000005}
--- !u!208 &1747537897787916121
NavMeshObstacle:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6858229082375244730}
m_Enabled: 1
serializedVersion: 3
m_Shape: 1
m_Extents: {x: 0.508, y: 0.5, z: 2}
m_MoveThreshold: 0.1
m_Carve: 1
m_CarveOnlyStationary: 1
m_Center: {x: 0.508, y: 0.505, z: 2}
m_TimeToStationary: 0.5
Loading