# Conflicts:
#	Assets/PlayFabEditorExtensions/Editor/Scripts/Components.meta
#	Assets/PlayFabEditorExtensions/Editor/Scripts/Panels.meta
#	Assets/PlayFabEditorExtensions/Editor/Scripts/PlayFabEditorSDK.meta
#	Assets/PlayFabEditorExtensions/Editor/Scripts/Utils.meta
#	Assets/Scenes/Menu.unity

# Conflicts:
#	Assets/PlayFabEditorExtensions/Editor/Scripts/Components.meta
#	Assets/PlayFabEditorExtensions/Editor/Scripts/Panels.meta
#	Assets/PlayFabEditorExtensions/Editor/Scripts/PlayFabEditorSDK.meta
#	Assets/PlayFabEditorExtensions/Editor/Scripts/Utils.meta

PlayFab Added

See merge request !33

A gomb a menuben is megvan hozza

At GameOver The HighScore is sent to the API

# Conflicts:
#	Assets/PlayFabEditorExtensions.meta
#	Assets/PlayFabEditorExtensions/Editor.meta
#	Assets/PlayFabEditorExtensions/Editor/Scripts.meta
#	Assets/PlayFabEditorExtensions/Editor/Scripts/Components.meta
#	Assets/PlayFabEditorExtensions/Editor/Scripts/Panels.meta
#	Assets/PlayFabEditorExtensions/Editor/Scripts/PlayFabEditorSDK.meta
#	Assets/PlayFabEditorExtensions/Editor/Scripts/Utils.meta

Game Over Scene alfa verzio

See merge request !32

na igy jo

See merge request !31

Revert "Merge branch 'GameOverRefactor' into 'master'"

See merge request !30

This reverts merge request !29

rendszerezés

See merge request !29

pre alfa

See merge request !28

# Conflicts:
#	Assets/Prefabs/GameManager.prefab
#	Assets/Scenes/Platform_spawning.unity

# Conflicts:
#	Assets/Scenes/Platform_spawning.unity

Menu

See merge request !25

ItemSpawner Working.

See merge request !27

# Conflicts:
#	Assets/Materials/background images.meta
#	Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF.asset

background spawn normally

See merge request !26

Egy camera állásba a megadott min és max közti darab számú itemet spawnol (külön coin és külön special)