Louis
|
8a94ce9de3
|
Merge branch 'dev' of https://github.com/ElPoyo266/AwesomeRunner- into speedAcceleration
# Conflicts:
# .idea/.idea.AwesomeRunner/.idea/.gitignore
# .vscode/settings.json
# Assets/ParticleSystems/lasers/lasers2.unitypackage.meta
# Assets/Scenes/DeathScreen.unity.meta
# Assets/Scenes/GameScene.unity
# Assets/Scenes/MainMenu.unity
# Assets/ScriptableObjects/PlayerData.asset
# Assets/Scripts/Player/Health.cs
# Assets/Scripts/Player/Player.cs
# Assets/TextMesh Pro/Examples & Extras/Resources/Fonts & Materials/Bangers SDF.asset
# Assets/TextMesh Pro/Examples & Extras/Scenes/27 - Double Pass Shader Example.unity.meta
# ProjectSettings/EditorBuildSettings.asset
|
2025-01-07 16:59:09 +01:00 |
|
