Skip to content
Snippets Groups Projects
Commit 7c753e4c authored by benxidosz's avatar benxidosz
Browse files

Merge branch 'master' into Platformok_nehezedese_UNI_30 

# Conflicts:
#	Assets/Scenes/Platform_spawning.unity
#	Assets/Scripts/GameManager.cs
#	Assets/Scripts/Items/Coin.cs.meta
#	Assets/Scripts/OnkoltsegController.cs
parents e901652c e6153520
No related branches found
No related tags found
1 merge request!22Platform Generálás nehezedik, illetve random is:
Show whitespace changes
Inline Side-by-side
Showing
with 911 additions and 1 deletion
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment

Hosted with :heart: by KSZK