|
08338d6dc7
|
Merge branch '1vs1' into dev
# Conflicts:
# Assets/Scenes/DeathScreen.unity
# Assets/Scenes/MainMenu.unity
# Assets/ScriptableObjects/PlayerData.cs
# Assets/Scripts/GameSession/GameSession.cs
# Assets/Scripts/Player/Player.cs
# Assets/Scripts/Road/ChunkGenerator.cs
|
2025-01-15 09:51:22 +01:00 |
|