Skip to content

Throwing an object #169

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

Open
Art1Alen wants to merge 1 commit into
base: MVP/january-22
Choose a base branch
from
Open

Throwing an object #169

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
324 changes: 323 additions & 1 deletion Assets/AdditiveAssets/Animations/Controllers/CharacterAnimator.controller
View file
Open in desktop

Large diffs are not rendered by default.

79 changes: 0 additions & 79 deletions Assets/AdditiveAssets/PolygonDungeon/Prefabs/Weapons/SM_Wep_Ornate_Spear_01.prefab
View file
Open in desktop

This file was deleted.

20 changes: 14 additions & 6 deletions ...haracter Animation Pack/Animations/2Hand-Spear/RPG-Character@2Hand-Spear-Attack1.FBX.meta
View file
Open in desktop

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

1 change: 1 addition & 0 deletions Assets/Prefabs/Camera/AimingCameraSettings
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"m_ExcludedPropertiesInInspector":["m_Script"],"m_LockStageInInspector":[],"m_StreamingVersion":20170927,"m_Priority":1,"m_StandbyUpdate":2,"m_LookAt":{"instanceID":-116606},"m_Follow":{"instanceID":-116624},"m_Lens":{"FieldOfView":40.0,"OrthographicSize":10.0,"NearClipPlane":0.10000000149011612,"FarClipPlane":5000.0,"Dutch":0.0,"LensShift":{"x":0.0,"y":0.0}},"m_Transitions":{"m_BlendHint":0,"m_InheritPosition":false,"m_OnCameraLive":{"m_PersistentCalls":{"m_Calls":[]}}},"m_LegacyBlendHint":0,"m_ComponentOwner":{"instanceID":-116830}}
71 changes: 36 additions & 35 deletions Assets/Prefabs/Camera/CharacterCamera.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ GameObject:
- component: {fileID: 866519502732303243}
- component: {fileID: 5296010943117555874}
- component: {fileID: 1212817342207986080}
- component: {fileID: 6619518661579173271}
- component: {fileID: -5309801519283387879}
- component: {fileID: -3007506311331637017}
- component: {fileID: 1987854134632997052}
m_Layer: 14
m_Name: CharacterCamera
m_TagString: Untagged
Expand Down Expand Up @@ -86,40 +86,6 @@ AudioListener:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5706404660592424878}
m_Enabled: 1
--- !u!114 &6619518661579173271
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5706404660592424878}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 72ece51f2901e7445ab60da3685d6b5f, type: 3}
m_Name:
m_EditorClassIdentifier:
m_ShowDebugText: 0
m_ShowCameraFrustum: 1
m_IgnoreTimeScale: 0
m_WorldUpOverride: {fileID: 0}
m_UpdateMethod: 2
m_BlendUpdateMethod: 1
m_DefaultBlend:
m_Style: 6
m_Time: 1
m_CustomCurve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
m_CustomBlends: {fileID: 0}
m_CameraCutEvent:
m_PersistentCalls:
m_Calls: []
m_CameraActivatedEvent:
m_PersistentCalls:
m_Calls: []
--- !u!114 &-5309801519283387879
MonoBehaviour:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -197,3 +163,38 @@ MonoBehaviour:
m_BeforeTransparentBundles: []
m_BeforeStackBundles: []
m_AfterStackBundles: []
--- !u!114 &1987854134632997052
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5706404660592424878}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 72ece51f2901e7445ab60da3685d6b5f, type: 3}
m_Name:
m_EditorClassIdentifier:
m_ShowDebugText: 0
m_ShowCameraFrustum: 1
m_IgnoreTimeScale: 0
m_WorldUpOverride: {fileID: 3520822708366150838, guid: ffe73034ef64698439bb105d6f12a131,
type: 3}
m_UpdateMethod: 2
m_BlendUpdateMethod: 1
m_DefaultBlend:
m_Style: 1
m_Time: 2
m_CustomCurve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
m_CustomBlends: {fileID: 0}
m_CameraCutEvent:
m_PersistentCalls:
m_Calls: []
m_CameraActivatedEvent:
m_PersistentCalls:
m_Calls: []
6 changes: 3 additions & 3 deletions Assets/Prefabs/Camera/CharacterCinemachineFreeLookCamera.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,9 +134,9 @@ MonoBehaviour:
m_Radius: 3
m_LegacyHeadingBias: 3.4028235e+38
m_Rigs:
- {fileID: 2246525864862354444}
- {fileID: 974905659885226226}
- {fileID: 4871545544448849895}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
--- !u!114 &-172189964953927634
MonoBehaviour:
m_ObjectHideFlags: 0
Expand Down
1 change: 1 addition & 0 deletions Assets/Prefabs/Camera/FreeLookCameraSettings
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"m_ExcludedPropertiesInInspector":["m_Script"],"m_LockStageInInspector":[],"m_StreamingVersion":20170927,"m_Priority":0,"m_StandbyUpdate":0,"m_LookAt":{"instanceID":-116624},"m_Follow":{"instanceID":-116624},"m_CommonLens":true,"m_Lens":{"FieldOfView":45.0,"OrthographicSize":10.0,"NearClipPlane":0.10000000149011612,"FarClipPlane":5000.0,"Dutch":0.0,"LensShift":{"x":0.0,"y":0.0}},"m_Transitions":{"m_BlendHint":0,"m_InheritPosition":false,"m_OnCameraLive":{"m_PersistentCalls":{"m_Calls":[]}}},"m_LegacyBlendHint":0,"m_YAxis":{"Value":0.43944472074508669,"m_SpeedMode":0,"m_MaxSpeed":0.0,"m_AccelTime":0.20000000298023225,"m_DecelTime":0.10000000149011612,"m_InputAxisName":"Mouse Y","m_InputAxisValue":0.5547001957893372,"m_InvertInput":true,"m_MinValue":0.0,"m_MaxValue":1.0,"m_Wrap":false,"m_Recentering":{"m_enabled":false,"m_WaitTime":1.0,"m_RecenteringTime":2.0,"m_LegacyHeadingDefinition":-1,"m_LegacyVelocityFilterStrength":-1}},"m_YAxisRecentering":{"m_enabled":true,"m_WaitTime":1.0,"m_RecenteringTime":2.0,"m_LegacyHeadingDefinition":-1,"m_LegacyVelocityFilterStrength":-1},"m_XAxis":{"Value":99.58268737792969,"m_SpeedMode":0,"m_MaxSpeed":0.0,"m_AccelTime":0.10000000149011612,"m_DecelTime":0.10000000149011612,"m_InputAxisName":"Mouse X","m_InputAxisValue":-0.8320503234863281,"m_InvertInput":false,"m_MinValue":-180.0,"m_MaxValue":180.0,"m_Wrap":true,"m_Recentering":{"m_enabled":false,"m_WaitTime":1.0,"m_RecenteringTime":2.0,"m_LegacyHeadingDefinition":-1,"m_LegacyVelocityFilterStrength":-1}},"m_Heading":{"m_Definition":2,"m_VelocityFilterStrength":4,"m_Bias":0.0},"m_RecenterToTargetHeading":{"m_enabled":true,"m_WaitTime":1.0,"m_RecenteringTime":0.0,"m_LegacyHeadingDefinition":-1,"m_LegacyVelocityFilterStrength":-1},"m_BindingMode":4,"m_SplineCurvature":0.20000000298023225,"m_Orbits":[{"m_Height":5.0,"m_Radius":3.0},{"m_Height":2.0,"m_Radius":5.0},{"m_Height":-1.0,"m_Radius":3.0}],"m_LegacyHeadingBias":3.4028234663852887e38,"m_Rigs":[{"instanceID":-116760},{"instanceID":-116776},{"instanceID":-116792}]}
1 change: 1 addition & 0 deletions Assets/Prefabs/Camera/TargetingCameraSettings
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"m_ExcludedPropertiesInInspector":["m_Script"],"m_LockStageInInspector":[],"m_StreamingVersion":20170927,"m_Priority":0,"m_StandbyUpdate":2,"m_LookAt":{"instanceID":-116624},"m_Follow":{"instanceID":-116624},"m_Lens":{"FieldOfView":179.0,"OrthographicSize":10.0,"NearClipPlane":0.10000000149011612,"FarClipPlane":5000.0,"Dutch":180.0,"LensShift":{"x":0.0,"y":0.0}},"m_Transitions":{"m_BlendHint":0,"m_InheritPosition":false,"m_OnCameraLive":{"m_PersistentCalls":{"m_Calls":[]}}},"m_LegacyBlendHint":0,"m_ComponentOwner":{"instanceID":-116812}}
28 changes: 17 additions & 11 deletions Assets/Prefabs/PrefabsForUI/ButtonsInfo.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ MonoBehaviour:
m_GameObject: {fileID: 83319439658842619}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 1980459831, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
m_Name:
m_EditorClassIdentifier:
m_UiScaleMode: 0
Expand All @@ -82,6 +82,7 @@ MonoBehaviour:
m_FallbackScreenDPI: 96
m_DefaultSpriteDPI: 96
m_DynamicPixelsPerUnit: 1
m_PresetInfoIsWorld: 0
--- !u!222 &3855749325379443415
CanvasRenderer:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -145,17 +146,17 @@ MonoBehaviour:
m_GameObject: {fileID: 83319439793488875}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: 4d50a426daedff74ba42d34fe4d6730d, type: 3}
m_Type: 0
m_PreserveAspect: 0
Expand All @@ -165,6 +166,7 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!1 &4493658179122568865
GameObject:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -219,17 +221,17 @@ MonoBehaviour:
m_GameObject: {fileID: 4493658179122568865}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 12800000, guid: e3265ab4bf004d28a9537516768c1c75, type: 3}
m_FontSize: 12
Expand All @@ -247,20 +249,24 @@ MonoBehaviour:

LMB - attack / place trap

RMB - aim / targetMode
RMB - aim
/ targetMode

TAB - open weapon wheel

C - sneak (slide while running)

SPACE - roll forward / dodge (direction is controlled by WASD)
SPACE
- roll forward / dodge (direction is controlled by WASD)

E - interact

B - Open/close Bestiary
B
- Open/close Bestiary

L - Open/close time skip menu (not working now)

` - Open/close this window
`
- Open/close this window

'
Loading