Preparing Alpha Branch #4039
Merged
Preparing Alpha Branch #4039
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
…es-02-20-2025-1740095094 [CI] Merge patch-atomic-updating-the-game-notes-02-20-2025-1740095094 into dev
…02-20-2025-1740095211 [CI] Merge patch-atomic-hud-background-image-02-20-2025-1740095211 into dev
…1740096000 [CI] Merge patch-atomic-hud-icons-02-20-2025-1740096000 into dev
…enu-01 feat: added shop - UI
h0lybyte
approved these changes
Feb 21, 2025
…025-1740102817 [CI] Merge patch-atomic-journal-notes-02-20-2025-1740102817 into dev
…date-02-20-2025-1740104245 [CI] Merge patch-atomic-gamejam-background-update-02-20-2025-1740104245 into dev
…und-02-21-2025-1740114362 [CI] Merge patch-atomic-adding-static-background-02-21-2025-1740114362 into dev
…d-02-21-2025-1740123192 [CI] Merge patch-atomic-updating-adding-shield-02-21-2025-1740123192 into dev
…d-02-21-2025-1740136525 [CI] Merge patch-atomic-updating-adding-shield-02-21-2025-1740136525 into dev
…025-1740137051 [CI] Merge patch-atomic-unlock-camera-02-21-2025-1740137051 into dev
…25-1740141661 [CI] Merge patch-atomic-asterplosion-02-21-2025-1740141661 into dev
…025-1740142762 [CI] Merge patch-atomic-player-saving-02-21-2025-1740142762 into dev
…-21-2025-1740145031 [CI] Merge patch-atomic-updated-hud-format-02-21-2025-1740145031 into dev
h0lybyte
approved these changes
Feb 21, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Initial PR body for Alpha with categorized commits:
### Fixes:
f8c43ba fix(brackeys13): updated the hud
15a7e42 fix(brackeys13): updated laser pool.
70a7c8c fix(brackeys13): better toast notification.
### Documentation:
4f33301 docs(journal): daily journal update.
9a862ae docs(brackeys): updating the Entity notes.
### Features:
687e995 feat(brackeys13): added saving and loading for the player.
88256f8 feat(brackeys13): asteroid explosion added but its bugged out.
12e1b4e feat(brackeys13): unlocked map.
488b3a9 feat(brackeys13): added shield support.
323cb37 feat(brackeys13): better entity management.
41032e3 feat(brackeys13): adjusted the background and the spaceship with animation.
8a4791d feat(brackeys13): added objects to the universe layer.
025efe0 feat(brackeys13): updated hud with new icons.
68f649e feat(brackeys13): updated the hud with a hexgrid bg.
### Merge Commits:
d3a25ed Merge pull request #4052 from KBVE/patch-atomic-updated-hud-format-02-21-2025-1740145031
5c81664 Merge pull request #4051 from KBVE/patch-atomic-player-saving-02-21-2025-1740142762
489762d Merge pull request #4050 from KBVE/patch-atomic-asterplosion-02-21-2025-1740141661
e3e34eb Merge pull request #4049 from KBVE/patch-atomic-unlock-camera-02-21-2025-1740137051
9ae0736 Merge pull request #4048 from KBVE/patch-atomic-updating-adding-shield-02-21-2025-1740136525
15840f1 Merge pull request #4047 from KBVE/patch-atomic-updating-adding-shield-02-21-2025-1740123192
b57456f Merge pull request #4046 from KBVE/patch-atomic-adding-static-background-02-21-2025-1740114362
1b69622 Merge pull request #4045 from KBVE/patch-atomic-gamejam-background-update-02-20-2025-1740104245
f038925 Merge pull request #4044 from KBVE/patch-atomic-journal-notes-02-20-2025-1740102817
1eb4934 Merge pull request #4043 from SummationX/dev-SummationX-2-20-25-MainMenu-01
8710b7f Merge pull request #4042 from KBVE/patch-atomic-hud-icons-02-20-2025-1740096000
d3498d1 Merge pull request #4041 from KBVE/patch-atomic-hud-background-image-02-20-2025-1740095211
77af681 Merge pull request #4038 from KBVE/patch-atomic-updating-the-game-notes-02-20-2025-1740095094
### Other Commits:
dc319bc Merge branch 'dev' into dev-SummationX-2-20-25-MainMenu-01
805640a feat: added shop