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

bb8cf539

Commit bb8cf539 authored 2 years ago by Robin Halseth Sandvik

Downloads
- Plain Diff

Merge branch 'master' into 'main'

Implemented initial version of conditional items.

See merge request !22

parents 75078db9 5b0c576e

Loading

Changes 29

Hide whitespace changes

Inline Side-by-side

Showing

MrBigsock/Assets/Code/Item/Inventory.cs 37 additions, 0 deletions

MrBigsock/Assets/Code/Item/Inventory.cs
MrBigsock/Assets/Code/Item/Items/ItemFourEyes.cs 31 additions, 0 deletions

MrBigsock/Assets/Code/Item/Items/ItemFourEyes.cs
MrBigsock/Assets/Code/Item/Items/ItemFourEyes.cs.meta 11 additions, 0 deletions

MrBigsock/Assets/Code/Item/Items/ItemFourEyes.cs.meta
MrBigsock/Assets/Code/Item/Items/ItemRunningShoes.cs 7 additions, 6 deletions

MrBigsock/Assets/Code/Item/Items/ItemRunningShoes.cs
MrBigsock/Assets/Code/Item/Items/ItemRunningShoes.cs.meta 11 additions, 0 deletions

MrBigsock/Assets/Code/Item/Items/ItemRunningShoes.cs.meta
MrBigsock/Assets/Code/PlayerController.cs 9 additions, 12 deletions

MrBigsock/Assets/Code/PlayerController.cs
MrBigsock/Assets/Code/attack/AttackMovement.cs 12 additions, 0 deletions

MrBigsock/Assets/Code/attack/AttackMovement.cs
MrBigsock/Assets/Prefabs/BigSock.prefab 1 addition, 1 deletion

MrBigsock/Assets/Prefabs/BigSock.prefab
MrBigsock/Assets/Scenes/example.unity 4 additions, 0 deletions

MrBigsock/Assets/Scenes/example.unity

with 123 additions and 19 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