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
5a58064e4d
Fixed a lot of errors:
...
Obosolet methods, null references
Removed dead code
Clean Code
2025-01-16 11:07:26 +01:00
15a847cbde
Fix 1vs1 separator on top of pause menu
2025-01-16 10:06:46 +01:00
ef6ed85e52
Fixed a few errors
2025-01-16 10:01:55 +01:00
aa0cd27d87
Patch be419b5
2025-01-16 09:40:39 +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
8ca5097604
Fix winner detection
2025-01-15 17:18:38 +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
2b8dec8ba7
Merge remote-tracking branch 'origin/dev' into dev
...
# Conflicts:
# .idea/workspace.xml
2025-01-15 16:35:24 +01:00
teddy
06af055344
correction merge
2025-01-15 16:35:09 +01:00
teddy
b3a2d8b1e6
correction merge
2025-01-15 16:23:03 +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
a9b626b86e
Ajout musique game scene
2025-01-15 16:04:57 +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
fc7914f4c5
Bug Fix : Menu pause, resume qui relance en mode solo même en mode 1VS1
2025-01-15 15:01:04 +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
2bf911a312
1V1 logique OK, Manque modif deathscreen
2025-01-14 17:41:14 +01:00
f47def84dd
1V1 OK, GameSession refactor, deathScreen to finish
2025-01-14 17:03:48 +01:00
47d6adf479
1V1 logic OK
2025-01-09 11:44:33 +01:00
e5f6f9fa54
LoadAsync + fix button play
2025-01-09 11:05:24 +01:00
2898130a82
Jump and crouch OK, lane broken
2025-01-09 10:18:10 +01:00
9ae93651f1
Relance partie + fix curve Y
2025-01-09 09:47:26 +01:00
ee95dd043f
Split screen, controls not workings
2025-01-07 17:26:15 +01:00
Louis
8a94ce9de3
Merge branch 'dev' of https://github.com/ElPoyo266/AwesomeRunner- into speedAcceleration
...
# Conflicts:
# .idea/.idea.AwesomeRunner/.idea/.gitignore
# .vscode/settings.json
# Assets/ParticleSystems/lasers/lasers2.unitypackage.meta
# Assets/Scenes/DeathScreen.unity.meta
# Assets/Scenes/GameScene.unity
# Assets/Scenes/MainMenu.unity
# Assets/ScriptableObjects/PlayerData.asset
# Assets/Scripts/Player/Health.cs
# Assets/Scripts/Player/Player.cs
# Assets/TextMesh Pro/Examples & Extras/Resources/Fonts & Materials/Bangers SDF.asset
# Assets/TextMesh Pro/Examples & Extras/Scenes/27 - Double Pass Shader Example.unity.meta
# ProjectSettings/EditorBuildSettings.asset
2025-01-07 16:59:09 +01:00
Louis
2d25a5e4f6
.
2025-01-07 16:53:44 +01:00
0203544469
files that should be commited before
2025-01-07 16:50:15 +01:00
Louis
4c350d16a4
Patch bouton relance DeathScreen
2025-01-07 16:48:41 +01:00
e5d7120e59
Added speed accelerator (without managing the animation length)
2025-01-07 16:43:43 +01:00
Louis
4181b857e1
Merge branch 'JumpCorrection' of https://github.com/ElPoyo266/AwesomeRunner- into dev
2025-01-07 16:19:52 +01:00
Louis
3953403bc0
textures
2025-01-07 16:17:30 +01:00
Louis
66691a9c7a
textures new box
2025-01-07 16:06:30 +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
6bdec2b7c4
Ajout box
2024-12-12 11:37:37 +01:00
0828b8dbac
Modif Louis + moi
2024-12-12 11:15:25 +01:00
Louis
f8a6fdfe3d
Removed too large image (needed)
2024-12-12 09:55:47 +01:00
Louis
473fe2e123
Mise en commun avec Teddy + COrrection du jump
2024-12-12 09:32:18 +01:00
Louis
ce75c2f632
Correction du jump qui faisait "brute" à la descente
2024-12-04 16:24:57 +01:00
8b845bd31a
Updated gitattributes
2024-12-04 15:59:04 +01:00
7e2b30e11a
FIX broken merge
2024-12-04 15:17:48 +01:00
Louis
5350d2fb77
Correction de la vie du joueur et suppression bar de vie
2024-12-04 14:34:50 +01:00
Louis
47ef32380e
Ajout death screen
2024-12-04 14:27:52 +01:00
Louis
c27de2dd97
fichier modifié sans raison ?
2024-12-04 14:27:16 +01:00
dbb4f0a59e
End of camera correction
2024-12-02 14:01:16 +01:00
