Commit Graph

146 Commits

Author SHA1 Message Date
Félix MARQUET
30e3ebc91c Merge pull request #39 from BreizhHardware/dev
dev to main
2025-04-10 12:00:13 +02:00
Clément Hervouet
28e1cb4435 Merge pull request #40 from BreizhHardware/dev_felix
Dev felix
2025-04-10 11:58:34 +02:00
Félix MARQUET
55bee48093 Feat(Level Design) - Update level dimensions and platform properties; enhance enemy and collectible configurations; increase jump and speed boost durations. 2025-04-10 11:56:20 +02:00
Félix MARQUET
80dc14cd62 Merge pull request #38 from BreizhHardware/dev_clement
FIX [Leaderboard] - Delete duplicate 'level 1' tab, update columns fo…
2025-04-10 11:06:19 +02:00
ClementHVT
deccf0b1d5 FIX [Leaderboard] - Delete duplicate 'level 1' tab, update columns for infinite tab 2025-04-10 11:04:50 +02:00
Félix MARQUET
a8f36ce8e1 Chore(.gitignore) - Add Python bytecode files to .gitignore; ensure output.prof is ignored. 2025-04-10 11:01:26 +02:00
Félix MARQUET
cbfadb0bbb Feat(Player) - Add facing direction handling for player; update image rendering based on movement direction and improve joystick control comments. 2025-04-10 11:01:24 +02:00
Félix MARQUET
f0b237326f Feat(Audio) - Enhance audio handling during video playback; pause main music, play extracted audio on a separate channel, and ensure cleanup of temporary audio files.
# Conflicts:
#	temp_audio.mp3
2025-04-10 11:00:51 +02:00
bca7cc0cbc Feat(Checkpoints) - Add reset_level method to CheckpointDB for resetting checkpoints; implement profiling functionality with cProfile and output to file. 2025-04-10 11:00:43 +02:00
ClementHVT
ff3ed61a64 Merge branch 'dev' of https://github.com/BreizhHardware/project_sanic into dev_clement 2025-04-10 10:27:32 +02:00
ClementHVT
dc2a937106 delete pycache 2025-04-10 10:27:07 +02:00
Félix MARQUET
1900a1199f Merge pull request #36 from BreizhHardware/dev_table_basse
Feat[1.json], creation Level 1
2025-04-10 10:23:39 +02:00
ClementHVT
4561ed5451 FEAT [Leaderboard] - Add infinite mode points counter : using DB it's displayed in the Leaderboard too 2025-04-10 10:22:16 +02:00
ClementHVT
86ca9332a7 FEAT [Leaderboard] - Add infinite mode points counter : using DB it's displayed in the Leaderboard too 2025-04-10 10:21:44 +02:00
MateoLT
d674e47195 Feat[1.json], creation Level 1 2025-04-10 09:59:15 +02:00
ClementHVT
50d4b5f82c FEAT [Leaderboard] - Add infinite mode points counter : using DB it's displayed in the Leaderboard too
# Conflicts:
#	src/Menu/Leaderboard.py
#	src/handler.py
2025-04-10 09:30:36 +02:00
Clément Hervouet
a2221276ec Merge pull request #35 from BreizhHardware/dev_felix
Fix(Player) - Initialize pygame mixer for sound handling; add error h…
2025-04-09 14:10:00 +02:00
Félix MARQUET
6e4f753a3c Update src/Entity/Player.py
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
2025-04-09 14:09:26 +02:00
Félix MARQUET
2fbeaaf4fb Fix(Player) - Initialize pygame mixer for sound handling; add error handling for jump sound playback. 2025-04-09 14:07:35 +02:00
Clément Hervouet
1def1b8a51 Merge pull request #34 from BreizhHardware/dev_felix
Dev felix
2025-04-09 13:53:31 +02:00
Félix MARQUET
3e91e855bc Chore(Game Logic) - Update player life increment logic to respect max lives; fix typo in SpeedBoost collision handling method. 2025-04-09 13:37:53 +02:00
Félix MARQUET
a76a713e2e Feat(Game Logic) - Implement BackgroundManager for dynamic background handling; integrate into menu and leaderboard screens for enhanced visual experience. 2025-04-09 13:35:31 +02:00
Félix MARQUET
1da4738a73 Feat(Game Logic) - Enhance speedrun timer functionality; track total and collected items during gameplay, update leaderboard to display item collection stats, and modify coin collection logic to integrate with the speedrun timer. 2025-04-09 13:22:36 +02:00
Félix MARQUET
cd0ae078d1 Feat(Game Logic) - Update player life system; increase max lives from 2 to 5 and current lives from 2 to 3, adjust life increment logic based on new max lives. 2025-04-09 12:00:07 +02:00
Félix MARQUET
8ccae49754 Feat(Game Logic) - Add JumpBoost and SpeedBoost collectibles; implement collision handling for boosts, update player mechanics, and modify game state to support new collectible types.
# Conflicts:
#	src/Entity/Player.py
2025-04-09 11:58:05 +02:00
Félix MARQUET
b7331c646d Merge pull request #33 from BreizhHardware/dev_table_basse
Feat[Sounds], add sounds to the jump, attack of the player and coins
2025-04-09 11:13:05 +02:00
MateoLT
3d3f1679f1 Feat[Sounds], add sounds to the jump, attack of the player and coins 2025-04-09 11:11:03 +02:00
Clément Hervouet
96cd70d0ae Merge pull request #32 from BreizhHardware/dev_felix
Feat(Game Logic) - Integrate speedrun timer functionality; add Speedr…
2025-04-09 11:07:40 +02:00
Félix MARQUET
60aa7f6e11 Feat(Game Logic) - Integrate speedrun timer functionality; add SpeedrunTimer class, modify game state management to include timer, and update leaderboard to display best times. 2025-04-09 10:33:17 +02:00
Clément Hervouet
4c47104c6e Merge pull request #31 from BreizhHardware/dev_felix
Dev felix
2025-04-09 09:49:04 +02:00
Félix MARQUET
53060b09f3 Update README.md
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
2025-04-09 09:42:59 +02:00
Félix MARQUET
f82efe6151 Feat(Game Logic) - Refactor handler and event management functions; improve readability and modularity by separating concerns into distinct functions for game, menu, and system events. 2025-04-09 09:39:18 +02:00
Félix MARQUET
4994d120e2 Feat(Documentation) - Add CHATGPT.md to document the use of LLMs for debugging and commit message generation; update README.md to reference the new documentation. 2025-04-09 09:18:40 +02:00
Clément Hervouet
4de125eb40 dev to main
Dev to main
2025-04-08 14:12:22 +02:00
Félix MARQUET
70f1feaf88 Update README.md
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
2025-04-07 22:50:21 +02:00
Félix MARQUET
fb2b907a96 Update src/Map/Editor/EditorSprites.py
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
2025-04-07 22:50:14 +02:00
7629663045 Feat(Documentation) - Add PROJECT_STRUCTURE.md to outline project organization and folder structure; include details on game components, JSON level definitions, and technologies used. 2025-04-07 22:47:12 +02:00
Félix MARQUET
3866a0b48c Feat(Level Design) - Update platform and enemy configurations in JSON files; modify platform IDs, positions, and textures, and add new enemy types with behaviors. 2025-04-07 13:24:14 +02:00
Félix MARQUET
e67d64d0e3 Feat(Exit Video) - Implement video playback on exit collision; add functionality to play a video and return to the menu, and update requirements for moviepy support 2025-04-07 13:21:11 +02:00
Clément Hervouet
2fc86f095f Merge pull request #28 from BreizhHardware/dev_felix
Dev felix
2025-04-07 10:17:05 +02:00
Félix MARQUET
9916f96a0f Update src/Map/parser.py
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
2025-04-07 10:13:17 +02:00
Félix MARQUET
5287f84c90 Feat(Enemy Animation) - Implement GIF support for turret enemies; update enemy sprite handling and enhance enemy generation in InfiniteMapGenerator
# Conflicts:
#	src/Entity/Enemy.py
2025-04-07 10:11:03 +02:00
f57e9e1620 Feat(Level Design) - Update platform textures in 1.json; modify textures for various platforms and enhance checkpoint handling in handler.py for infinite mode 2025-04-07 10:10:18 +02:00
Félix MARQUET
ef402994fb Merge pull request #27 from BreizhHardware/dev_clement
FEAT [Projectiles] - Projectiles are no longer infinite
2025-04-07 10:10:13 +02:00
ClementHVT
f293369f56 FEAT [Projectiles] - Projectiles are no longer infinite : now obtained by 3 through a 30% drop chance when killing mob - deleted some debug print 2025-04-07 09:55:20 +02:00
Félix MARQUET
ac5fa10752 Merge pull request #26 from BreizhHardware/dev_table_basse
Feat[Enemy], add assets for the enemies
2025-04-07 09:14:35 +02:00
MateoLT
5539fe9e84 Feat[Enemy], add assets for the enemies 2025-04-07 09:11:23 +02:00
Clément Hervouet
8d1388043f Merge pull request #25 from BreizhHardware/dev_felix
Feat(Level Design) - Update Level 3 background and platform textures;…
2025-04-04 13:24:12 +02:00
Clément Hervouet
f361a300ae Merge pull request #24 from BreizhHardware/dev_table_basse
Feat[projectiles], add assets for the projectile of the player
2025-04-04 13:23:19 +02:00
Félix MARQUET
80ed86c387 Feat(Level Design) - Update Level 3 background and platform textures; enhance platform appearance and add dynamic background selection in LevelEditor 2025-04-04 11:59:57 +02:00