 cellos51
|
ed484d6557
|
temporary overwrite of previous merge. I've been working on this for 10 hours today and really do not have the patience to resolve the conflicts right now. I'll do it later 😭
|
2025-07-16 01:20:50 -04:00 |
|
|
cellos51
|
309ebf281a
|
Major refactor, too much else to list, check the git changes.
|
2025-07-16 00:55:27 -04:00 |
|
|
Gordie
|
70b3f089fb
|
Merge pull request #31 from GreenNinja2525/main
Address potential Copyright and Legal Action through Disclaimer and Copyright Notice
|
2025-07-14 02:09:20 -04:00 |
|
|
Gordie
|
f75e90f29b
|
Merge pull request #33 from MeirGavish/refactors
Added move/copy rect functions in graphic_utils
|
2025-07-13 20:52:06 -04:00 |
|
|
MeirGavish
|
5d5a8a2d4b
|
Fixed an error in previous hand background commit
|
2025-07-13 23:42:03 +03:00 |
|
|
GreenNinja2525
|
e57b921d23
|
Merge branch 'cellos51:main' into main
|
2025-07-13 16:30:02 -04:00 |
|
|
MeirGavish
|
caeb9ae6ef
|
Merge branch 'main' into refactors
|
2025-07-13 23:26:45 +03:00 |
|
|
MeirGavish
|
8cbfa70590
|
Switched hand background playing/selecting switch to use small moves instead of big copies
|
2025-07-13 23:17:37 +03:00 |
|
|
MeirGavish
|
e7589f27dc
|
Added move version (...)se_move_rect_1_tile_vert(), switched to use it in down pop-out animations, updated copy version, and removed my POP_MENU_ANIM_RECT UP/DOWN hack
|
2025-07-13 21:20:57 +03:00 |
|
|
MeirGavish
|
f34444b3db
|
Fixed main_bg_se_copy_rect(), exposed it, and used it in a few places
|
2025-07-13 20:41:40 +03:00 |
|
|
Gordie
|
b4b1f8adc8
|
Merge pull request #32 from MeirGavish/fix_build_error
Fixed compilation error
|
2025-07-13 12:50:01 -04:00 |
|
|
GreenNinja2525
|
4f8930510e
|
Update main.c and remove #include "background_play_gfx.h"
|
2025-07-13 12:21:56 -04:00 |
|
|
MeirGavish
|
90f8e47229
|
Merge branch 'fix_build_error' into refactors
|
2025-07-13 13:07:42 +03:00 |
|
|
MeirGavish
|
e65d15654f
|
Fixed compilation error
|
2025-07-13 11:15:30 +03:00 |
|
|
GreenNinja2525
|
abc4d62405
|
Merge branch 'cellos51:main' into main
|
2025-07-12 23:49:07 -04:00 |
|
|
GreenNinja2525
|
297aa22ca1
|
Add copyright and disclaimer to address potential Copyright and Legal Action
|
2025-07-12 23:48:49 -04:00 |
|
|
cellos51
|
e7a8e669ca
|
Forgot to include boss blind functionality into background
|
2025-07-12 23:40:14 -04:00 |
|
|
cellos51
|
847f602c9e
|
Changed the way the selecting/played background works and added logic for changing the background depending on blind type
|
2025-07-12 23:39:13 -04:00 |
|
|
MeirGavish
|
9f34d9fd95
|
Merge branch 'main_bg_se_copy_rect' into refactors
|
2025-07-13 04:56:04 +03:00 |
|
|
cellos51
|
191c1a7264
|
Made blind tokens visible in GAME_BLIND_SELECT state
|
2025-07-12 19:47:49 -04:00 |
|
|
cellos51
|
f80bfefad5
|
fixed an issue with the shop icon breaking after going to the next round
|
2025-07-12 01:22:16 -04:00 |
|
|
Gordie
|
43d06921ce
|
Merge pull request #29 from GreenNinja2525/main
Edit README.md to temporarily remove Linux stuff for now
|
2025-07-11 23:06:05 -04:00 |
|
|
GreenNinja2525
|
c1b67e57d0
|
Edit README.md to temporarily remove Linux stuff for now
|
2025-07-11 21:51:07 -04:00 |
|
|
cellos51
|
1fc194448e
|
fixed blind descend animation
|
2025-07-11 18:56:52 -04:00 |
|
|
cellos51
|
1ac345b71b
|
Changed the word "my" to "an" in the readme to disassociate myself as the sole owner
|
2025-07-11 18:42:40 -04:00 |
|
|
cellos51
|
53d89b2752
|
Merge branch 'main' of https://github.com/cellos51/balatro-gba
|
2025-07-11 18:32:20 -04:00 |
|
|
cellos51
|
6266ea9fa5
|
Unified timer default value to be 0
|
2025-07-11 18:32:17 -04:00 |
|
|
Gordie
|
e76a42dd88
|
Merge pull request #28 from GreenNinja2525/main
Small corrections to Windows Build instructions.
|
2025-07-11 17:57:21 -04:00 |
|
|
GreenNinja2525
|
3c95bf2682
|
Small corrections to Windows Build instructions.
|
2025-07-11 14:40:21 -04:00 |
|
|
cellos51
|
beaf365e0c
|
Fixed compilation issue and changed default background
|
2025-07-11 13:52:33 -04:00 |
|
|
Gordie
|
541ad72a65
|
Merge pull request #26 from MeirGavish/start_at_blind_selection
Changed game to start at blind selection
|
2025-07-11 13:48:26 -04:00 |
|
|
MeirGavish
|
43a32f5a99
|
Merge branch 'main' into start_at_blind_selection
|
2025-07-11 19:42:52 +03:00 |
|
|
Gordie
|
f9f58603c3
|
Merge pull request #27 from MeirGavish/refactors
Fixed issue where pop menu panels overrode joker and consumable panels
|
2025-07-11 12:33:00 -04:00 |
|
|
MeirGavish
|
8d721b77e1
|
Fixed issue where pop menu panels overrode joker and consumable panels
|
2025-07-11 18:58:06 +03:00 |
|
|
MeirGavish
|
a9a49e0884
|
Avoid non-small blind selection because it currently crashes the game
|
2025-07-11 18:42:53 +03:00 |
|
|
MeirGavish
|
4e5e1f340e
|
Changed game to start at blind selection - added game_round_init() and game_set_state() etc to try and make easier state transmissions
|
2025-07-11 18:22:45 +03:00 |
|
|
Gordie
|
1d400d98ea
|
Merge pull request #25 from GreenNinja2525/main
Add Initial Build Instructions For Windows and Update README.md
|
2025-07-10 23:12:51 -04:00 |
|
|
GreenNinja2525
|
a32c1fa8b2
|
Add Initial Build Instructions For Windows and Update README.md
|
2025-07-10 22:57:22 -04:00 |
|
|
Gordie
|
ebb6177d0d
|
Merge pull request #22 from MeirGavish/refactors
Refactor - used main_bg_se_copy_rect_1_tile_vert() for current blind raising
|
2025-07-10 21:44:36 -04:00 |
|
|
cellos51
|
be08cb79be
|
Added some comments into the game_round_end() function
|
2025-07-10 21:33:38 -04:00 |
|
|
MeirGavish
|
3741f6f3bd
|
Used main_bg_se_copy_rect_1_tile_vert for current blind raising
|
2025-07-11 04:06:04 +03:00 |
|
|
MeirGavish
|
2b60340747
|
Created function main_bg_se_copy_rect
|
2025-07-11 03:05:34 +03:00 |
|
|
MeirGavish
|
04e9aefe51
|
Merge branch 'main' into refactors
|
2025-07-11 02:44:47 +03:00 |
|
|
Gordie
|
867681bf0c
|
Merge pull request #21 from MeirGavish/refactors
Refactors - Added screen rect vertical copying function
|
2025-07-10 17:19:41 -04:00 |
|
|
MeirGavish
|
4f3c91361d
|
Whitespace edit
|
2025-07-10 23:37:56 +03:00 |
|
|
MeirGavish
|
05f4cc2abb
|
Fixed generic main_bg_se_copy_rect_1_tile_vert() function and replaced some code with it
|
2025-07-10 23:20:44 +03:00 |
|
|
MeirGavish
|
6ef1f51c55
|
Merged "main"into "refactors" (manual conflict resolution)
|
2025-07-10 16:47:53 +03:00 |
|
|
MeirGavish
|
fb7b60431c
|
Extracted pop menu animation to a rect copying function for shop
|
2025-07-10 16:37:43 +03:00 |
|
|
cellos51
|
f027c7bea0
|
Added the ability to skip blinds in the blind select state
|
2025-07-09 22:06:49 -04:00 |
|
|
cellos51
|
e1c1d68694
|
basic implementation of blind select screen
|
2025-07-09 21:37:49 -04:00 |
|