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
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
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
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
6bdec2b7c4
Ajout box
2024-12-12 11:37:37 +01:00
0828b8dbac
Modif Louis + moi
2024-12-12 11:15:25 +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
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
Louis
57229cbc5c
Correction HP, ajout base de main menu, passage sous unity 6
2024-11-28 17:20:08 +01:00
VladimirPirozhenko
f28cbbc34a
Fixed prefabs
2022-09-13 22:13:09 +03:00
VladimirPirozhenko
e2c8ed2399
Fixed bug, then creating pool from derived class
2022-09-13 22:05:42 +03:00
VladimirPirozhenko
d9931e379b
Some tweaks to pooling editor
2022-09-12 22:23:18 +03:00
VladimirPirozhenko
d3747cd60e
Added few variations of fog
2022-08-28 21:36:22 +03:00
Vladimir Pirozhenko
49de54745e
Added scrollview and sorting by high score in scoreboard
...
Also fixed bug in PoolCreatorInspector in Split function
2022-08-26 18:19:56 +04:00
VladimirPirozhenko
388791ecd2
Updated pooling , added cached components
2022-08-22 21:09:09 +03:00
VladimirPirozhenko
ea3f8313ce
Upgraded Pool inspector
2022-08-21 05:13:11 +03:00
VladimirPirozhenko
f494fea030
Added tools for pool creation
...
It using code generation and reflection
2022-08-19 03:49:06 +03:00
VladimirPirozhenko
6889a11109
Added surface shaders for additive blending,emission and cutoff, also upgraded standard curved shader massively
...
Fixed shadows with shader, optimized few things for mobiles, added CulledCamera script to prevent meshes to dissapear in front of camera
WorldCurver now lives in GameSession, from which it will be controlled
2022-08-18 03:37:06 +03:00
VladimirPirozhenko
fff9c8c5cd
Shader branch, added surface shader for curved world , all of the assets were transferred to it
2022-08-17 03:35:34 +03:00
VladimirPirozhenko
f2797a5355
Updated input system, added touch inputs
...
Now InputTranslator has its own interface to provide polymorphism in GameSession class
Touch input read only if target platform is android
2022-08-16 04:01:08 +03:00
VladimirPirozhenko
e1c8070226
Fixed bugs with input if a player is unplayable and pause is set
...
Input translator upgraded
2022-08-15 20:57:11 +03:00
VladimirPirozhenko
9067758171
Extracted code to Grid class, adjusted jump time to get better game feel
...
Also fixed scaling of score ui element
2022-08-14 06:14:54 +03:00
VladimirPirozhenko
80720c8eb7
Reworked pooling a little bit, added input restrictions to avoid gaining controls to player while paused/dead
...
Moreover cleaned-up old code
2022-08-13 01:57:16 +03:00
VladimirPirozhenko
7c98ec00e5
Added scoreaboard button in pause menu, added proper scoreboard view
...
Also added close button to scoreboard view
2022-08-12 20:20:48 +03:00
VladimirPirozhenko
6999e84b65
Added pause and pause view, added restriction of input while in paused state
...
Upgraded Input system to fit demands of paused game (no movement inputs allowed!)
2022-08-12 05:38:17 +03:00
VladimirPirozhenko
e15e453c8e
Added Hearts UI health representation, added scoreboard, added tweaks to input system, also code clean-up
...
Deleted unused assets, added HeartsView
2022-08-11 08:49:23 +03:00
VladimirPirozhenko
bb4f8691e2
Updated Input system, got rid of old code, updated HUD
2022-08-11 03:37:40 +03:00
VladimirPirozhenko
6a87d4abda
Added classess for views, added new laser obstacle
...
New laser obstacle uses particle system, UI not yet implemented, but classess for ui was added
2022-08-10 06:10:40 +03:00
VladimirPirozhenko
4fa18a41a0
Changed animation strings to hashes, added IPoolable interface, upgrade pool system
...
Change generation of obstacles
Now all the important objects is cointained by pools
2022-08-09 22:23:49 +03:00
