Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

M

Mr BigSock
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

f2d7b183

Commit f2d7b183 authored 2 years ago by Julius Fredrik Einum

Downloads
- Plain Diff

Merge branch 'JuliusesNyeSuperBranch' into 'main'

Merged final tweaks

See merge request !91

parents dd175e1b 13c724ca

No related branches found

No related tags found

1 merge request!91Merged final tweaks

Changes 11

Hide whitespace changes

Inline Side-by-side

Showing

MrBigsock/Assets/Code/Character.cs 4 additions, 1 deletion

MrBigsock/Assets/Code/Character.cs
MrBigsock/Assets/Code/Core/Abilities/BasicProjectile2.cs 3 additions, 3 deletions

MrBigsock/Assets/Code/Core/Abilities/BasicProjectile2.cs
MrBigsock/Assets/Code/PlayerController.cs 5 additions, 5 deletions

MrBigsock/Assets/Code/PlayerController.cs
MrBigsock/Assets/Code/UI/InvTrash.cs 37 additions, 0 deletions

MrBigsock/Assets/Code/UI/InvTrash.cs
MrBigsock/Assets/Code/UI/InvTrash.cs.meta 11 additions, 0 deletions

MrBigsock/Assets/Code/UI/InvTrash.cs.meta
MrBigsock/Assets/Code/UI/InventoryPanel.cs 7 additions, 1 deletion

MrBigsock/Assets/Code/UI/InventoryPanel.cs
MrBigsock/Assets/Resources/Prefabs/UI/PlayerMenu.prefab 262 additions, 0 deletions

MrBigsock/Assets/Resources/Prefabs/UI/PlayerMenu.prefab
MrBigsock/Assets/Scenes/GenTilemap.unity 6 additions, 2 deletions

MrBigsock/Assets/Scenes/GenTilemap.unity
MrBigsock/Assets/Scenes/MainMenu.unity 4 additions, 0 deletions

MrBigsock/Assets/Scenes/MainMenu.unity
MrBigsock/ProjectSettings/Physics2DSettings.asset 1 addition, 1 deletion

MrBigsock/ProjectSettings/Physics2DSettings.asset
README.md 0 additions, 11 deletions

README.md

with 340 additions and 24 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