Commit Graph

408 Commits

Author SHA1 Message Date
Nan bc44de0493 Update include/joker.h
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
2025-10-08 17:57:20 +02:00
Nan 2669afbae2 Merge branch 'main' of https://github.com/cellos51/balatro-gba 2025-09-15 21:46:48 +02:00
MeirGavish a16065439e Merge pull request #117 from ricfehr3/main
Add docker support
2025-09-15 22:30:21 +03:00
Rickey Fehr 5b76cbfad0 Add cache for docker compose container 2025-09-14 15:15:42 -07:00
Rickey Fehr 074f1956aa Update Github Actions CI to use Docker Compose 2025-09-14 15:15:10 -07:00
Nan 35c0d383c5 Add blueprint and brainstorm jokers
Implements blueprint and brainstorm to the game, but leaves the implementations commented out as they are still missing assets.
2025-09-13 22:18:31 +02:00
Rickey Fehr b27c94e5bd Add docker support
Add docker support via a docker compose file with included instructions.
2025-09-11 12:59:52 -07:00
MeirGavish d1bbba82df Merge pull request #112 from GreenNinja2525/main
Revise Build Instructions
2025-08-30 20:56:32 +03:00
Wheeler 984e77d6c8 Add Missing Instruction and Move Link
Fixed some things
2025-08-29 20:12:59 -04:00
Wheeler 2bd253f451 Formatting Error
I did that merge into main thing again, that's my bad, misclicked. This just fixes a small error I made.
2025-08-29 19:25:22 -04:00
Wheeler 176accd1a6 Merge branch 'cellos51:main' into main 2025-08-29 19:19:15 -04:00
Wheeler 3c09d6fb79 Revise Build Instructions
I added the link to the video @cellos51 made about compiling the project. I updated the build instructions to reflect the steps made in the video and condensed the information to be more readable. I also tried fixing the dynamic badges, but I don't think it completely worked. They update automatically but it takes a really long time (couple hours) because of GitHub API Caching Issues. This is a small pull request, I'll open requests in the future for larger scale commits. @MeirGavish can merge if they want if cellos51 is busy. Let me know if I made an error, thanks! 👍
2025-08-29 19:18:35 -04:00
MeirGavish aec53ced91 Merge pull request #111 from cellos51/held_jokers_refactor
Small refactor for the joker lists to have wrapping functions to add and remove jokers
2025-08-30 02:16:15 +03:00
MeirGavish cc65fbc5de Small refactor for the joker lists to have wrapping functions to add and remove jokers 2025-08-30 02:15:00 +03:00
Elliptical ff62b12ac9 Merge pull request #91 from cellos51/hblank_affine_background_effects
HBlank based visual effects for affine background
2025-08-29 15:18:49 -04:00
MeirGavish c15c2821e8 Merge branch 'hblank_affine_background_effects' of https://github.com/cellos51/balatro-gba into hblank_affine_background_effects 2025-08-29 16:26:41 +03:00
cellos51 d0d83eb236 Main menu uses HBLANK and the game uses standard affine background 2025-08-28 23:00:27 -04:00
cellos51 f4d8fc9097 Merge branch 'main' of https://github.com/cellos51/balatro-gba into hblank_affine_background_effects and changed parameters on affine source to be updated from experimental branch 2025-08-28 22:39:48 -04:00
Elliptical a478701deb Merge pull request #93 from cellos51/main_menu_and_splash_screen
Main menu and splash screen
2025-08-28 19:35:55 -04:00
cellos51 c41fcd1a24 Remove unused definition for maximum background palette size 2025-08-28 19:04:51 -04:00
cellos51 4b7a22baff made all palettes have their length set in grit 2025-08-28 19:03:48 -04:00
cellos51 bc32707126 replaced magic numbers for background palette size 2025-08-28 16:09:46 -04:00
cellos51 6e2d3ee499 Merge branch 'main' of https://github.com/cellos51/balatro-gba into hblank_affine_background_effects 2025-08-25 19:34:25 -04:00
Elliptical 06ca593e8a Update source/game.c
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
2025-08-25 18:06:35 -04:00
cellos51 8fafcd1cdf Reduced amount of menu buttons 2025-08-25 17:52:27 -04:00
cellos51 b9b87a7b30 Refactor countdown timer rectangle usage in splash screen for improved readability 2025-08-25 17:50:16 -04:00
cellos51 7b2fc1ac75 Refactor main menu button color definitions for clarity and consistency 2025-08-25 16:59:10 -04:00
Elliptical 94821ffa27 Update source/game.c
Co-authored-by: MeirGavish <meir.gavish@gmail.com>
2025-08-25 16:15:07 -04:00
Elliptical 21d85f49ab Update source/main.c
Co-authored-by: MeirGavish <meir.gavish@gmail.com>
2025-08-25 16:14:51 -04:00
MeirGavish 5e4722e27b Merge pull request #109 from GreenNinja2525/main
README.md Rework with Custom Badges
2025-08-25 21:13:00 +03:00
Wheeler cb66b30795 Remove Forks and Stars badges 2025-08-25 12:54:37 -04:00
Wheeler dda6585935 Minor Text Tweak
Fixed some unclear wording and fixed some formatting.
2025-08-25 08:06:29 -04:00
Wheeler ab8a143eeb Minor Text issues
Just had to fix some little things.
2025-08-25 08:00:18 -04:00
Wheeler 5dbc50d755 Scale Gif and Add Balatro Wiki Badge
Makes it easier to find the Wiki (the one I use) and the gif is now properly appearing and scaling. The Gif is a little blurry, but I don't know how to fix that and if it bothers too many people I'll just revert it.
2025-08-25 07:55:59 -04:00
Wheeler ba36679a3b Add New Gameplay Gif
New Gif shows a Joker being used and shows the shop screen as well as a round that is won by a straight.
2025-08-25 07:32:44 -04:00
Wheeler 9ab2fef330 Remove Watchers Badge
I felt it was unnecessary and caused some bloat. I think the others are much more important than how many watchers there are.
2025-08-24 20:27:27 -04:00
Wheeler 387bbbfda0 Add Icons to Badges, Remove Linux Instructions Section
I spaced out some of the steps to be easier to read. The dynamic badges should be dynamic and update periodically. I may have to fix them another time. They should update every few hours. The Common issues part was also adjusted and I removed the Linux part as it took up unnecessary space. Unless someone figures out build instructions for Linux, they won't be featured.
2025-08-24 20:23:08 -04:00
cellos51 4f1f7cb347 Add splash screen functionality and update game state management
- Introduced GAME_SPLASH_SCREEN state in game.h
- Implemented splash_screen_init and splash_screen_update functions in splash_screen.c
- Updated game.c to initialize with GAME_SPLASH_SCREEN and handle splash screen updates
- Removed old splash screen code from main.c
2025-08-24 15:44:45 -04:00
cellos51 da6248036c Remove unnecessary joker initialization in game_start and set game state to GAME_BLIND_SELECT 2025-08-24 13:47:59 -04:00
cellos51 53e6156397 Merge branch 'main' of https://github.com/cellos51/balatro-gba into main_menu_and_splash_screen 2025-08-24 13:47:41 -04:00
Wheeler 06087370a1 Add Dynamic Badges and more small tweaks
There is now 6 dynamic badges that will update accordingly when something changes. They may take a few minutes to properly update but are solely aimed to make the README more interesting to look at. I also made some small layout adjustments.
2025-08-22 23:56:25 -04:00
Wheeler 8a50940f48 Add Controls, minor tweaks and shorten Xbox Logo URL
I figured out how to make the Xbox logo use a smaller URL instead of drawing a full SVG, it now fetches a slug (SVG hosted on another site) to draw the button. This is faster and looks better code wise.
2025-08-22 23:05:52 -04:00
Wheeler e86777b4cc Add Cool Link Buttons to README.md
Don't merge yet, I'm still adding stuff to the Readme and tweaking some things. It will all make sense and look much better when I'm done.
2025-08-22 20:30:00 -04:00
MeirGavish ff9c28cbed Merge branch 'main' into hblank_affine_background_effects 2025-08-22 20:16:26 +03:00
MeirGavish 3d3d7198b8 Merge pull request #107 from cellos51/blue_joker_fixes_additional_proposed_changes
Additional change for Blue Joker
2025-08-22 19:58:09 +03:00
MeirGavish ff54bb244f Merge pull request #108 from cellos51/smiley_scary_face
Added art for Scary Face and Smiley Face by @GreenNinja2525 and enabled them in code
2025-08-22 19:55:46 +03:00
MeirGavish 1d070b9c3f Fixed Blue Joker shine 2025-08-22 19:47:56 +03:00
MeirGavish 2d50005e30 Added art for Scary Face and Smiley Face by @GreenNinja2525 and enabled them in code 2025-08-22 19:43:27 +03:00
MeirGavish c5488fb008 Merge pull request #106 from GreenNinja2525/main
Update Blue Joker and Fix Greedy Joker's Outline
2025-08-22 18:41:43 +03:00
MeirGavish 76f225168a Additional change for Blue Joker 2025-08-22 18:28:00 +03:00