Skip to content

Fix/resolving todos and suggestions in comments 2dspaceshooter #167

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
RikuTheFuffs merged 11 commits into from
Apr 30, 2024
Merged

Fix/resolving todos and suggestions in comments 2dspaceshooter #167

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
5b4fd90
fixed some more comment typos and resolved todo in shipcontrol.cs plu…
Elfi0Kuhndorf Apr 15, 2024
5c485d1
adding a local pool for explosion spawning, adding comment for buff r…
Elfi0Kuhndorf Apr 23, 2024
0164e9a
removing unneeded lines and reformatting
Elfi0Kuhndorf Apr 23, 2024
a079314
Merge branch 'develop' into fix/resolving-todos-and-suggestions-in-co…
Elfi0Kuhndorf Apr 23, 2024
deb3bc8
deleted unneeded library reference
Elfi0Kuhndorf Apr 24, 2024
e9e03f2
trying to implement built-in pooling class into new script
Elfi0Kuhndorf Apr 26, 2024
4382c08
feat: added pooling system for explosion particles of bullet by using…
Elfi0Kuhndorf Apr 29, 2024
46b18dc
fix: cleanup of bullet and exlosionsPool script and creating of pool …
Elfi0Kuhndorf Apr 30, 2024
f35f5a8
deleted former custom object pool script as it is unused now
Elfi0Kuhndorf Apr 30, 2024
c3b6d02
adjusted CHANGELOG
Elfi0Kuhndorf Apr 30, 2024
35d6e90
Merge branch 'develop' into fix/resolving-todos-and-suggestions-in-co…
Elfi0Kuhndorf Apr 30, 2024
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
71 changes: 55 additions & 16 deletions Basic/2DSpaceShooter/Assets/Prefabs/Bullet.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ GameObject:
- component: {fileID: 21200000}
- component: {fileID: 5000000}
- component: {fileID: 5800000}
- component: {fileID: 11400004}
- component: {fileID: -4113703611147433057}
- component: {fileID: 11400004}
m_Layer: 0
m_Name: Bullet
m_TagString: Untagged
Expand All @@ -28,6 +28,7 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 100000}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 17.05494, y: -1.1583278, z: 0}
m_LocalScale: {x: 0.6, y: 0.6, z: 0.6}
Expand All @@ -37,7 +38,6 @@ Transform:
- {fileID: 2541587719488337929}
- {fileID: 437137293806936037}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &21200000
SpriteRenderer:
Expand Down Expand Up @@ -108,6 +108,12 @@ Rigidbody2D:
m_AngularDrag: 0.05
m_GravityScale: 0
m_Material: {fileID: 0}
m_IncludeLayers:
serializedVersion: 2
m_Bits: 0
m_ExcludeLayers:
serializedVersion: 2
m_Bits: 0
m_Interpolate: 1
m_SleepingMode: 1
m_CollisionDetection: 1
Expand All @@ -122,13 +128,32 @@ CircleCollider2D:
m_Enabled: 1
m_Density: 1
m_Material: {fileID: 0}
m_IncludeLayers:
serializedVersion: 2
m_Bits: 0
m_ExcludeLayers:
serializedVersion: 2
m_Bits: 0
m_LayerOverridePriority: 0
m_ForceSendLayers:
serializedVersion: 2
m_Bits: 4294967295
m_ForceReceiveLayers:
serializedVersion: 2
m_Bits: 4294967295
m_ContactCaptureLayers:
serializedVersion: 2
m_Bits: 4294967295
m_CallbackLayers:
serializedVersion: 2
m_Bits: 4294967295
m_IsTrigger: 0
m_UsedByEffector: 0
m_UsedByComposite: 0
m_Offset: {x: 0, y: 0}
serializedVersion: 2
m_Radius: 0.2
--- !u!114 &11400004
--- !u!114 &-4113703611147433057
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
Expand All @@ -137,11 +162,18 @@ MonoBehaviour:
m_GameObject: {fileID: 100000}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 3cd7bb63a91d2a644b2775fdf8fa9087, type: 3}
m_Script: {fileID: 11500000, guid: d5a57f767e5e46a458fc5d3c628d0cbb, type: 3}
m_Name:
m_EditorClassIdentifier:
explosionParticle: {fileID: 100000, guid: 9f490055b474c5b499c694b9f707abb0, type: 3}
--- !u!114 &-4113703611147433057
GlobalObjectIdHash: 4230786284
AlwaysReplicateAsRoot: 0
SynchronizeTransform: 1
ActiveSceneSynchronization: 0
SceneMigrationSynchronization: 1
SpawnWithObservers: 1
DontDestroyWithOwner: 0
AutoObjectParentSync: 0
--- !u!114 &11400004
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
Expand All @@ -150,13 +182,10 @@ MonoBehaviour:
m_GameObject: {fileID: 100000}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d5a57f767e5e46a458fc5d3c628d0cbb, type: 3}
m_Script: {fileID: 11500000, guid: 3cd7bb63a91d2a644b2775fdf8fa9087, type: 3}
m_Name:
m_EditorClassIdentifier:
GlobalObjectIdHash: 951099334
AlwaysReplicateAsRoot: 0
DontDestroyWithOwner: 0
AutoObjectParentSync: 0
particles: {fileID: 19800000, guid: 9f490055b474c5b499c694b9f707abb0, type: 3}
--- !u!1 &1734169577680067239
GameObject:
m_ObjectHideFlags: 0
Expand All @@ -181,17 +210,17 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1734169577680067239}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1.6666665, y: 1.6666665, z: 1.6666665}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 400000}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!96 &8001524962857443883
TrailRenderer:
serializedVersion: 2
serializedVersion: 3
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
Expand Down Expand Up @@ -232,6 +261,7 @@ TrailRenderer:
m_SortingLayer: 7
m_SortingOrder: 0
m_Time: 0.1
m_PreviewTimeScale: 1
m_Parameters:
serializedVersion: 3
widthMultiplier: 1
Expand Down Expand Up @@ -286,17 +316,21 @@ TrailRenderer:
atime6: 0
atime7: 0
m_Mode: 0
m_ColorSpace: -1
m_NumColorKeys: 2
m_NumAlphaKeys: 2
numCornerVertices: 0
numCapVertices: 0
alignment: 0
textureMode: 0
textureScale: {x: 1, y: 1}
shadowBias: 0.5
generateLightingData: 0
m_MinVertexDistance: 0.2
m_MaskInteraction: 0
m_Autodestruct: 0
m_Emitting: 1
m_ApplyActiveColorSpace: 0
--- !u!1 &5834909677899066770
GameObject:
m_ObjectHideFlags: 0
Expand All @@ -321,13 +355,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5834909677899066770}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.6784176, y: 0.6784176, z: 0.6784176}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 400000}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &7281275371523386705
SpriteRenderer:
Expand Down Expand Up @@ -405,17 +439,17 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8201526709602511825}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1.2764332, y: 1.2764332, z: 1.2764332}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 400000}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!96 &6763641590727656120
TrailRenderer:
serializedVersion: 2
serializedVersion: 3
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
Expand Down Expand Up @@ -456,6 +490,7 @@ TrailRenderer:
m_SortingLayer: 7
m_SortingOrder: 5
m_Time: 0.04
m_PreviewTimeScale: 1
m_Parameters:
serializedVersion: 3
widthMultiplier: 1
Expand Down Expand Up @@ -510,14 +545,18 @@ TrailRenderer:
atime6: 0
atime7: 0
m_Mode: 0
m_ColorSpace: -1
m_NumColorKeys: 2
m_NumAlphaKeys: 2
numCornerVertices: 0
numCapVertices: 0
alignment: 0
textureMode: 0
textureScale: {x: 1, y: 1}
shadowBias: 0.5
generateLightingData: 0
m_MinVertexDistance: 0.1
m_MaskInteraction: 0
m_Autodestruct: 0
m_Emitting: 1
m_ApplyActiveColorSpace: 0
Loading