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

Jump to bottom

Lightning turret update #53

Merged
merged 7 commits into from
Oct 20, 2021
Merged

Lightning turret update #53

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
91d1eaa
Updatet lightning turret model
SondreHus Oct 11, 2021
3cf4e6e
Added vfx to tower, fixed leak where infinite transforms were being c…
SondreHus Oct 12, 2021
bc7cee9
Iunno what i changed
SondreHus Oct 20, 2021
153b23b
fredrik spurde
SondreHus Oct 20, 2021
cf60a72
merged develop into lightning turret fix
SondreHus Oct 20, 2021
908c849
This is a commit message, did stuff, secret stuff. Ok, i updated the …
SondreHus Oct 20, 2021
83698b6
healt
SondreHus Oct 20, 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
58 changes: 29 additions & 29 deletions Assets/Animations/Towers/LightningTurret/Ligningturret.controller
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,31 +1,5 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1102 &-2347728340251618517
AnimatorState:
serializedVersion: 5
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Shoot_lightning
m_Speed: 1
m_CycleOffset: 0
m_Transitions: []
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
m_Mirror: 0
m_SpeedParameterActive: 0
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: 00e3c3ef989fcbf4c9212eebaa1b7de6, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!91 &9100000
AnimatorController:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -58,8 +32,8 @@ AnimatorStateMachine:
m_Name: Default
m_ChildStates:
- serializedVersion: 1
m_State: {fileID: -2347728340251618517}
m_Position: {x: 285.2, y: 130, z: 0}
m_State: {fileID: 9194048226351009108}
m_Position: {x: 310, y: 150, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions: []
m_EntryTransitions: []
Expand All @@ -69,4 +43,30 @@ AnimatorStateMachine:
m_EntryPosition: {x: 50, y: 120, z: 0}
m_ExitPosition: {x: 800, y: 120, z: 0}
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
m_DefaultState: {fileID: -2347728340251618517}
m_DefaultState: {fileID: 9194048226351009108}
--- !u!1102 &9194048226351009108
AnimatorState:
serializedVersion: 5
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Armature_Shoot
m_Speed: 1.2
m_CycleOffset: 0
m_Transitions: []
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
m_Mirror: 0
m_SpeedParameterActive: 0
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: c524eb00725d26547a5fb9c989d39fe5, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
19,818 changes: 19,818 additions & 0 deletions Assets/Models/Armature_Shoot.anim
View file
Open in desktop

Large diffs are not rendered by default.

8 changes: 8 additions & 0 deletions Assets/Models/Armature_Shoot.anim.meta
View file
Open in desktop

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

4 changes: 2 additions & 2 deletions Assets/Models/Dahl/dahlsBaseColor.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions Assets/Models/Dummy.fbx
View file
Open in desktop
Git LFS file not shown
101 changes: 101 additions & 0 deletions Assets/Models/Dummy.fbx.meta
View file
Open in desktop

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

3 changes: 3 additions & 0 deletions Assets/Models/LowPolyLightning.fbx
View file
Open in desktop
Git LFS file not shown
110 changes: 110 additions & 0 deletions Assets/Models/LowPolyLightning.fbx.meta
View file
Open in desktop

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

4 changes: 2 additions & 2 deletions Assets/Prefabs/Players/Dahl_Player.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -498,8 +498,8 @@ BoxCollider:
m_IsTrigger: 1
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 2.196698, y: 2.196026, z: 1.849935}
m_Center: {x: 0.075591445, y: 0.25867486, z: 0.21112931}
m_Size: {x: 2.196698, y: 2.196026, z: 2.2490091}
m_Center: {x: 0.075591445, y: 0.25867486, z: 0.41066945}
--- !u!1 &1880419294969973392
GameObject:
m_ObjectHideFlags: 0
Expand Down
Loading