Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

VIKszpedisön
- Activity
- Members
- Labels
- JetBrains YouTrack
- Terraform modules
- Model experiments

Snippets Groups Projects

2bc56e91

Commit 2bc56e91 authored Aug 12, 2021 by czbalint

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/enemy_spawning' into enemy_spawning

# Conflicts:
#	Assets/Scenes/Platform_spawning.unity

parents cdd2e7e8 efc3dfd0

No related branches found

No related tags found

1 merge request!28pre alfa

Changes 4

Show whitespace changes

Inline Side-by-side

Showing

Assets/Prefabs/GameManager.prefab 25 additions, 2 deletions

Assets/Prefabs/GameManager.prefab
Assets/Scenes/Platform_spawning.unity 21 additions, 90 deletions

Assets/Scenes/Platform_spawning.unity
Assets/Scripts/Bosses/Owl.cs 3 additions, 0 deletions

Assets/Scripts/Bosses/Owl.cs
Assets/Scripts/GameManager.cs 3 additions, 0 deletions

Assets/Scripts/GameManager.cs

with 52 additions and 92 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

Hosted with by KSZK