Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

BubbleSort
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Iterations
- Wiki
- Requirements
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

df427bd0

Commit df427bd0 authored 1 year ago by Palnit

Downloads
- Plain Diff

Merge branch 'master' into LightAgain

# Conflicts:
#	ChaoticCrates/Assets/Scenes/gameScene.unity

parents 17716ca1 db0a949b

Loading

Checking pipeline status

Changes 8
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

ChaoticCrates/Assets/Graphics/LobbyUI/PixelUI/space.png.meta 2 additions, 2 deletions

ChaoticCrates/Assets/Graphics/LobbyUI/PixelUI/space.png.meta
ChaoticCrates/Assets/Graphics/LobbyUI/Space/glassPanel_tab.png.meta 1 addition, 1 deletion

...tes/Assets/Graphics/LobbyUI/Space/glassPanel_tab.png.meta
ChaoticCrates/Assets/Scenes/MainMenu.unity 4 additions, 0 deletions

ChaoticCrates/Assets/Scenes/MainMenu.unity
ChaoticCrates/Assets/Scripts/Logic/Managers/GameManager.cs 1 addition, 1 deletion

ChaoticCrates/Assets/Scripts/Logic/Managers/GameManager.cs
ChaoticCrates/Assets/Scripts/UI/Escape.cs 36 additions, 3 deletions

ChaoticCrates/Assets/Scripts/UI/Escape.cs
ChaoticCrates/Assets/Scripts/UI/GameOverScreen.cs 108 additions, 0 deletions

ChaoticCrates/Assets/Scripts/UI/GameOverScreen.cs
ChaoticCrates/Assets/Scripts/UI/GameOverScreen.cs.meta 3 additions, 0 deletions

ChaoticCrates/Assets/Scripts/UI/GameOverScreen.cs.meta
ChaoticCrates/Assets/Scripts/UI/Settings.cs 25 additions, 18 deletions

ChaoticCrates/Assets/Scripts/UI/Settings.cs

with 180 additions and 25 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment