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.

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

Various updates #20

Merged
merged 42 commits into from
Mar 31, 2024
Merged
Changes from 1 commit
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
7dc509b
Merge pull request #5 from cybardev/main
cybardev Mar 9, 2024
453c8fe
Merge pull request #8 from cybardev/main
cybardev Mar 9, 2024
4672436
re: update meta
nazy00 Mar 9, 2024
89da583
Merge branch 'nazy00-dev' of https://github.com/cybardev/Noctrun into…
nazy00 Mar 9, 2024
6fd49ec
re: unity artifacts
cybardev Mar 9, 2024
3359a61
Merge pull request #9 from cybardev/cy-dev
cybardev Mar 9, 2024
d2b0b69
re: moving background, directory tree
cybardev Mar 9, 2024
8bc782b
re: remove redundancies
cybardev Mar 9, 2024
72ccf88
Added enemy spawning script
Mar 10, 2024
a420431
re: formatting
cybardev Mar 14, 2024
094d474
Destroying enemies
Mar 16, 2024
634d130
Merge branch 'Romina03-dev' of https://github.com/cybardev/Noctrun in…
Romina03 Mar 16, 2024
2f690b1
feat: added gecho enemy
nazy00 Mar 16, 2024
ba541e6
fix: despawner behaviour
cybardev Mar 16, 2024
06115d8
Merge branch 'cy-dev' into spawner-dev
cybardev Mar 17, 2024
77c6a0b
Merge branch 'Romina03-dev' into cy-dev
cybardev Mar 17, 2024
a37cf63
feat: create enemy prefab, update directory structure
nazy00 Mar 23, 2024
31c44cf
Merge pull request #10 from cybardev/spawner-dev
cybardev Mar 23, 2024
3ddf432
re: consistent layer naming
nazy00 Mar 23, 2024
52621d2
re: consistent ground colour
nazy00 Mar 23, 2024
2e3aed9
Merge branch 'spawner-dev' into nazy00-dev
cybardev Mar 23, 2024
56f7da8
Merge pull request #13 from cybardev/nazy00-dev
cybardev Mar 23, 2024
c7789fb
feat: diversify enemy prefabs
nazy00 Mar 23, 2024
3ab69f8
Merge branch 'spawner-dev' of https://github.com/cybardev/Noctrun int…
nazy00 Mar 23, 2024
593db4d
feat: added enemy sprites
nazy00 Mar 26, 2024
9de0340
re: moving sprite files
nazy00 Mar 26, 2024
39e8657
re: gitignore and package changes
cybardev Mar 30, 2024
62fc233
re: gitignore and package changes
cybardev Mar 30, 2024
6cc93d4
feat: add TextMeshPro for menu text
cybardev Mar 30, 2024
aa4d4f5
feat: add scripts for main menu
cybardev Mar 30, 2024
7224a67
re: add menu graphics
cybardev Mar 30, 2024
72f883b
feat: add main menu
cybardev Mar 30, 2024
ee4d4c6
feat: add game title to main menu
cybardev Mar 30, 2024
cbbfc26
Merge pull request #18 from cybardev/Romina03-dev
Romina03 Mar 31, 2024
da69450
re: gitignore and package changes
cybardev Mar 30, 2024
6590e26
re: remove redundant folder
cybardev Mar 31, 2024
a30cef8
re: adjust enemy scale
cybardev Mar 31, 2024
efea0ca
Merge pull request #15 from cybardev/spawner-dev
cybardev Mar 31, 2024
231abb7
feat: add death screen
cybardev Mar 31, 2024
09b1a3b
re: unity settings update
cybardev Mar 31, 2024
03efb74
re: consistent tag names
cybardev Mar 31, 2024
6eb1818
Merge pull request #19 from cybardev/cy-dev
cybardev Mar 31, 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
Prev Previous commit
Next Next commit
fix: despawner behaviour
Co-authored-by: Romina03 <romrah03@gmail.com>
  • Loading branch information
cybardev and Romina03 committed Mar 16, 2024
commit ba541e68832198d4668756aed55ad3c2183f733c
8 changes: 8 additions & 0 deletions Assets/Prefabs.meta

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

224 changes: 96 additions & 128 deletions Assets/Obstacle1.prefab → Assets/Prefabs/BtmEnemy.prefab
Original file line number Diff line number Diff line change
@@ -1,151 +1,45 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &1600586032330207317
--- !u!1 &1019025992390204296
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 3355493545945742075}
- component: {fileID: 3585189338871174144}
- component: {fileID: -3310331039835475132}
m_Layer: 0
m_Name: Obstacle1
m_TagString: enemy
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &3355493545945742075
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1600586032330207317}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 2.94, y: 0.63, z: -0.07344667}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 6344713872625677235}
- {fileID: 4081085813870865470}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!50 &3585189338871174144
Rigidbody2D:
serializedVersion: 4
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1600586032330207317}
m_BodyType: 0
m_Simulated: 1
m_UseFullKinematicContacts: 0
m_UseAutoMass: 0
m_Mass: 1
m_LinearDrag: 0
m_AngularDrag: 0.05
m_GravityScale: 1
m_Material: {fileID: 0}
m_IncludeLayers:
serializedVersion: 2
m_Bits: 0
m_ExcludeLayers:
serializedVersion: 2
m_Bits: 0
m_Interpolate: 0
m_SleepingMode: 1
m_CollisionDetection: 0
m_Constraints: 6
--- !u!61 &-3310331039835475132
BoxCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1600586032330207317}
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}
m_SpriteTilingProperty:
border: {x: 0, y: 0, z: 0, w: 0}
pivot: {x: 0, y: 0}
oldSize: {x: 0, y: 0}
newSize: {x: 0, y: 0}
adaptiveTilingThreshold: 0
drawMode: 0
adaptiveTiling: 0
m_AutoTiling: 0
serializedVersion: 2
m_Size: {x: 1, y: 1}
m_EdgeRadius: 0
--- !u!1 &4973273801954461077
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 6344713872625677235}
- component: {fileID: 2471526261508597243}
m_Layer: 0
m_Name: Square
- component: {fileID: 8050328000324324322}
- component: {fileID: 6686617219672748133}
- component: {fileID: 3791139139202019551}
m_Layer: 7
m_Name: Sprite
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &6344713872625677235
--- !u!4 &8050328000324324322
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4973273801954461077}
m_GameObject: {fileID: 1019025992390204296}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 3.1978757, y: -2.6262634, z: 0.07344667}
m_LocalPosition: {x: 0, y: -3, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 3355493545945742075}
m_Father: {fileID: 5590539294725694900}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &2471526261508597243
--- !u!212 &6686617219672748133
SpriteRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4973273801954461077}
m_GameObject: {fileID: 1019025992390204296}
m_Enabled: 1
m_CastShadows: 0
m_ReceiveShadows: 0
@@ -191,34 +85,108 @@ SpriteRenderer:
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!1 &8749015606497988323
--- !u!61 &3791139139202019551
BoxCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1019025992390204296}
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}
m_SpriteTilingProperty:
border: {x: 0, y: 0, z: 0, w: 0}
pivot: {x: 0.5, y: 0.5}
oldSize: {x: 1, y: 1}
newSize: {x: 1, y: 1}
adaptiveTilingThreshold: 0.5
drawMode: 0
adaptiveTiling: 0
m_AutoTiling: 0
serializedVersion: 2
m_Size: {x: 1, y: 1}
m_EdgeRadius: 0
--- !u!1 &6375105881966516211
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 4081085813870865470}
m_Layer: 0
m_Name: GameObject
m_TagString: Untagged
- component: {fileID: 5590539294725694900}
- component: {fileID: 4896323102255750633}
m_Layer: 7
m_Name: BtmEnemy
m_TagString: enemy
m_Icon: {fileID: 8418204508859773708, guid: 0000000000000000d000000000000000, type: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &4081085813870865470
--- !u!4 &5590539294725694900
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8749015606497988323}
m_GameObject: {fileID: 6375105881966516211}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 3.181, y: -3.116, z: 0}
m_LocalPosition: {x: 11, y: 0.4, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 3355493545945742075}
m_Children:
- {fileID: 8050328000324324322}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!50 &4896323102255750633
Rigidbody2D:
serializedVersion: 4
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6375105881966516211}
m_BodyType: 0
m_Simulated: 1
m_UseFullKinematicContacts: 0
m_UseAutoMass: 0
m_Mass: 1
m_LinearDrag: 0
m_AngularDrag: 0.05
m_GravityScale: 1
m_Material: {fileID: 0}
m_IncludeLayers:
serializedVersion: 2
m_Bits: 0
m_ExcludeLayers:
serializedVersion: 2
m_Bits: 0
m_Interpolate: 0
m_SleepingMode: 1
m_CollisionDetection: 1
m_Constraints: 6
File renamed without changes.
Loading