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

f8c17a33

Commit f8c17a33 authored 2 years ago by Robin Ruud Kristensen

Downloads
- Plain Diff

Merge branch 'main' of https://gitlab.stud.idi.ntnu.no/gardaf/mr-bigsock

parents 6ef954f1 5ff7b55d

No related branches found

No related tags found

2 merge requests!76Juliuses nye super branch,!67maybe fixed spawning of enemies

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

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

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

MrBigsock/Assets/Code/PlayerController.cs
MrBigsock/Assets/Code/Services/PrefabService.cs 10 additions, 2 deletions

MrBigsock/Assets/Code/Services/PrefabService.cs
MrBigsock/Assets/Prefabs/Enemy_Slime.prefab 1 addition, 1 deletion

MrBigsock/Assets/Prefabs/Enemy_Slime.prefab
MrBigsock/Assets/Prefabs/attack.prefab 1 addition, 1 deletion

MrBigsock/Assets/Prefabs/attack.prefab
MrBigsock/Assets/Prefabs/enemy_orc_range.prefab 2 additions, 1 deletion

MrBigsock/Assets/Prefabs/enemy_orc_range.prefab
MrBigsock/Assets/Prefabs/enemy_orc_warrior.prefab 1 addition, 0 deletions

MrBigsock/Assets/Prefabs/enemy_orc_warrior.prefab
MrBigsock/Assets/Prefabs/skleton-range.prefab 3 additions, 1 deletion

MrBigsock/Assets/Prefabs/skleton-range.prefab

with 20 additions and 8 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