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.

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

36 add pause menu #51

Open
wants to merge 8 commits into
base: dev
Choose a base branch
from
Open

36 add pause menu #51

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
7deee1a
Add basic menu
jpabadir Feb 21, 2021
cf6c9f8
Adjust size
jpabadir Feb 21, 2021
8dc48fc
Keep player from moving when paused
jpabadir Feb 21, 2021
64eb80b
Add line breaks
jpabadir Feb 21, 2021
a374bc8
Merge dev
jpabadir Feb 21, 2021
967149f
Implement restart button
jpabadir Feb 21, 2021
413e581
Implement main menu button
jpabadir Feb 21, 2021
a66ee24
Fix play button bug
jpabadir Feb 21, 2021
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
8 changes: 8 additions & 0 deletions Assets/Fonts.meta
View file
Open in desktop

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

Binary file added Assets/Fonts/BLKCHCRY.TTF
View file
Open in desktop
Binary file not shown.
21 changes: 21 additions & 0 deletions Assets/Fonts/BLKCHCRY.TTF.meta
View file
Open in desktop

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

11 changes: 11 additions & 0 deletions Assets/MusicBox.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;

public class MusicBox : MonoBehaviour
{
void Awake()
{
DontDestroyOnLoad(gameObject);
}
}
11 changes: 11 additions & 0 deletions Assets/MusicBox.cs.meta
View file
Open in desktop

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

13 changes: 13 additions & 0 deletions Assets/Prefabs/BarrelBreakEffect.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ GameObject:
- component: {fileID: 8644815223698588917}
- component: {fileID: 8644815223698588916}
- component: {fileID: 8644815223698588915}
- component: {fileID: 599881530494987706}
m_Layer: 0
m_Name: BarrelBreakEffect
m_TagString: Untagged
Expand Down Expand Up @@ -4862,3 +4863,15 @@ ParticleSystemRenderer:
m_Mesh2: {fileID: 0}
m_Mesh3: {fileID: 0}
m_MaskInteraction: 0
--- !u!114 &599881530494987706
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8644815223698588914}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 82640bb5df6ee484d94037e23c5cda42, type: 3}
m_Name:
m_EditorClassIdentifier:
13 changes: 13 additions & 0 deletions Assets/Prefabs/BarrelExplosionEffect.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ GameObject:
- component: {fileID: 8556756442900700703}
- component: {fileID: 8556756442900700702}
- component: {fileID: 8556756442900700697}
- component: {fileID: 807011840291518948}
m_Layer: 0
m_Name: BarrelExplosionEffect
m_TagString: Untagged
Expand Down Expand Up @@ -4863,3 +4864,15 @@ ParticleSystemRenderer:
m_Mesh2: {fileID: 0}
m_Mesh3: {fileID: 0}
m_MaskInteraction: 0
--- !u!114 &807011840291518948
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8556756442900700696}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 82640bb5df6ee484d94037e23c5cda42, type: 3}
m_Name:
m_EditorClassIdentifier:
13 changes: 13 additions & 0 deletions Assets/Prefabs/BarrelObstacle.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ GameObject:
- component: {fileID: 801681551350363789}
- component: {fileID: 2111536695}
- component: {fileID: 6858700845033973858}
- component: {fileID: 2061234533891882918}
m_Layer: 7
m_Name: BarrelObstacle
m_TagString: Untagged
Expand Down Expand Up @@ -168,6 +169,18 @@ MonoBehaviour:
breakPrefab: {fileID: 8644815223698588914, guid: 0ff9dfa7228d9ea428598d5f43860fa4, type: 3}
explosionPrefab: {fileID: 8556756442900700696, guid: 52fc38a3d7b1ca2479a9ced3d64fe32a, type: 3}
energyHitDrain: 10
--- !u!114 &2061234533891882918
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9127414273610422426}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 82640bb5df6ee484d94037e23c5cda42, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &9127414274615888602
GameObject:
m_ObjectHideFlags: 0
Expand Down
13 changes: 13 additions & 0 deletions Assets/Prefabs/Smear.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4851,6 +4851,7 @@ GameObject:
m_Component:
- component: {fileID: 5438523089559645083}
- component: {fileID: -7699372137757248964}
- component: {fileID: 4454860578067706790}
m_Layer: 0
m_Name: Smear
m_TagString: Untagged
Expand Down Expand Up @@ -4885,3 +4886,15 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 63fe60ba273dd5d459dc117531efc5a1, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &4454860578067706790
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5438523089559645082}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 82640bb5df6ee484d94037e23c5cda42, type: 3}
m_Name:
m_EditorClassIdentifier:
13 changes: 13 additions & 0 deletions Assets/Prefabs/Splatter.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 1764354674500160257}
- component: {fileID: 6964901432174076453}
m_Layer: 0
m_Name: Splatter
m_TagString: Untagged
Expand All @@ -31,6 +32,18 @@ Transform:
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &6964901432174076453
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1764354674500160262}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 82640bb5df6ee484d94037e23c5cda42, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &2078241817576651569
GameObject:
m_ObjectHideFlags: 0
Expand Down
13 changes: 13 additions & 0 deletions Assets/Prefabs/Spurt.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 2316312402560262697}
- component: {fileID: 1330484273213997241}
m_Layer: 0
m_Name: Spurt
m_TagString: Untagged
Expand All @@ -31,6 +32,18 @@ Transform:
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1330484273213997241
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2316312402560262696}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 82640bb5df6ee484d94037e23c5cda42, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &2827654058545532079
GameObject:
m_ObjectHideFlags: 0
Expand Down
13 changes: 13 additions & 0 deletions Assets/Prefabs/TurtleEnemy.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,7 @@ GameObject:
- component: {fileID: 801681551350363789}
- component: {fileID: 4308848734514985335}
- component: {fileID: 9127414273610422417}
- component: {fileID: 6467703697658023762}
m_Layer: 7
m_Name: TurtleEnemy
m_TagString: Untagged
Expand Down Expand Up @@ -347,6 +348,18 @@ MonoBehaviour:
splatterPrefab: {fileID: 1764354674500160262, guid: 3b886b63d85ef80448e47662d1e0a8a2, type: 3}
spurtPrefab: {fileID: 2316312402560262696, guid: fa18db9663189da43927520cb53adfd4, type: 3}
smearPrefab: {fileID: -7699372137757248964, guid: 1d93bb8817875d1409c39b146f82fdb3, type: 3}
--- !u!114 &6467703697658023762
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9127414273610422426}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 82640bb5df6ee484d94037e23c5cda42, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &9127414273709215078
GameObject:
m_ObjectHideFlags: 0
Expand Down
Loading