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

6cdb5ae7

Commit 6cdb5ae7 authored 2 years ago by Julius Fredrik Einum

Downloads
- Plain Diff

Merge branch 'master' into JuliusesNyeSuperBranch

parents 5306df7c 31761dde

No related branches found

No related tags found

2 merge requests!52Updating master,!51Juliuses nye super branch

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

MrBigsock/Assets/Code/PlayerController.cs 1 addition, 1 deletion

MrBigsock/Assets/Code/PlayerController.cs
MrBigsock/Assets/Code/Services/AbilityService.cs 3 additions, 3 deletions

MrBigsock/Assets/Code/Services/AbilityService.cs
MrBigsock/Assets/Code/Services/PrefabService.cs 1 addition, 1 deletion

MrBigsock/Assets/Code/Services/PrefabService.cs
MrBigsock/Assets/Code/Services/SpriteService.cs 1 addition, 1 deletion

MrBigsock/Assets/Code/Services/SpriteService.cs
MrBigsock/Assets/Code/UI/InventoryPanel.cs 90 additions, 98 deletions

MrBigsock/Assets/Code/UI/InventoryPanel.cs
MrBigsock/Assets/Code/UI/ItemPref.cs 0 additions, 1 deletion

MrBigsock/Assets/Code/UI/ItemPref.cs
MrBigsock/Assets/Code/UI/ItemSlot.cs 50 additions, 28 deletions

MrBigsock/Assets/Code/UI/ItemSlot.cs

with 146 additions and 133 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