17 Commits

Author SHA1 Message Date
f949377c46 Merge branch 'dev' of https://git.lagaudiere.uk/ElPoyo/AwesomeRunner- into Coins 2025-01-16 12:16:23 +01:00
be419b5c78 Merge branch 'UIScoreAndSeparator' into dev
# Conflicts:
#	Assets/Scenes/SoloGameScene.unity
2025-01-15 17:06:36 +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
2d5bf6002f Ajout de jump sound + changement de lane
Et musique dans le Main Menu
2025-01-15 16:00:11 +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
e5f6f9fa54 LoadAsync + fix button play 2025-01-09 11:05:24 +01:00
ee95dd043f Split screen, controls not workings 2025-01-07 17:26:15 +01:00
Louis
4c350d16a4 Patch bouton relance DeathScreen 2025-01-07 16:48:41 +01:00
Louis
4181b857e1 Merge branch 'JumpCorrection' of https://github.com/ElPoyo266/AwesomeRunner- into dev 2025-01-07 16:19:52 +01:00
Louis
17f27aa8a3 Ajout obstacle + patch 2025-01-07 16:05:14 +01:00
Louis
928e5f1621 Changements 2024-12-12 11:45:17 +01:00
Louis
473fe2e123 Mise en commun avec Teddy + COrrection du jump 2024-12-12 09:32:18 +01:00
Louis
5350d2fb77 Correction de la vie du joueur et suppression bar de vie 2024-12-04 14:34:50 +01:00
VladimirPirozhenko
45b277e7d1 Initial commit 2022-08-07 07:31:16 +03:00