Skip to content

ART: misc art polish -Texture seams, spawner crystal update. #268

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 6 commits into from
Apr 9, 2021
Merged

ART: misc art polish -Texture seams, spawner crystal update. #268

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9e6c52a
interim art checkin
jdepuy Mar 26, 2021
dfcb677
fixed normal map seams
jdepuy Mar 29, 2021
a8d4804
Merge branch 'develop' into jdp_misc_art_polish
jdepuy Mar 31, 2021
36acabf
interim art checkin
jdepuy Apr 1, 2021
bd4be30
interim art checkin
jdepuy Apr 8, 2021
3f631af
Fix for seams in floor both in dungeon scene and CharSel & Title scen…
jdepuy Apr 9, 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
17 changes: 1 addition & 16 deletions Assets/BossRoom/Prefabs/Dungeon/Dungeon Pieces/animated/env_floor_switch_glow.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,8 @@ GameObject:
- component: {fileID: 6923725348669878280}
- component: {fileID: 693260371752435667}
- component: {fileID: 5873753617113076559}
- component: {fileID: 4180546739471925412}
m_Layer: 0
m_Name: floor_switch_glow
m_Name: env_floor_switch_glow
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
Expand Down Expand Up @@ -82,17 +81,3 @@ MeshRenderer:
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!64 &4180546739471925412
MeshCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2412353032341473334}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 4
m_Convex: 0
m_CookingOptions: 30
m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
28 changes: 0 additions & 28 deletions Assets/BossRoom/Prefabs/Dungeon/Dungeon Pieces/env_door_boss_head.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@ GameObject:
- component: {fileID: 7980115660496427320}
- component: {fileID: 8801324764397981686}
- component: {fileID: 8184890942973508939}
- component: {fileID: 4897062626467851486}
- component: {fileID: 8778471712971589033}
m_Layer: 0
m_Name: env_door_boss_head
m_TagString: Untagged
Expand Down Expand Up @@ -83,29 +81,3 @@ MeshRenderer:
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!65 &4897062626467851486
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1899106884463111546}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 2.13, y: 6.8740873, z: 2.58}
m_Center: {x: 7.1, y: 2.1874208, z: -0.0069583077}
--- !u!65 &8778471712971589033
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1899106884463111546}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 2.13, y: 6.8740873, z: 2.58}
m_Center: {x: 0.86, y: 2.1874208, z: -0.0069583077}
15 changes: 0 additions & 15 deletions Assets/BossRoom/Prefabs/Dungeon/Dungeon Pieces/env_lava.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ GameObject:
- component: {fileID: 6923725348669878280}
- component: {fileID: 693260371752435667}
- component: {fileID: 5873753617113076559}
- component: {fileID: 7593517161202687830}
- component: {fileID: -5429331838157890601}
m_Layer: 0
m_Name: env_lava
Expand Down Expand Up @@ -83,20 +82,6 @@ MeshRenderer:
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!64 &7593517161202687830
MeshCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2412353032341473334}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 4
m_Convex: 0
m_CookingOptions: 30
m_Mesh: {fileID: 2045894193835759827, guid: db0a9d52f0048274e8dc5e5e35234608, type: 3}
--- !u!114 &-5429331838157890601
MonoBehaviour:
m_ObjectHideFlags: 0
Expand Down
Loading