Skip to content

Commit

Permalink
Main menu branch for cout and c#sama (#111)
Browse files Browse the repository at this point in the history
* Main menu, settings menu and some of the pause menu

that

* Update Main.unity

* Attempting to fix the enemies not dying.

* Attempt #2 at the fix of the Enemy movement

* Attempt at fixing the object destruction.

* Update Enemy.cs

* Attempt to create the controller for the hiding of the pause menu

* Fixed the empty statemnt with the GetComponent

* Pause in progress

* comments

* Opened screen on pause

* Fixed GameOver Weird Text

* Fixing merge errors

* Update GameController.cs

* Fixed Gameover cycle

* Made the pause menu Escape

* Fixed Main menu

* making health class public

* Fixed enemy paused

* Update MainMenu.cs

* lots o changes

* Fixed enemy movement bug

* left behind

* MainMenu Button

* Level Improvement

* ClickSound

* trying to resolve merging conflict

* bug fixes

* another merging trial

* another one

* Revert "another one"

This reverts commit 3af937c.

* more UI stuff

* some bug fixes

* DONE

* fix

Co-authored-by: Cout-Nico-F <[email protected]>
Co-authored-by: IAmBot102102 <[email protected]>
Co-authored-by: GraphicEdit <[email protected]>
  • Loading branch information
4 people authored Mar 29, 2020
1 parent 7056474 commit eed035a
Show file tree
Hide file tree
Showing 25 changed files with 8,187 additions and 65 deletions.
18 changes: 18 additions & 0 deletions BlueProject/Assets/Prefabs/PlayerShipCONTROL.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ GameObject:
- component: {fileID: 2678429340488441272}
- component: {fileID: 21093653834913781}
- component: {fileID: 5567224576741245701}
- component: {fileID: 1790502381803552541}
m_Layer: 0
m_Name: ShipA
m_TagString: Player
Expand Down Expand Up @@ -128,6 +129,7 @@ MonoBehaviour:
shieldDuration: 1
shield: {fileID: 3743869059860946831}
speed: 1500
controller: {fileID: 0}
--- !u!50 &5567224576741245701
Rigidbody2D:
serializedVersion: 4
Expand All @@ -149,6 +151,22 @@ Rigidbody2D:
m_SleepingMode: 1
m_CollisionDetection: 0
m_Constraints: 4
--- !u!114 &1790502381803552541
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 979366631043918748}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 6b6daaf87aa21ab40aeb057792fb44f8, type: 3}
m_Name:
m_EditorClassIdentifier:
healthPoints: 0
maxHealthPoints: 3
diedVFXName: ExplosionFX
diedSFXName: Explosion
--- !u!1 &6563036454229069805
GameObject:
m_ObjectHideFlags: 0
Expand Down
Loading

0 comments on commit eed035a

Please sign in to comment.