9a22b9edb5
Merge branch 'dev' of https://git.lagaudiere.uk/ElPoyo/AwesomeRunner- into Coins
...
# Conflicts:
# Assets/Scenes/SoloGameScene.unity
# Assets/TextMesh Pro/Examples & Extras/Resources/Fonts & Materials/Bangers SDF.asset
2025-01-16 11:58:34 +01:00
cda263839d
Ajout du system de coins et modif de l'obstacle de Paul
2025-01-16 11:54:09 +01:00
fa16eaa0cc
Deleted useless files, added FPS counter
2025-01-16 11:33:55 +01:00
ef6ed85e52
Fixed a few errors
2025-01-16 10:01:55 +01:00
f36578c429
merging dev to avoid conflicts
2025-01-16 09:27:35 +01:00
75c890766c
Centralised player data into game session
2025-01-15 17:25:18 +01:00
be419b5c78
Merge branch 'UIScoreAndSeparator' into dev
...
# Conflicts:
# Assets/Scenes/SoloGameScene.unity
2025-01-15 17:06:36 +01:00
ced8078398
Added seaprator for UI 1v1 and changed score UI
2025-01-15 16:57:53 +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
