8 Commits

Author SHA1 Message Date
teddy
06af055344 correction merge 2025-01-15 16:35:09 +01:00
teddy
3b1774515b Merge remote-tracking branch 'origin/UI' into dev
# Conflicts:
#	Assets/Scenes/DeathScreen.unity
#	Assets/Scenes/DeathScreen1VS1.unity
#	Assets/Scenes/MainMenu.unity
2025-01-15 16:19:16 +01:00
teddy
27e4584d88 UI manque score 2025-01-15 15:54:12 +01:00
9401b9fc8a Bug FIX :
- Player null dans les deathscreens
- Utilisaton d'une Gamesession inutiles dans les DeathScreens
- Fix bouton rejouer qui lance en solo dans deathscreen 1v&
2025-01-15 14:42:38 +01:00
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
f47def84dd 1V1 OK, GameSession refactor, deathScreen to finish 2025-01-14 17:03:48 +01:00
Louis
4c350d16a4 Patch bouton relance DeathScreen 2025-01-07 16:48:41 +01:00
Louis
47ef32380e Ajout death screen 2024-12-04 14:27:52 +01:00