Skip to content

Feature/pswd owl.weapon alignment #17

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
Sturlock wants to merge 19 commits into
base: develop
Choose a base branch
from
Open

Feature/pswd owl.weapon alignment #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
ecb26cd
Moving JMO Assets
Sturlock Jan 20, 2026
ab0461e
Moving Classes
Sturlock Jan 25, 2026
6e764a7
Hooking up Stats - Broken AimDownSight
Sturlock Feb 1, 2026
10015f5
Saving Scene
Sturlock Feb 1, 2026
0d50985
Fixing AimDownSight
Sturlock Feb 2, 2026
985de1c
Camera Recoil fixed
Sturlock Feb 2, 2026
ee09d1e
Weapon Sway using the Rear Grip Stats
Sturlock Feb 2, 2026
1a14ace
Fixed Bullets following the gun
Sturlock Feb 2, 2026
ccd2d11
Fixed Weapon Recoil
Sturlock Feb 2, 2026
d1b39cd
Serializing Stats
Sturlock Feb 2, 2026
d377179
Fixed Bullet Spread
Sturlock Feb 2, 2026
d42f633
Added Odin Inspector
Sturlock Feb 7, 2026
28b90c6
Added vFolders
Sturlock Feb 7, 2026
7c06f36
Moved Raycast
Sturlock Feb 7, 2026
825f0c7
Part Name has property
Sturlock Feb 7, 2026
f44adf2
Code Clean
Sturlock Feb 7, 2026
7a07657
Odin
Sturlock Feb 7, 2026
5b72851
Parts have Coliders
Sturlock Feb 7, 2026
e1e4b61
Part Factories
Sturlock Feb 7, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
3 changes: 2 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,4 +59,5 @@ sysinfo.txt
crashlytics-build.properties

# Rider
.idea
.idea
UserSettings/Layouts
25 changes: 16 additions & 9 deletions Assets/Bullet.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ Transform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!96 &2191364406392699299
TrailRenderer:
serializedVersion: 3
serializedVersion: 4
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
Expand All @@ -53,6 +53,8 @@ TrailRenderer:
m_RayTracingAccelStructBuildFlagsOverride: 0
m_RayTracingAccelStructBuildFlags: 1
m_SmallMeshCulling: 1
m_ForceMeshLod: -1
m_MeshLodSelectionBias: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
Expand All @@ -74,9 +76,11 @@ TrailRenderer:
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_GlobalIlluminationMeshLod: 0
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_MaskInteraction: 0
m_Time: 0.1
m_PreviewTimeScale: 1
m_Parameters:
Expand Down Expand Up @@ -144,7 +148,6 @@ TrailRenderer:
shadowBias: 0.5
generateLightingData: 0
m_MinVertexDistance: 0.1
m_MaskInteraction: 0
m_Autodestruct: 0
m_Emitting: 1
m_ApplyActiveColorSpace: 1
Expand Down Expand Up @@ -211,6 +214,8 @@ MeshRenderer:
m_RayTracingAccelStructBuildFlagsOverride: 0
m_RayTracingAccelStructBuildFlags: 1
m_SmallMeshCulling: 1
m_ForceMeshLod: -1
m_MeshLodSelectionBias: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
Expand All @@ -232,9 +237,11 @@ MeshRenderer:
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_GlobalIlluminationMeshLod: 0
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_MaskInteraction: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!114 &1016767021378617157
MonoBehaviour:
Expand All @@ -248,10 +255,10 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 218b737391f85dd4180d05e543792df7, type: 3}
m_Name:
m_EditorClassIdentifier:
Mass: 0.01
Diameter: 0.0075
DragCoefficient: 0.295
MuzzleVelocity: 400
MaxLifeTime: 5
Damage: 0
ImpactGraphic: {fileID: 100006, guid: 9e95c7b2183a4f345aaf86846f8f1918, type: 3}
_Mass: 0.01
_Diameter: 0.0075
_DragCoefficient: 0.295
_MuzzleVelocity: 400
_MaxLifeTime: 5
_Damage: 0
_ImpactGraphic: {fileID: 100006, guid: 9e95c7b2183a4f345aaf86846f8f1918, type: 3}
2 changes: 1 addition & 1 deletion Assets/Editor/WeaponSwayEditor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ public override void OnInspectorGUI()

EditorGUILayout.Space();
EditorGUILayout.LabelField("Tilt", EditorStyles.boldLabel);
DrawFields("_TiltAmountAiming", "_MaxTiltAmountAiming", "_TiltSmoothnessAming");
DrawFields("_TiltAmountAiming", "_MaxTiltAmountAiming", "_TiltSmoothnessAiming");

EditorGUILayout.Space();
EditorGUILayout.LabelField("Rotation", EditorStyles.boldLabel);
Expand Down
Loading
Loading