[PR #30] [MERGED] Dev to main #30

Closed
opened 2026-05-06 12:17:26 +02:00 by BreizhHardware · 0 comments

📋 Pull Request Information

Original PR: https://github.com/BreizhHardware/project_sanic/pull/30
Author: @BreizhHardware
Created: 4/7/2025
Status: Merged
Merged: 4/8/2025
Merged by: @ClementHVT

Base: mainHead: dev


📝 Commits (10+)

  • 5e5ca57 FEAT [Collectibles] - Added Coin item : collectible in map - Coin counter on top of screen - Added custom font for display
  • 72454d0 FEAT [Collectibles] - Reset collectibles uppon death
  • c7bdd34 Merge remote-tracking branch 'origin/dev' into dev_clement
  • 0e57df7 Feat[platform, projectiles], move circular platform, add projectile cast for the player
  • ee54b5d Feat(Game Logic) - Refactor main game loop into a separate handler function for improved code organization and maintainability
  • 90b6c94 Feat(Level Design) - Update platform positions and add movement behavior; implement camera panning in LevelEditor for enhanced editing experience
  • d34b532 Feat(Infinite Mode) - Implement infinite level generation and management; add InfiniteMapGenerator and InfiniteMapManager for procedural map creation
  • 6368555 Update src/Map/Infinite/InfiniteMapManager.py
  • d8e0ec9 Merge pull request #20 from BreizhHardware/dev_felix
  • 8c90eed Merge remote-tracking branch 'origin/dev' into dev_table_basse

📊 Changes

52 files changed (+1986 additions, -934 deletions)

View changed files

📝 .gitignore (+2 -1)
PROJECT_STRUCTURE.MD (+245 -0)
📝 README.md (+4 -1)
Test.py (+0 -223)
assets/fonts/sanicfont.TTF (+0 -0)
assets/map/background/cave_bg.png (+0 -0)
assets/map/background/desert_bg.jpg (+0 -0)
assets/map/background/mountain_bg.jpg (+0 -0)
assets/map/checkpoints/checkpoint.png (+0 -0)
assets/map/checkpoints/checkpoint_uncheck.png (+0 -0)
assets/map/collectibles/Sanic_Coin.png (+0 -0)
assets/map/enemy/Laser.png (+0 -0)
assets/map/enemy/boss.gif (+0 -0)
assets/map/enemy/flying_enemy.png (+0 -0)
assets/map/enemy/turret.gif (+0 -0)
assets/map/enemy/walker_enemy.png (+0 -0)
assets/map/exit/Zeldo Motus.mp4 (+0 -0)
assets/map/exit/Zeldo.png (+0 -0)
assets/map/platform/grass_texture.jpg (+0 -0)
assets/map/platform/grass_texture.png (+0 -0)

...and 32 more files

📄 Description

This pull request includes significant updates and improvements to the project documentation and codebase. The most important changes include the addition of a detailed project structure guide, updates to the README file to reference the new project structure, and the removal of an outdated test script.

Documentation updates:

  • PROJECT_STRUCTURE.MD: Added a comprehensive guide detailing the project structure, including an overview, folder organization, example JSON for a map, and technologies used. This guide provides clear insights into the project's layout and components.
  • README.md: Updated to include a reference to the new project structure guide, enhancing the documentation and making it easier for developers to understand the project's organization.

Codebase cleanup:

  • Test.py: Removed the outdated test script, which included initialization of Pygame, player class definitions, and basic game loop logic. This cleanup helps in maintaining a cleaner codebase and removing unnecessary files.

🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.

## 📋 Pull Request Information **Original PR:** https://github.com/BreizhHardware/project_sanic/pull/30 **Author:** [@BreizhHardware](https://github.com/BreizhHardware) **Created:** 4/7/2025 **Status:** ✅ Merged **Merged:** 4/8/2025 **Merged by:** [@ClementHVT](https://github.com/ClementHVT) **Base:** `main` ← **Head:** `dev` --- ### 📝 Commits (10+) - [`5e5ca57`](https://github.com/BreizhHardware/project_sanic/commit/5e5ca57f6fbdb52829e531aa3152580fcd8521c2) FEAT [Collectibles] - Added Coin item : collectible in map - Coin counter on top of screen - Added custom font for display - [`72454d0`](https://github.com/BreizhHardware/project_sanic/commit/72454d061628bfa95f6e5ed5b06ad0984696c0a6) FEAT [Collectibles] - Reset collectibles uppon death - [`c7bdd34`](https://github.com/BreizhHardware/project_sanic/commit/c7bdd34deb6124b96c80e0d9b6f5834a89293d59) Merge remote-tracking branch 'origin/dev' into dev_clement - [`0e57df7`](https://github.com/BreizhHardware/project_sanic/commit/0e57df7b3f6b3957c1710aab7f770c3b3eb22f47) Feat[platform, projectiles], move circular platform, add projectile cast for the player - [`ee54b5d`](https://github.com/BreizhHardware/project_sanic/commit/ee54b5d272d5b3cec0b1d879cdecf8ecc98bad44) Feat(Game Logic) - Refactor main game loop into a separate handler function for improved code organization and maintainability - [`90b6c94`](https://github.com/BreizhHardware/project_sanic/commit/90b6c948eb11567f25440bff6d5f879f2035f0a4) Feat(Level Design) - Update platform positions and add movement behavior; implement camera panning in LevelEditor for enhanced editing experience - [`d34b532`](https://github.com/BreizhHardware/project_sanic/commit/d34b5324dc97ae587fc0b3d72cea206cfc2ce8a6) Feat(Infinite Mode) - Implement infinite level generation and management; add InfiniteMapGenerator and InfiniteMapManager for procedural map creation - [`6368555`](https://github.com/BreizhHardware/project_sanic/commit/6368555e8cbf8dac1c5c32b25070db2e0c8e6fb1) Update src/Map/Infinite/InfiniteMapManager.py - [`d8e0ec9`](https://github.com/BreizhHardware/project_sanic/commit/d8e0ec9f7ad1ae89aed991bb682b78fbbc706ad1) Merge pull request #20 from BreizhHardware/dev_felix - [`8c90eed`](https://github.com/BreizhHardware/project_sanic/commit/8c90eed529c222ee1a08cae100514e439c4c22b4) Merge remote-tracking branch 'origin/dev' into dev_table_basse ### 📊 Changes **52 files changed** (+1986 additions, -934 deletions) <details> <summary>View changed files</summary> 📝 `.gitignore` (+2 -1) ➕ `PROJECT_STRUCTURE.MD` (+245 -0) 📝 `README.md` (+4 -1) ➖ `Test.py` (+0 -223) ➕ `assets/fonts/sanicfont.TTF` (+0 -0) ➕ `assets/map/background/cave_bg.png` (+0 -0) ➕ `assets/map/background/desert_bg.jpg` (+0 -0) ➕ `assets/map/background/mountain_bg.jpg` (+0 -0) ➕ `assets/map/checkpoints/checkpoint.png` (+0 -0) ➕ `assets/map/checkpoints/checkpoint_uncheck.png` (+0 -0) ➕ `assets/map/collectibles/Sanic_Coin.png` (+0 -0) ➕ `assets/map/enemy/Laser.png` (+0 -0) ➕ `assets/map/enemy/boss.gif` (+0 -0) ➕ `assets/map/enemy/flying_enemy.png` (+0 -0) ➕ `assets/map/enemy/turret.gif` (+0 -0) ➕ `assets/map/enemy/walker_enemy.png` (+0 -0) ➕ `assets/map/exit/Zeldo Motus.mp4` (+0 -0) ➕ `assets/map/exit/Zeldo.png` (+0 -0) ➖ `assets/map/platform/grass_texture.jpg` (+0 -0) ➕ `assets/map/platform/grass_texture.png` (+0 -0) _...and 32 more files_ </details> ### 📄 Description This pull request includes significant updates and improvements to the project documentation and codebase. The most important changes include the addition of a detailed project structure guide, updates to the README file to reference the new project structure, and the removal of an outdated test script. Documentation updates: * [`PROJECT_STRUCTURE.MD`](diffhunk://#diff-9758481bc47bdd4770f08728266bc56fb2bfc47abf23ce3c9952bd0531693ec8R1-R245): Added a comprehensive guide detailing the project structure, including an overview, folder organization, example JSON for a map, and technologies used. This guide provides clear insights into the project's layout and components. * [`README.md`](diffhunk://#diff-b335630551682c19a781afebcf4d07bf978fb1f8ac04c6bf87428ed5106870f5R93-R95): Updated to include a reference to the new project structure guide, enhancing the documentation and making it easier for developers to understand the project's organization. Codebase cleanup: * [`Test.py`](diffhunk://#diff-d1100ca3d28266f46ca4ed3eb199e43681ce1f9f89b297c3b28af3508195bd15L1-L223): Removed the outdated test script, which included initialization of Pygame, player class definitions, and basic game loop logic. This cleanup helps in maintaining a cleaner codebase and removing unnecessary files. --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>
BreizhHardware 2026-05-06 12:17:26 +02:00
Sign in to join this conversation.
No labels
pull-request
No milestone
No project
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference
BreizhHardware/project_sanic#30
No description provided.