3c2dd0edba
Rename blind enums to represent their type
...
This commit prefixes the enums `BlindType` and `BlindState` with their
types for clarity
2025-10-13 23:36:27 -07:00
7ee07bb34c
Refactor blind into a map
2025-10-13 23:36:27 -07:00
f463ba99a0
changed how game_speed affects hand score animations
2025-10-13 20:28:52 -07:00
767e21d5fa
made the lerped temp score expression clearer
2025-10-13 20:26:20 -07:00
d108836b6a
changed how game_speed affects hand score animations
2025-10-13 20:24:20 -07:00
f36fa5e998
Merge pull request #169 from cellos51/implement_joker_testing
...
Implement joker testing
2025-10-13 21:27:42 +03:00
71de180871
Merge branch 'main' into implement_joker_testing
2025-10-13 20:59:17 +03:00
8c25089966
Allow defining an ID for a joker to always appear in shop and be tested
2025-10-13 20:58:44 +03:00
56c33b2eef
made the lerped temp score expression clearer
2025-10-11 23:45:02 -07:00
cf7c9dc7c3
fixed typo
2025-10-11 13:36:43 -07:00
d7f64d3570
Merge pull request #166 from cellos51/integrate_joker_art
...
Added art for Jokers Bootstraps by @MathisMartin31 and @noctowlhoot and Pareidolia by @NoWhammies10 and @MeirGavish (jokers rearranged for palette optimization)
2025-10-09 23:54:56 +03:00
9d1a51884f
Added art for Jokers Bootstraps by @MathisMartin31 and @noctowlhoot and Pareidolia by @NoWhammies10 and @MeirGavish (jokers rearranged for palette optimization)
2025-10-09 23:42:07 +03:00
609e1f19b6
Merge pull request #159 from MathisMartin31/main
...
Add Pareidolia and Acrobat Jokers
2025-10-09 20:43:36 +03:00
ce5150bffb
Update joker_effects.c
...
Temporarily remove Pareidolia from shop until @MeirGavish can add the artwork for it
2025-10-09 18:57:10 +02:00
ce6d2049f8
Update game.h
...
Fix missing `is_joker_present` rename into `is_joker_owned`
2025-10-09 14:52:41 +02:00
f14f200cb0
Update joker_effects.c
...
Remove the "unused" attribute from joker effect functions that was added by mistake during merge
2025-10-09 14:50:18 +02:00
c4f22be9b9
Update joker.h
...
Restoring the Brainstorm Joker ID, deleted by mistake while adding the Pareidolia Joker ID
2025-10-09 14:46:57 +02:00
30638b65e2
Merge pull request #164 from ricfehr3/hotfix/hand-input-order
...
Fix softlock related to #163
2025-10-09 15:16:56 +03:00
94cb898bb9
Merge pull request #134 from drewjohnson2/magic_numbers
...
Magic numbers
2025-10-09 11:18:02 +03:00
73ec9a40d3
Fix softlock related to #163
2025-10-08 20:29:11 -07:00
6787fab0c2
Merge branch 'main' into main
2025-10-08 23:25:24 +02:00
f752793caa
Shop light specific macros for color
2025-10-08 16:16:23 -05:00
9b6c77ea3f
Merge pull request #119 from Nanrech/pr-fix
...
Add blueprint and brainstorm jokers
2025-10-08 22:46:01 +03:00
4b35b2f7d8
Added art for jokers Blueprint and Brainstorm by @NoWhammies10 and @GreenNinja2525
2025-10-08 22:40:15 +03:00
23a14cb76e
Update source/joker_effects.c
...
Co-authored-by: MeirGavish <meir.gavish@gmail.com >
2025-10-08 20:41:09 +02:00
8ae4968539
Remove duplicated entries
2025-10-08 18:52:10 +02:00
9ae53bddb8
Fix errors introduced by latest commits
2025-10-08 18:39:49 +02:00
af72fe5749
Fix conflicts
...
Attempt 1
2025-10-08 18:21:55 +02:00
7e17419811
Merge branch 'main' into pr-fix
2025-10-08 18:11:20 +02:00
fec243b482
Update source/joker_effects.c
...
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com >
2025-10-08 17:59:27 +02:00
324478845d
Update source/joker_effects.c
...
Co-authored-by: MeirGavish <meir.gavish@gmail.com >
2025-10-08 17:58:11 +02:00
0dbde481d5
Update source/joker_effects.c
...
Co-authored-by: MeirGavish <meir.gavish@gmail.com >
2025-10-08 17:57:50 +02:00
bc44de0493
Update include/joker.h
...
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com >
2025-10-08 17:57:20 +02:00
f257ec03af
Merge pull request #150 from ricfehr3/docs/update-docs-docker
...
Update docs for docker
2025-10-08 10:32:11 +03:00
4e0d72ca8a
PR Feedback
2025-10-08 01:27:15 -05:00
aa5ebd13fc
Add suggestions from @MeirGavish
2025-10-08 08:14:54 +02:00
cca015238d
Update docs for docker
2025-10-07 20:30:11 -07:00
296c489562
Merge pull request #162 from cellos51/integrate_joker_art
...
Integrate joker art
2025-10-08 00:45:09 +03:00
ae40949008
Fixed Bull border corner transparency
2025-10-08 00:18:30 +03:00
77f76bd4ef
Removed "unused" attribute from integrated jokers
2025-10-08 00:05:37 +03:00
a0f1ef7780
Added art for xmult hand jokers The Duo The Trio, The Family, The Order, and The Tribe by @MathisMartin31
2025-10-07 23:52:49 +03:00
73c2db6b69
Merge pull request #143 from ricfehr3/feature/ci-release-on-tag
...
Add uploading ROM on tag push
2025-10-07 23:04:19 +03:00
c529c4be69
Added art for jokers Abstract Joker by @MathisMartin31 and Bull by @NoWhammies10 and @GreenNinja2525
2025-10-07 21:26:43 +03:00
8cd86f1640
Merge remote-tracking branch 'upstream/main'
...
And add NULL Acrobat Joker effect
2025-10-07 20:18:41 +02:00
46936c1878
Added art for jokers Raised Fist by @MathisMartin31 and Reserved Parking by @NoWhammies10
2025-10-07 21:13:31 +03:00
22ddd83931
Merge pull request #138 from Seafoamm/main
...
Add macOS setup instructions
2025-10-07 16:20:01 +03:00
f7c68934f7
Merge pull request #146 from noctowlhoot/main
...
Added more Jokers all outside of scope, some with art available already from MathisMartin31
2025-10-07 13:01:48 +03:00
4fc0fbf5a8
Merge pull request #139 from mannodermaus/wrap-hand-input-on-oob-movement
...
Wrap around hand selection when going out of bounds horizontally
2025-10-07 12:56:53 +03:00
0187b5f78e
Update source/joker_effects.c
...
Co-authored-by: MeirGavish <meir.gavish@gmail.com >
2025-10-07 20:24:00 +10:30
0cfe0e5126
Added forgotten base price for the Acrobat Joker
2025-09-30 23:51:46 +02:00
Rickey Fehr