PC-PAUL\paulf 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

..

GameScene

Modif Louis + moi

2024-12-12 11:15:25 +01:00

DeathScreen1VS1.unity

1V1 OK, GameSession refactor, deathScreen to finish

2025-01-14 17:03:48 +01:00

DeathScreen1VS1.unity.meta

1V1 OK, GameSession refactor, deathScreen to finish

2025-01-14 17:03:48 +01:00

DeathScreen.unity

Merge branch '1vs1' into dev

2025-01-15 09:51:22 +01:00

DeathScreen.unity.meta

Relance partie + fix curve Y

2025-01-09 09:47:26 +01:00

DuoGameScene.unity

1V1 logique OK, Manque modif deathscreen

2025-01-14 17:41:14 +01:00

DuoGameScene.unity.meta

Split screen, controls not workings

2025-01-07 17:26:15 +01:00

GameScene.meta

Initial commit

2022-08-07 07:31:16 +03:00

MainMenu.unity

Merge branch '1vs1' into dev

2025-01-15 09:51:22 +01:00

MainMenu.unity.meta

Mise en commun avec Teddy + COrrection du jump

2024-12-12 09:32:18 +01:00

SoloGameScene.unity

Merge branch '1vs1' into dev

2025-01-15 09:51:22 +01:00

SoloGameScene.unity.meta

1V1 OK, GameSession refactor, deathScreen to finish

2025-01-14 17:03:48 +01:00