Commit Graph
690 Commits
Author SHA1 Message Date
MeirGavish 8e1867d235 Switch example gameplay gif to updated video in README (#366) 2026-01-19 09:22:42 +02:00
MeirGavish fd2235d2f6 Update control instructions in README.md (#365) 2026-01-19 09:22:09 +02:00
Emma fc5767c96e Reset selection_y after blind skip (#362) 2026-01-16 08:11:47 +02:00
MeirGavish bb82ab69af Encoded palette indexing in background pngs (#350) 2026-01-15 17:09:04 -08:00
5300846f73 Refactored to use selection grid during round (#348)
* Added wrapping to selection grid

* Added return value to on_selection_changed to allow aborting on wrap

* Extracted button code to button.c/.h

* Bounds checking changes for selection_grid_move_selection_horz()

---------

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Co-authored-by: Rickey <ric@rf3.xyz>
2026-01-15 20:32:09 +02:00
MeirGavish b7cc3ec5d6 [Optimization] Slow score lerping from 60 to 30 FPS (#336) 2026-01-14 16:43:53 -08:00
Horváth Balázs 11dafe26ac Fix Four Fingers joker effect persisting after game over (#359)
* Fix four fingers joker effect stuck after game over

* Fix game_over_on_exit() not removing owned jokers
2026-01-11 23:18:40 +02:00
MeirGavish d56528bc5a Changed to custom Balatro font by @MathisMartin31 (#340)
* Changed to custom Balatro font by @MathisMartin31

* Made tweaks to the font

* Tweaked F and y
2026-01-07 17:54:43 -08:00
MeirGavish db9879b5b5 Added blind score requirement and reward in blind select screen (#282)
* Added blind select requirement and rewards printing

* Broke game_blind_select_print_blinds_reqs_and_rewards() into separate functions
2026-01-06 11:06:24 +02:00
MeirGavish 34889988a9 Added documentation to get_played/hand_distribution (#343)
* Added documentation to get_played/hand_distribution

* Documented get_played_distribution() behavior
2025-12-28 11:20:30 -08:00
MeirGavishandCopilot 6575fc7f94 Update the truncate number function to use decimal point (#333)
* Fixed to truncate as "1.234M" instead of "1234K"

* Optimized by switching to strings to avoid divisions

* Changed FP constants to strings

---------

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
2025-12-23 07:52:30 +02:00
MeirGavish f76c25614c Change selection grid to maintain relative horizontal position when switching rows (#329)
* Change selection grid to maintain relative horizontal position when switching rows

* clang-format

* Fixed joker selling index error

* Protect against division by 0 and removed redundant fixed point conversions.
2025-12-21 22:00:08 -08:00
RickeyandMeirGavish 955a0942f1 Add contributing guide (#334)
* Add contributing guide

* small format changes for CONTRIBUTING.md

* Update CONTRIBUTING.md

Co-authored-by: MeirGavish <meir.gavish@gmail.com>

* Update CONTRIBUTING.md with more clang-format

* Move stuff around for CONTRIBUTING

* Update VScode instructions

* Remove recommendation for formatOnSave

* Update the clang-format thing again

* Update CONTRIBUTING.md

Co-authored-by: MeirGavish <meir.gavish@gmail.com>

---------

Co-authored-by: MeirGavish <meir.gavish@gmail.com>
2025-12-21 17:27:03 -08:00
MeirGavish 8fb0813cf5 Fixed incorrect swapped font mapping for .2 and .3 (#332) 2025-12-19 12:18:33 -08:00
Rickey 1da8e0332e document splash_screen.h (#331) 2025-12-19 11:22:21 +02:00
RickeyandMeirGavish 628c0c992d Introduce decimal point font (#314)
* Introduce decimal point font

* Add png of font

* Add getting a decimal point str from int

* Move font out of utils

* Clang format

* set Readme.md as main page in docs

* Add font generator

* kind of fix font

* Fix image oddities

* Added pip install pillow to build_ci_workflow

* Added ensurepip

* Update Docker/CI for font generation

* Fix CI

* Fix CI forreal

* Another CI fix

* Fix directory name for rom

* Adjust directory

* Dummy commit for test

* Revert "Dummy commit for test"

This reverts commit b607085c1322c824d2fdd800ab3c3700389ad3a6.

* dos2unix and update .gitignore

* Delete the generated font file

* Delete the generated font file

* remove dot from font

* Update include/font.h

Co-authored-by: MeirGavish <meir.gavish@gmail.com>

---------

Co-authored-by: MeirGavish <meir.gavish@gmail.com>
2025-12-18 18:19:01 -08:00
faa75a4eea Swap Cards in Hand (#280)
* card sorting

* Added refactor from @MeirGavish

---------

Co-authored-by: MathisMartin31 <mathis.martin31@gmail.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
2025-12-18 15:14:28 +02:00
Rickey 9a2d128e87 Fix url for nightly (#323) 2025-12-18 05:36:33 +02:00
MeirGavish 34419a589f Music - Fixed wrong G/D chord sample (#321)
* Fixed wrong G/D chord sample

* Added openmpt .bak files to .gitignore
2025-12-16 22:47:58 +02:00
CopilotandMeirGavish b146bb667b Add parentheses to timer macro expressions (#319)
---------

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: MeirGavish <34395426+MeirGavish@users.noreply.github.com>
2025-12-16 11:43:07 +02:00
MeirGavish e90f23661d Sound effects for score accumulation and blind menu pop-up (#313) 2025-12-16 10:32:04 +02:00
MeirGavish 177a3a9741 Fixed bug where the mult wasn't truncated (#315) 2025-12-16 09:53:50 +02:00
MeirGavishandRickey f095bf7024 Added documentation for selection_grid.h (#309)
* Added documentation for selection_grid.h

* Fix clang-format

* Update include/selection_grid.h

Co-authored-by: Rickey <ric@rf3.xyz>

* Added NULL-checks for selection_grid_move_selection_horz/vert()

---------

Co-authored-by: Rickey <ric@rf3.xyz>
2025-12-15 21:16:25 -08:00
MeirGavish 81e6b7ab31 Button sound effect (#312)
* Removed magic number for CARD_FOCUS_SFX_PITCH_OFFSET_RANGE
2025-12-13 16:10:15 +02:00
MeirGavish 8a9750b0b3 Used proper text centering for price printing and consolidated functions for printing and erasing (#308) 2025-12-13 09:03:06 +02:00
MeirGavish ae5369b8fe Added C standard gnu23 to the makefile (#288)
* Added C standard gnu23 to the makefile

* Added gnu23 standard to all test modue makefiles

* Added installation of latest gcc version to tests workflow

* Fixed typo in previous commit

* Made GCC 14 installation conditional and moved from the workflow to the script

* Extracted GCC version check to external script for CI and created tests README

* Added #!/bin/bash

* Make check_gcc_version.sh executable
2025-12-12 18:46:03 -08:00
MeirGavish 9bffe5c9a9 Refactor - remove selected from SpriteObject (#305) 2025-12-12 18:44:26 -08:00
Tygyh 440efe1ce1 Update .gitignore with .idea and codeQL directories (#310) 2025-12-12 12:26:33 +02:00
MeirGavish 16b24a0bf9 Updated splash screen with new organization URL (#306) 2025-12-10 23:00:46 -08:00
Marcel Schulz f9ed858549 [Fixed] Joker shop price not properly erased on purchase (#286) 2025-12-11 08:39:09 +02:00
MeirGavish 1e1fe85b88 Merge pull request #227 from GBALATRO/music_relayer_chords
Music - Relayered chord samples
2025-12-11 07:02:20 +02:00
MeirGavish 0698d27ce9 Music - Switched to 44.1kHz chord samples 2025-12-11 07:00:38 +02:00
MeirGavish a4e1fab100 Music - Switched chords to C-based samples (+reused some frames instead of copy-pasted ones) 2025-12-11 07:00:38 +02:00
MeirGavish d22fcb0056 Music - Relayered chord samples 2025-12-11 07:00:38 +02:00
MeirGavish d96bc9b1c2 Renamed GBLA_UNUSED -> GBAL_UNUSED and updated RowOnKeyTransitFunc documentation (#292) 2025-12-10 17:17:28 -08:00
MeirGavish 5a4856ec82 Refactor - removed tile_mem obj charblock index magic number (#293) 2025-12-10 17:13:59 -08:00
RickeyandMeirGavish 2fb9e6d633 Clang format joker files and def files (#257)
* Clang format joker files and def files

* Fix blind usage of GBLA_UNUSED macro

* Add final files for clang-format (main.c and selection_grid.h)

---------

Co-authored-by: MeirGavish <meir.gavish@gmail.com>
2025-12-10 09:41:24 +02:00
RickeyandMeirGavish 35ecbf33ae Format and document utility files (#246)
* Format and document utility files

* Add Doxyfile

* small updates for cleanup

* Final touches for util docs

* Replace `_` with `s_` for static functions

* update for clang-format changes

* Update include/audio_utils.h

Co-authored-by: MeirGavish <meir.gavish@gmail.com>

* Apply suggestions from code review

Co-authored-by: MeirGavish <meir.gavish@gmail.com>

* Update include/audio_utils.h

Co-authored-by: MeirGavish <meir.gavish@gmail.com>

* Update include/graphic_utils.h

Co-authored-by: MeirGavish <meir.gavish@gmail.com>

* Make clang-format happy :)

* Update gitignore for doxygen

* restor graphic_utils.c to main

* update graphics utils

* tmp

* tmp

* get it to compile

* fix some bad merge mistakes

* Fix clang format

* Apply suggestions from code review

Co-authored-by: MeirGavish <meir.gavish@gmail.com>

* make clang-format happy

---------

Co-authored-by: MeirGavish <meir.gavish@gmail.com>
2025-12-07 12:56:39 -08:00
MeirGavish 7bd510ee5f Update README for consistency in capitalization 2025-12-07 15:37:28 +02:00
MeirGavish cf746c597e Update README with joker swap controls
Added controls for swapping jokers in the shop.
2025-12-07 15:36:43 +02:00
bf66f96844 Add swapping order of Owned Jokers (#258)
* swap Jokers

* Hide score properly

* add key_released to inputs triggering selection_grid process input

* format code

* Add suggestions and bug fixes from @MeirGavish

* Add comment

* format selection_grid

* toto

* format

* format

* Turned clang-format off for selection grid rows

* revert reroll bug fix, already adressed

* format selection_grid.c

* Move conditions around in game.c

* typo

* Attempt at fixing braced initializer indent format

---------

Co-authored-by: MathisMartin31 <mathis.martin31@gmail.com>
Co-authored-by: MeirGavish <meir.gavish@gmail.com>
2025-12-07 02:58:50 -08:00
Rickey a82bd671de Separate clang-format test into its own workflow (#283)
* Rework workflow dependencies
2025-12-06 23:59:55 +02:00
GeraltandMathisMartin31 687d77e18a Improve Face Cards sprite art (#284)
* Tweaks by @MeirGavish

---------

Co-authored-by: MathisMartin31 <mathis.martin31@gmail.com>
2025-12-06 16:33:23 +02:00
MeirGavish 28ff6c81ef Fixed bug where reroll button is triggered by any key (#279) 2025-12-05 10:06:43 +02:00
MeirGavish 9f170f298d Restored removed joker shop availability check function (#276) 2025-12-04 18:21:10 -08:00
291edaf4f2 Clang format and refactor game.h/c + update Bracket Alignment to BlockIndent (#259)
* Refactor and clang-format game.h/c

* Updated clang-format AlignAfterOpenBracket: BlockIndent and ColumnLimit: 100 and refactored all files accordingly

---------

Co-authored-by: MeirGavish <meir.gavish@gmail.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
2025-12-03 13:49:31 +02:00
MeirGavishandCopilot 43d837571e Truncate Scores (#269)
* Fixed score truncation erasure, and centering for chips, mult, score and "temp score

* Added centering for money

* Added tests for truncate_uint_to_suffixed_str()

* Fixed u32 bug with get_digits

* Fixed score flames for large numbers

* Small change to update documentation

* Added 1 pixel on to score rect on the left to make room for full character tile + reset_top_left_panel_bottom_row() refactor

* Replaced directional defines with enums

* Updated ante_lut comment

---------

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
2025-12-02 08:28:36 +02:00
GeraltandMathisMartin31 07cab81ba1 Fix Wrathful Joker missing pixel (#272)
Co-authored-by: MathisMartin31 <mathis.martin31@gmail.com>
2025-12-01 09:34:30 +02:00
GeraltandMathisMartin31 10e75f18ae remove triboulet from code (#266)
Co-authored-by: MathisMartin31 <mathis.martin31@gmail.com>
2025-11-30 18:11:48 +02:00
MeirGavish 2d7394f03e Fixed corners for Banner joker (#271) 2025-11-30 17:57:05 +02:00