Skip to content

Art - Lighting and Nav mesh fixes. #202

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 14 commits into from
Mar 24, 2021
Merged

Art - Lighting and Nav mesh fixes. #202

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 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
82ab4ac
Merge branch 'develop' into jdp_br_fx_update2
jdepuy Mar 23, 2021
8e65968
interim art checkin
jdepuy Mar 23, 2021
86ed762
Fix for seams on wall pieces, Update to lighting - shadows now being …
jdepuy Mar 24, 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/DungeonPieces.FBX
View file
Open in desktop
Git LFS file not shown
4 changes: 2 additions & 2 deletions Assets/BossRoom/PostProcessing/PostProcessVolume Profile.asset
View file
Open in desktop
Git LFS file not shown
6 changes: 3 additions & 3 deletions 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 @@ -51,7 +51,7 @@ Light:
m_InnerSpotAngle: 21.80208
m_CookieSize: 10
m_Shadows:
m_Type: 0
m_Type: 2
m_Resolution: -1
m_CustomResolution: -1
m_Strength: 1
Expand Down Expand Up @@ -439,7 +439,7 @@ Light:
m_InnerSpotAngle: 21.80208
m_CookieSize: 10
m_Shadows:
m_Type: 0
m_Type: 2
m_Resolution: -1
m_CustomResolution: -1
m_Strength: 1
Expand Down Expand Up @@ -646,7 +646,7 @@ Light:
m_InnerSpotAngle: 21.80208
m_CookieSize: 10
m_Shadows:
m_Type: 0
m_Type: 2
m_Resolution: -1
m_CustomResolution: -1
m_Strength: 1
Expand Down
16 changes: 8 additions & 8 deletions 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 @@ -50,13 +50,13 @@ Light:
m_InnerSpotAngle: 21.80208
m_CookieSize: 10
m_Shadows:
m_Type: 0
m_Type: 2
m_Resolution: -1
m_CustomResolution: -1
m_Strength: 1
m_Bias: 0.05
m_NormalBias: 0.4
m_NearPlane: 0.2
m_NearPlane: 0.0234
m_CullingMatrixOverride:
e00: 1
e01: 0
Expand Down Expand Up @@ -275,13 +275,13 @@ Light:
m_InnerSpotAngle: 21.80208
m_CookieSize: 10
m_Shadows:
m_Type: 0
m_Resolution: -1
m_Type: 2
m_Resolution: 2
m_CustomResolution: -1
m_Strength: 1
m_Bias: 0.05
m_NormalBias: 0.4
m_NearPlane: 0.2
m_Strength: 0.884
m_Bias: 1.12
m_NormalBias: 0.61
m_NearPlane: 0.1
m_CullingMatrixOverride:
e00: 1
e01: 0
Expand Down
4 changes: 2 additions & 2 deletions Assets/BossRoom/Prefabs/Dungeon/Dungeon.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39074,7 +39074,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 7980115660496427320, guid: 774df9f23c339504c921336572edb699, type: 3}
propertyPath: m_LocalPosition.x
value: 135.71
value: 135.42
objectReference: {fileID: 0}
- target: {fileID: 7980115660496427320, guid: 774df9f23c339504c921336572edb699, type: 3}
propertyPath: m_LocalPosition.y
Expand Down Expand Up @@ -89420,7 +89420,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 7980115660496427320, guid: 774df9f23c339504c921336572edb699, type: 3}
propertyPath: m_LocalPosition.x
value: 127.73
value: 127.51
objectReference: {fileID: 0}
- target: {fileID: 7980115660496427320, guid: 774df9f23c339504c921336572edb699, type: 3}
propertyPath: m_LocalPosition.y
Expand Down
4 changes: 2 additions & 2 deletions Assets/BossRoom/Scenes/BossRoom.unity
View file
Open in desktop
Git LFS file not shown
3 changes: 0 additions & 3 deletions Assets/BossRoom/Scenes/BossRoom/NavMesh-DungeonNavMesh.asset
View file
Open in desktop

This file was deleted.

8 changes: 0 additions & 8 deletions Assets/BossRoom/Scenes/BossRoom/NavMesh-DungeonNavMesh.asset.meta
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion Assets/BossRoom/Scenes/BossRoom/NavMesh-Patch1.asset
View file
Open in desktop
Git LFS file not shown