Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
3af85b6
feat: upgrade to unity 6.0.28f1
Elfi0Kuhndorf Nov 29, 2024
8b8989d
fix: disable Render Compatibility Mode to remove warning
Elfi0Kuhndorf Nov 29, 2024
8c60d06
feat: replace ParrelSync with MPPM
Elfi0Kuhndorf Nov 29, 2024
f1707ce
feat: update packages
Elfi0Kuhndorf Nov 29, 2024
19a92c9
chore: update readme and changelog
Elfi0Kuhndorf Nov 29, 2024
f48ec6b
fix: update CI editor version
Elfi0Kuhndorf Nov 29, 2024
7a6febc
feat: add welcome dialogue
Elfi0Kuhndorf Nov 29, 2024
20bf013
fix: add description and title to welcome dialogue
Elfi0Kuhndorf Nov 29, 2024
5ced8cb
Merge branch 'develop' into feat/2d-space-shooter-iet-welcome-dialogue-
Elfi0Kuhndorf Dec 2, 2024
72b17a5
Feat: add Table of Contents to IET
Elfi0Kuhndorf Dec 2, 2024
5b87334
chore: remove in-project readme
Elfi0Kuhndorf Dec 2, 2024
b56ab04
feat: show welcome dialog at startup and mention IET in changelog, fi…
Elfi0Kuhndorf Dec 2, 2024
802eaa3
fix: remove typos and empty spaces from Table of Contents
Elfi0Kuhndorf Dec 2, 2024
f8b3fb2
Fix: remove Update Panel Settings.asset change
Elfi0Kuhndorf Dec 2, 2024
c11d8f7
Update Settings.json to true
Elfi0Kuhndorf Dec 2, 2024
76fe8eb
Fix: Renamed banner and removed redundant code in TutorialCallbacks
Elfi0Kuhndorf Dec 4, 2024
d63aeca
Merge branch 'develop' into feat/2d-space-shooter-iet-welcome-dialogue-
Elfi0Kuhndorf Dec 4, 2024
98d531f
Merge branch 'develop' into feat/2d-space-shooter-iet-welcome-dialogue-
Elfi0Kuhndorf Dec 6, 2024
66225d7
feat: add button to welcome page which leads to network scene
Elfi0Kuhndorf Dec 6, 2024
cd1095a
Fix: remove second welcome dialogue button, first button closes windo…
Elfi0Kuhndorf Dec 9, 2024
1b91616
feat: adding new input system and adjusting ShipControl.cs as well as…
Elfi0Kuhndorf Dec 11, 2024
5786cac
Merge branch 'develop' into feat/2d-space-shooter/new-input-system
Elfi0Kuhndorf Dec 11, 2024
a405c43
Update CHANGELOG.md
Elfi0Kuhndorf Dec 11, 2024
98bc36d
feat: adjust input system to include serialized fields and link input…
Elfi0Kuhndorf Dec 13, 2024
a72b26f
fix: set player settings to new input system only, replacing old with…
Elfi0Kuhndorf Dec 16, 2024
990a57b
Merge branch 'develop' into feat/2d-space-shooter/new-input-system
Elfi0Kuhndorf Dec 17, 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
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ MonoBehaviour:
networked 2D and physics-based character movement. This sample leverages Netcode
for GameObject's NetworkRigidbody2D component and also showcases object pooling.
\n \nThe entry scene for this game is the network scene. From there a game
can be hosted or an existing game can be joined. Control the ship using the
arrow keys and shoot asteroids (or other players!) using the spacebar. Fly
over pickups in the scene to get different temporary buffs for your ship (like
increased fly speed or shooting extra bullets)."
can be hosted or an existing game can be joined. Control the ship using WASD
or the arrow keys and shoot asteroids (or other players!) using the spacebar.
Fly over pickups in the scene to get different temporary buffs for your ship
(like increased fly speed or shooting extra bullets)."
m_Buttons:
- Text:
m_Untranslated: I'll explore on my own
Expand Down
185 changes: 179 additions & 6 deletions Basic/2DSpaceShooter/Assets/Prefabs/Ship.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ GameObject:
- component: {fileID: -8406883944196582507}
- component: {fileID: 7896695181562740567}
- component: {fileID: 530804693587457726}
- component: {fileID: 1162743714554633398}
m_Layer: 0
m_Name: Ship
m_TagString: Untagged
Expand All @@ -45,7 +46,7 @@ Transform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!50 &5000000
Rigidbody2D:
serializedVersion: 4
serializedVersion: 5
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
Expand All @@ -56,8 +57,8 @@ Rigidbody2D:
m_UseFullKinematicContacts: 0
m_UseAutoMass: 0
m_Mass: 1
m_LinearDrag: 0.3
m_AngularDrag: 0.05
m_LinearDamping: 0.3
m_AngularDamping: 0.05
m_GravityScale: 0
m_Material: {fileID: 0}
m_IncludeLayers:
Expand All @@ -78,6 +79,7 @@ CircleCollider2D:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 100000}
m_Enabled: 1
serializedVersion: 3
m_Density: 1
m_Material: {fileID: 0}
m_IncludeLayers:
Expand All @@ -101,9 +103,9 @@ CircleCollider2D:
m_Bits: 4294967295
m_IsTrigger: 0
m_UsedByEffector: 0
m_UsedByComposite: 0
m_CompositeOperation: 0
m_CompositeOrder: 0
m_Offset: {x: 0, y: 0}
serializedVersion: 2
m_Radius: 0.64
--- !u!114 &509584576524893815
MonoBehaviour:
Expand All @@ -117,14 +119,19 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: d5a57f767e5e46a458fc5d3c628d0cbb, type: 3}
m_Name:
m_EditorClassIdentifier:
GlobalObjectIdHash: 4192032552
GlobalObjectIdHash: 1673054159
InScenePlacedSourceGlobalObjectIdHash: 0
DeferredDespawnTick: 0
Ownership: 1
AlwaysReplicateAsRoot: 0
SynchronizeTransform: 1
ActiveSceneSynchronization: 0
SceneMigrationSynchronization: 1
SpawnWithObservers: 1
DontDestroyWithOwner: 0
AutoObjectParentSync: 1
SyncOwnerTransformWhenParented: 1
AllowOwnerToParent: 0
--- !u!114 &11400004
MonoBehaviour:
m_ObjectHideFlags: 0
Expand All @@ -137,6 +144,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 20245cd93c1121d429c5bc04f9cc3e0a, type: 3}
m_Name:
m_EditorClassIdentifier:
ShowTopMostFoldoutHeaderGroup: 1
BulletPrefab: {fileID: 100000, guid: f7120fa7a008f8d4fa6c6bb280d092ad, type: 3}
fireSound: {fileID: 8200002}
Health:
Expand Down Expand Up @@ -197,6 +205,112 @@ MonoBehaviour:
m_ShipGlow: {fileID: 5983711199006031825}
m_ShipGlowDefaultColor: {r: 1, g: 1, b: 1, a: 1}
m_UIDocument: {fileID: 7896695181562740567}
fireAction:
m_Name: Fire
m_Type: 0
m_ExpectedControlType:
m_Id: 0268970e-8a74-4996-b436-8e60ea448350
m_Processors:
m_Interactions: Hold
m_SingletonActionBindings:
- m_Name:
m_Id: ee1be890-ec44-4e1d-8d18-a54eda096163
m_Path: <Keyboard>/space
m_Interactions:
m_Processors:
m_Groups:
m_Action: Fire
m_Flags: 0
m_Flags: 0
moveAction:
m_Name: Move
m_Type: 0
m_ExpectedControlType:
m_Id: 8067b4e4-e164-4ac6-9a77-00cfae17e1a9
m_Processors:
m_Interactions:
m_SingletonActionBindings:
- m_Name: 2D Vector
m_Id: b325c64f-e931-4e8e-96e6-d4ad495996b9
m_Path: 2DVector
m_Interactions:
m_Processors:
m_Groups:
m_Action: Move
m_Flags: 4
- m_Name: up
m_Id: b4825647-320e-4e1d-8d99-9f77220e3511
m_Path: <Keyboard>/w
m_Interactions:
m_Processors:
m_Groups:
m_Action: Move
m_Flags: 8
- m_Name: down
m_Id: 625a477f-d233-4cb5-b4ba-84995422eae9
m_Path: <Keyboard>/s
m_Interactions:
m_Processors:
m_Groups:
m_Action: Move
m_Flags: 8
- m_Name: left
m_Id: 20326d9c-c108-4bce-90b5-41811803b616
m_Path: <Keyboard>/a
m_Interactions:
m_Processors:
m_Groups:
m_Action: Move
m_Flags: 8
- m_Name: right
m_Id: 73014618-69ef-428d-98ed-92f69ffe6dc0
m_Path: <Keyboard>/d
m_Interactions:
m_Processors:
m_Groups:
m_Action: Move
m_Flags: 8
- m_Name: 2D Vector
m_Id: 873f28f7-0fae-4426-9ecc-a7479f5e2224
m_Path: 2DVector
m_Interactions:
m_Processors:
m_Groups:
m_Action: Move
m_Flags: 4
- m_Name: up
m_Id: cfe488d9-e756-453f-a9ea-f39a3c6334a1
m_Path: <Keyboard>/upArrow
m_Interactions:
m_Processors:
m_Groups:
m_Action: Move
m_Flags: 8
- m_Name: down
m_Id: 118d6657-71d5-4470-9719-5c2d07328998
m_Path: <Keyboard>/downArrow
m_Interactions:
m_Processors:
m_Groups:
m_Action: Move
m_Flags: 8
- m_Name: left
m_Id: de74a645-fa75-4988-8736-df13fb0d4f9e
m_Path: <Keyboard>/leftArrow
m_Interactions:
m_Processors:
m_Groups:
m_Action: Move
m_Flags: 8
- m_Name: right
m_Id: 1413ee9d-5d6f-4e14-a81f-076d94c6c6dc
m_Path: <Keyboard>/rightArrow
m_Interactions:
m_Processors:
m_Groups:
m_Action: Move
m_Flags: 8
m_Flags: 0
--- !u!82 &8200000
AudioSource:
m_ObjectHideFlags: 0
Expand All @@ -209,6 +323,7 @@ AudioSource:
OutputAudioMixerGroup: {fileID: 7606457927174882171, guid: 5a7e2197c4000c8449830bc6b760d2c7,
type: 2}
m_audioClip: {fileID: 8300000, guid: beef3b8e3a803a846bb8c6fd4f844ddd, type: 3}
m_Resource: {fileID: 8300000, guid: beef3b8e3a803a846bb8c6fd4f844ddd, type: 3}
m_PlayOnAwake: 1
m_Volume: 0.455
m_Pitch: 1
Expand Down Expand Up @@ -305,6 +420,7 @@ AudioSource:
serializedVersion: 4
OutputAudioMixerGroup: {fileID: 0}
m_audioClip: {fileID: 8300000, guid: cc129677ab3dbe14494fe4ee9e0dadc4, type: 3}
m_Resource: {fileID: 8300000, guid: cc129677ab3dbe14494fe4ee9e0dadc4, type: 3}
m_PlayOnAwake: 0
m_Volume: 0.328
m_Pitch: 0.79
Expand Down Expand Up @@ -402,6 +518,11 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: e96cb6065543e43c4a752faaa1468eb1, type: 3}
m_Name:
m_EditorClassIdentifier:
ShowTopMostFoldoutHeaderGroup: 1
NetworkTransformExpanded: 0
AuthorityMode: 0
TickSyncChildren: 0
UseUnreliableDeltas: 0
SyncPositionX: 1
SyncPositionY: 1
SyncPositionZ: 1
Expand All @@ -418,6 +539,7 @@ MonoBehaviour:
UseQuaternionCompression: 0
UseHalfFloatPrecision: 0
InLocalSpace: 0
SwitchTransformSpaceWhenParented: 0
Interpolate: 1
SlerpPosition: 0
--- !u!114 &-8406883944196582507
Expand All @@ -432,6 +554,11 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 80d7c879794dfda4687da0e400131852, type: 3}
m_Name:
m_EditorClassIdentifier:
ShowTopMostFoldoutHeaderGroup: 1
NetworkRigidbodyBaseExpanded: 0
UseRigidBodyForMotion: 0
AutoUpdateKinematicState: 1
AutoSetKinematicOnDespawn: 1
--- !u!114 &7896695181562740567
MonoBehaviour:
m_ObjectHideFlags: 0
Expand All @@ -449,6 +576,9 @@ MonoBehaviour:
sourceAsset: {fileID: 9197481963319205126, guid: 76454dd33610f9640aaf91de0a03d878,
type: 3}
m_SortingOrder: 0
m_WorldSpaceSizeMode: 1
m_WorldSpaceWidth: 1920
m_WorldSpaceHeight: 1080
--- !u!210 &530804693587457726
SortingGroup:
m_ObjectHideFlags: 0
Expand All @@ -461,6 +591,37 @@ SortingGroup:
m_SortingLayer: 7
m_SortingOrder: 0
m_SortAtRoot: 0
--- !u!114 &1162743714554633398
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 100000}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 62899f850307741f2a39c98a8b639597, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Actions: {fileID: -944628639613478452, guid: fc3562075b12d504e8d3dce4ca0e0150,
type: 3}
m_NotificationBehavior: 0
m_UIInputModule: {fileID: 0}
m_DeviceLostEvent:
m_PersistentCalls:
m_Calls: []
m_DeviceRegainedEvent:
m_PersistentCalls:
m_Calls: []
m_ControlsChangedEvent:
m_PersistentCalls:
m_Calls: []
m_ActionEvents: []
m_NeverAutoSwitchControlSchemes: 0
m_DefaultControlScheme:
m_DefaultActionMap: Player
m_SplitScreenIndex: -1
m_Camera: {fileID: 0}
--- !u!1 &100002
GameObject:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -5250,6 +5411,9 @@ ParticleSystemRenderer:
m_ReflectionProbeUsage: 0
m_RayTracingMode: 0
m_RayTraceProcedural: 0
m_RayTracingAccelStructBuildFlagsOverride: 0
m_RayTracingAccelStructBuildFlags: 1
m_SmallMeshCulling: 1
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
Expand Down Expand Up @@ -10095,6 +10259,9 @@ ParticleSystemRenderer:
m_ReflectionProbeUsage: 0
m_RayTracingMode: 0
m_RayTraceProcedural: 0
m_RayTracingAccelStructBuildFlagsOverride: 0
m_RayTracingAccelStructBuildFlags: 1
m_SmallMeshCulling: 1
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
Expand Down Expand Up @@ -10202,6 +10369,9 @@ SpriteRenderer:
m_ReflectionProbeUsage: 0
m_RayTracingMode: 0
m_RayTraceProcedural: 0
m_RayTracingAccelStructBuildFlagsOverride: 0
m_RayTracingAccelStructBuildFlags: 1
m_SmallMeshCulling: 1
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
Expand Down Expand Up @@ -10286,6 +10456,9 @@ SpriteRenderer:
m_ReflectionProbeUsage: 0
m_RayTracingMode: 0
m_RayTraceProcedural: 0
m_RayTracingAccelStructBuildFlagsOverride: 0
m_RayTracingAccelStructBuildFlags: 1
m_SmallMeshCulling: 1
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
Expand Down
Loading