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

Merge branch 'master' into Spritok_Alkalmazasa_UNI_40

# Conflicts:
#	Assets/PlayFabEditorExtensions.meta
#	Assets/PlayFabEditorExtensions/Editor.meta
#	Assets/PlayFabEditorExtensions/Editor/Resources.meta
#	Assets/PlayFabEditorExtensions/Editor/Resources/PlayFabUnitySdk.unitypackage.meta
#	Assets/Prefabs/InputToStartCanvas.prefab
#	Assets/Prefabs/InputToStartCanvas.prefab.meta
#	Assets/Prefabs/ScoreCanvas.prefab
#	Assets/Prefabs/ScoreCanvas.prefab.meta
#	Assets/Scenes/Menu.unity
#	Assets/Scenes/Platform_spawning+bg.unity
#	Assets/Scenes/Platform_spawning.unity
#	Assets/Scripts/Camera/FellOffController.cs.meta
parents 4e5ec19b c59727cd
No related branches found
No related tags found
Loading
Showing
with 3425 additions and 0 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment