Skip to content
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

Feature: Art and Sound Pass for Vandal Imp Tossed Attack [MTT-2732] #689

Merged
merged 11 commits into from
Aug 16, 2022
Merged

Feature: Art and Sound Pass for Vandal Imp Tossed Attack [MTT-2732] #689

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
5b49bf5
Art and sound pass for vandal imp tossed attack, as well as cleaning …
jilfranco-unity Jun 13, 2022
92b1c4e
Renamed /cleand out any remaining old files
jilfranco-unity Jun 27, 2022
f65b9ec
Fixed up some broken references introduced by renaming assets
jilfranco-unity Jun 28, 2022
cb8f7e0
Some last little tweaks to the visuals, mostly timing
jilfranco-unity Jun 28, 2022
f75c82a
Added changes to project changelog
jilfranco-unity Jun 28, 2022
64b54f7
Reformatting of code
jilfranco-unity Jun 30, 2022
5cd5bcc
Update CHANGELOG.md
jilfranco-unity Jun 30, 2022
719d311
Fixed up some naming conventions and a bug with the destroy timer for…
jilfranco-unity Aug 5, 2022
e3d5b5e
Changed the materials on the explosion effect to not draw in front of…
jilfranco-unity Aug 5, 2022
c1a348b
Merge branch 'develop' into feature/vandal-imp-tossed-attack-art
jilfranco-unity Aug 5, 2022
18ccf9d
Moved the vandal imp to be closer to the boss door, also rearranged t…
jilfranco-unity Aug 10, 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
4 changes: 2 additions & 2 deletions Assets/GameData/Action/VandalImp/ImpToss.asset
View file
Open in desktop
Git LFS file not shown
4 changes: 3 additions & 1 deletion ...aterial/Characters/Toon/Head_Imp_Bomb.mat → ...erial/Characters/Toon/Head_Imp_Vandal.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Material:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Head_Imp_Bomb
m_Name: Head_Imp_Vandal
m_Shader: {fileID: -6465566751694194690, guid: 317f1cf71d2fc30458456d44f39763d2, type: 3}
m_ValidKeywords: []
m_InvalidKeywords:
Expand Down Expand Up @@ -82,6 +82,8 @@ Material:
- _Mode: 0
- _OcclusionStrength: 1
- _Parallax: 0.02
- _QueueControl: 0
- _QueueOffset: 0
- _RimAmount: 0.667
- _RimThreshold: 0
- _SmoothnessTextureChannel: 0
Expand Down
0 ...al/Characters/Toon/Head_Imp_Bomb.mat.meta → .../Characters/Toon/Head_Imp_Vandal.mat.meta
View file
Open in desktop
File renamed without changes.
4 changes: 3 additions & 1 deletion ...terial/Characters/Toon/Torso_Imp_Bomb.mat → ...rial/Characters/Toon/Torso_Imp_Vandal.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Material:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Torso_Imp_Bomb
m_Name: Torso_Imp_Vandal
m_Shader: {fileID: -6465566751694194690, guid: 317f1cf71d2fc30458456d44f39763d2, type: 3}
m_ValidKeywords: []
m_InvalidKeywords:
Expand Down Expand Up @@ -82,6 +82,8 @@ Material:
- _Mode: 0
- _OcclusionStrength: 1
- _Parallax: 0.02
- _QueueControl: 0
- _QueueOffset: 0
- _RimAmount: 0.366
- _RimThreshold: 0
- _SmoothnessTextureChannel: 0
Expand Down
0 ...l/Characters/Toon/Torso_Imp_Bomb.mat.meta → ...Characters/Toon/Torso_Imp_Vandal.mat.meta
View file
Open in desktop
File renamed without changes.
8 changes: 8 additions & 0 deletions Assets/Models/Animation Controllers/CharacterSetController_VandalImp.overrideController
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,11 @@ AnimatorOverrideController:
m_OverrideClip: {fileID: -3770237558735227746, guid: 2115c4661f55eff45a5a0f91fc0a12f0, type: 3}
- m_OriginalClip: {fileID: -5612658629409835226, guid: 2115c4661f55eff45a5a0f91fc0a12f0, type: 3}
m_OverrideClip: {fileID: 8009636489596012282, guid: 2115c4661f55eff45a5a0f91fc0a12f0, type: 3}
- m_OriginalClip: {fileID: -4852724403241161369, guid: 2115c4661f55eff45a5a0f91fc0a12f0, type: 3}
m_OverrideClip: {fileID: -4852724403241161369, guid: 2115c4661f55eff45a5a0f91fc0a12f0, type: 3}
- m_OriginalClip: {fileID: -1504929105726005784, guid: 2115c4661f55eff45a5a0f91fc0a12f0, type: 3}
m_OverrideClip: {fileID: -4852724403241161369, guid: 2115c4661f55eff45a5a0f91fc0a12f0, type: 3}
- m_OriginalClip: {fileID: -565464528270119969, guid: 2115c4661f55eff45a5a0f91fc0a12f0, type: 3}
m_OverrideClip: {fileID: 7923818702227147186, guid: 2115c4661f55eff45a5a0f91fc0a12f0, type: 3}
- m_OriginalClip: {fileID: 7291507243818066706, guid: 2115c4661f55eff45a5a0f91fc0a12f0, type: 3}
m_OverrideClip: {fileID: -4852724403241161369, guid: 2115c4661f55eff45a5a0f91fc0a12f0, type: 3}
4 changes: 2 additions & 2 deletions Assets/Models/CharacterSet.fbx
View file
Open in desktop
Git LFS file not shown
9 changes: 6 additions & 3 deletions Assets/Models/CharacterSet.fbx.meta
View file
Open in desktop

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

24 changes: 21 additions & 3 deletions Assets/Prefabs/CharGFX/VandalImpGraphics.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1245,6 +1245,7 @@ GameObject:
- component: {fileID: -559815779163765970}
- component: {fileID: -8995571906845300287}
- component: {fileID: 6030569013059244219}
- component: {fileID: -1890528778572688093}
m_Layer: 6
m_Name: VandalImpGraphics
m_TagString: Untagged
Expand Down Expand Up @@ -1322,12 +1323,12 @@ MonoBehaviour:
- m_AnimatorNodeName: Attack1
m_AnimatorNodeNameHash: -47317214
m_Prefab: {fileID: 0}
m_PrefabSpawnDelaySeconds: 0.8
m_PrefabSpawnDelaySeconds: 0
m_PrefabCanBeAbortedUntilSecs: 0
m_PrefabParent: {fileID: 0}
m_PrefabParentOffset: {x: 0, y: 0, z: 0}
m_DeParentPrefab: 0
m_SoundEffect: {fileID: 8300000, guid: a08cbad8bcaf8c345aa6ae1e7578eee9, type: 3}
m_SoundEffect: {fileID: 0}
m_SoundStartDelaySeconds: 0
m_VolumeMultiplier: 1
m_LoopSound: 0
Expand Down Expand Up @@ -1358,6 +1359,7 @@ MonoBehaviour:
m_AudioSources:
- {fileID: -8069025211240352543}
- {fileID: -4965377615854939036}
- {fileID: -4965377615854939036}
m_Animator: {fileID: 234724737205816310}
m_ClientCharacterVisualization: {fileID: 0}
--- !u!82 &-8069025211240352543
Expand Down Expand Up @@ -1765,6 +1767,22 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Animator: {fileID: 234724737205816310}
--- !u!114 &-1890528778572688093
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6839301660383890230}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d5a57f767e5e46a458fc5d3c628d0cbb, type: 3}
m_Name:
m_EditorClassIdentifier:
GlobalObjectIdHash: 951099334
AlwaysReplicateAsRoot: 0
DontDestroyWithOwner: 0
AutoObjectParentSync: 1
--- !u!1 &7108127146651356877
GameObject:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -2071,7 +2089,7 @@ GameObject:
- component: {fileID: 8731501901720154717}
- component: {fileID: 4907214515068745264}
m_Layer: 6
m_Name: Imp_WeaponR
m_Name: Imp_TossedObject
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
Expand Down
8 changes: 8 additions & 0 deletions Assets/Prefabs/Character/VandalImp.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 176558388678216186}
m_Modifications:
- target: {fileID: -1890528778572688093, guid: 7c82a6f62673a3b4fb51d5c6d76f7a96, type: 3}
propertyPath: GlobalObjectIdHash
value: 951099334
objectReference: {fileID: 0}
- target: {fileID: -823941263164167683, guid: 7c82a6f62673a3b4fb51d5c6d76f7a96, type: 3}
propertyPath: GlobalObjectIdHash
value: 951099334
Expand Down Expand Up @@ -168,6 +172,10 @@ PrefabInstance:
propertyPath: m_ClientCharacterVisualization
value:
objectReference: {fileID: 3806176119258990995}
- target: {fileID: 8398944656959553575, guid: 64cfd098f62285f42918875fef849e88, type: 3}
propertyPath: m_KilledDestroyDelaySeconds
value: 2
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 64cfd098f62285f42918875fef849e88, type: 3}
--- !u!1 &176558388678216176 stripped
Expand Down
Loading