Commit Graph

Select branches

Hide Pull Requests

prototype/chinese-joker-descriptions

Mono Color

• ab07c9af04 Hotfix going out of bounds Rickey Fehr 2025-10-18 17:09:22 -07:00
• 09f6c35496 Fix slight bug with false positives on pool test Rickey Fehr 2025-10-17 18:08:20 -07:00
• 138792df48 Add memory pool test, fix bugs Rickey Fehr 2025-10-17 18:01:34 -07:00
• 16059ab632 Update for PR Rickey Fehr 2025-10-07 18:41:21 -07:00
• d499abe2c4 Cleanup for PR Rickey Fehr 2025-09-21 19:48:04 -07:00
• d78e04c6b5 Fix style, tiny error, and typo Rickey Fehr 2025-09-21 15:02:09 -07:00
• 5e2bd9a59a Update memory map script and cleanup Rickey Fehr 2025-09-21 14:49:59 -07:00
• a1e73be3fc Update github actions to print the memory map Rickey Fehr 2025-09-21 14:05:39 -07:00
• 06cd13a17f Centralize location of memory pools Rickey Fehr 2025-09-21 13:14:22 -07:00
• 72c0a6c4a9 Optimize bit operations, style fix, cleanup Rickey Fehr 2025-09-21 00:38:43 -07:00
• e00c51502b Replace Malloc With Pools Rickey Fehr 2025-09-16 17:44:49 -07:00
• 53d2e53d78 Changed music to start after Splash Screen MeirGavish 2025-10-17 13:43:21 +03:00
• f725c5e1b8 Merge pull request #155 from drewjohnson2/stateRefactor MeirGavish 2025-10-17 11:51:24 +03:00
• d6ebda657a Additional PR feedback Drew 2025-10-16 14:48:59 -05:00
• f77a715845 Some PR feedback Drew 2025-10-14 23:08:42 -05:00
• 3a6e004fc6 Rebase and some PR feedback Drew 2025-10-14 10:44:21 -05:00
• b9af95d770 Fixing some constant names after a rebase. Drew 2025-10-13 00:34:02 -05:00
• 597dc62e24 Rebasing onto main. Switching to KEY_ANY to restart after a game over Drew 2025-09-27 23:23:07 -05:00
• 0f154741ed Renaming a function, fixing a call to memcpy16. Replacing magic numbers with enum values Drew 2025-09-26 21:50:48 -05:00
• 3071e512c4 Just some cleanup Drew 2025-09-26 02:04:25 -05:00
• dbef1dacdc Added the ability to restart the game after a game over. Drew 2025-09-26 01:39:09 -05:00
• 6d66ccbb61 Replaced the substate switch statements with function tables. Drew 2025-09-25 00:13:37 -05:00
• 4e1f418a8d Preparing for rebase Drew 2025-09-24 20:36:17 -05:00
• fb35397238 Cleanup Drew 2025-09-24 10:48:12 -05:00
• 04ffb0d4dd A little bit of scope creep here. Drew 2025-09-24 00:15:38 -05:00
• 121bbc01d5 Refactored state machine. Drew 2025-09-23 01:47:25 -05:00
• 6dce57e197 Merge pull request #145 from pansythoughts/main MeirGavish 2025-10-14 13:57:40 +03:00
• b5b7c856d6 Merge pull request #133 from ricfehr3/refactor-blinds MeirGavish 2025-10-14 13:46:27 +03:00
• ef048791c1 Separate out graphics and add ability change boss Rickey Fehr 2025-10-13 23:05:25 -07:00
• f885fa9164 Fix Iterating over every blind instead of 3 max Rickey Fehr 2025-10-12 11:43:59 -07:00
• 54d955d1e7 Update for PR Rickey Fehr 2025-09-25 20:53:00 -07:00
• 3c2dd0edba Rename blind enums to represent their type Rickey Fehr 2025-09-20 11:36:23 -07:00
• 7ee07bb34c Refactor blind into a map Rickey Fehr 2025-09-19 21:57:04 -07:00
• f463ba99a0 changed how game_speed affects hand score animations alex 2025-10-13 20:28:52 -07:00
• 767e21d5fa made the lerped temp score expression clearer alex 2025-10-13 20:26:20 -07:00
• d108836b6a changed how game_speed affects hand score animations alex 2025-10-13 20:24:20 -07:00
• f36fa5e998 Merge pull request #169 from cellos51/implement_joker_testing MeirGavish 2025-10-13 21:27:42 +03:00
• 71de180871 Merge branch 'main' into implement_joker_testing MeirGavish 2025-10-13 20:59:17 +03:00
• 8c25089966 Allow defining an ID for a joker to always appear in shop and be tested MeirGavish 2025-10-13 20:58:44 +03:00
• 56c33b2eef made the lerped temp score expression clearer alex 2025-10-11 23:45:02 -07:00
• cf7c9dc7c3 fixed typo alex 2025-10-11 13:36:43 -07:00
• d7f64d3570 Merge pull request #166 from cellos51/integrate_joker_art MeirGavish 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) MeirGavish 2025-10-09 23:42:07 +03:00
• 609e1f19b6 Merge pull request #159 from MathisMartin31/main MeirGavish 2025-10-09 20:43:36 +03:00
• ce5150bffb Update joker_effects.c Geralt 2025-10-09 18:57:10 +02:00
• ce6d2049f8 Update game.h Geralt 2025-10-09 14:52:41 +02:00
• f14f200cb0 Update joker_effects.c Geralt 2025-10-09 14:50:18 +02:00
• c4f22be9b9 Update joker.h Geralt 2025-10-09 14:46:57 +02:00
• 30638b65e2 Merge pull request #164 from ricfehr3/hotfix/hand-input-order MeirGavish 2025-10-09 15:16:56 +03:00
• 94cb898bb9 Merge pull request #134 from drewjohnson2/magic_numbers MeirGavish 2025-10-09 11:18:02 +03:00
• 73ec9a40d3 Fix softlock related to #163 Rickey Fehr 2025-10-08 20:29:11 -07:00
• 6787fab0c2 Merge branch 'main' into main Geralt 2025-10-08 23:25:24 +02:00
• f752793caa Shop light specific macros for color Drew 2025-10-08 16:16:23 -05:00
• 9b6c77ea3f Merge pull request #119 from Nanrech/pr-fix MeirGavish 2025-10-08 22:46:01 +03:00
• 4b35b2f7d8 Added art for jokers Blueprint and Brainstorm by @NoWhammies10 and @GreenNinja2525 MeirGavish 2025-10-08 22:40:15 +03:00
• 23a14cb76e Update source/joker_effects.c NanandMeirGavish 2025-10-08 20:41:09 +02:00
• 8ae4968539 Remove duplicated entries Nan 2025-10-08 18:52:10 +02:00
• 9ae53bddb8 Fix errors introduced by latest commits Nan 2025-10-08 18:39:49 +02:00
• af72fe5749 Fix conflicts Nan 2025-10-08 18:21:55 +02:00
• 7e17419811 Merge branch 'main' into pr-fix Nan 2025-10-08 18:11:20 +02:00
• fec243b482 Update source/joker_effects.c NanandCopilot 2025-10-08 17:59:27 +02:00
• 324478845d Update source/joker_effects.c NanandMeirGavish 2025-10-08 17:58:11 +02:00
• 0dbde481d5 Update source/joker_effects.c NanandMeirGavish 2025-10-08 17:57:50 +02:00
• bc44de0493 Update include/joker.h NanandCopilot 2025-10-08 17:57:20 +02:00
• f257ec03af Merge pull request #150 from ricfehr3/docs/update-docs-docker MeirGavish 2025-10-08 10:32:11 +03:00
• 4e0d72ca8a PR Feedback Drew 2025-10-08 01:27:15 -05:00
• aa5ebd13fc Add suggestions from @MeirGavish MonteCrysto 2025-10-08 08:14:54 +02:00
• cca015238d Update docs for docker Rickey Fehr 2025-09-16 15:21:34 -07:00
• 296c489562 Merge pull request #162 from cellos51/integrate_joker_art MeirGavish 2025-10-08 00:45:09 +03:00
• ae40949008 Fixed Bull border corner transparency MeirGavish 2025-10-08 00:18:30 +03:00
• 77f76bd4ef Removed "unused" attribute from integrated jokers MeirGavish 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 MeirGavish 2025-10-07 23:52:49 +03:00
• 73c2db6b69 Merge pull request #143 from ricfehr3/feature/ci-release-on-tag MeirGavish 2025-10-07 23:04:19 +03:00
• c529c4be69 Added art for jokers Abstract Joker by @MathisMartin31 and Bull by @NoWhammies10 and @GreenNinja2525 MeirGavish 2025-10-07 21:26:43 +03:00
• 8cd86f1640 Merge remote-tracking branch 'upstream/main' And add NULL Acrobat Joker effect MonteCrysto 2025-10-07 20:18:41 +02:00
• 46936c1878 Added art for jokers Raised Fist by @MathisMartin31 and Reserved Parking by @NoWhammies10 MeirGavish 2025-10-07 21:13:31 +03:00
• 22ddd83931 Merge pull request #138 from Seafoamm/main MeirGavish 2025-10-07 16:20:01 +03:00
• f7c68934f7 Merge pull request #146 from noctowlhoot/main MeirGavish 2025-10-07 13:01:48 +03:00
• 4fc0fbf5a8 Merge pull request #139 from mannodermaus/wrap-hand-input-on-oob-movement MeirGavish 2025-10-07 12:56:53 +03:00
• 0187b5f78e Update source/joker_effects.c noctowlhootandMeirGavish 2025-10-07 20:24:00 +10:30
• 0cfe0e5126 Added forgotten base price for the Acrobat Joker MonteCrysto 2025-09-30 23:51:46 +02:00
• b7a94fa085 Fix some issues (I actually forgot to compile) MonteCrysto 2025-09-30 23:34:11 +02:00
• de7c9d4d60 Add a "get_num_hands_remaining" function and implement the Acrobat Joker MonteCrysto 2025-09-30 23:06:13 +02:00
• c781ee9666 Add a "is_card_face" function to take into account if Pareidolia is present MonteCrysto 2025-09-30 22:47:00 +02:00
• 1f40279a36 Created a define for a screen entry horizontal flip. Drew 2025-09-30 00:09:53 -05:00
• a6dd95ab0a Added a few more defines Drew 2025-09-20 13:27:51 -05:00
• cc95554db7 Added constants for timer values. The names on these might be bad. Drew 2025-09-19 15:00:14 -05:00
• 34d885674c Finished adding palette memory indexs to an enum Drew 2025-09-17 23:39:19 -05:00
• 99ecd424f4 Added enum values for some of the palette bank indexes Drew 2025-09-17 13:44:32 -05:00
• f579c13ceb Merge pull request #149 from GreenNinja2525/main MeirGavish 2025-09-27 21:44:27 +02:00
• 8dbcadac59 Merge pull request #153 from ricfehr3/feature/add-version MeirGavish 2025-09-27 21:41:09 +02:00
• 46944e5699 Merge branch 'cellos51:main' into main Wheeler 2025-09-27 15:22:41 -04:00
• 88726cbb39 Add script to get version Rickey Fehr 2025-09-24 20:49:01 -07:00
• 36bcf0fa30 Move version into C file Rickey Fehr 2025-09-24 20:44:13 -07:00
• b8a441f971 Update joker_effects.c noctowlhoot 2025-09-24 22:53:54 +09:30
• 56bbc2ff9a Add defaults for GIT_HASH and GIT_DIRTY Rickey Fehr 2025-09-23 17:14:18 -07:00
• ebe789aa52 Add git hash baked into ROM for bug reports Rickey Fehr 2025-09-23 16:15:50 -07:00
• daba462575 fixed a division thingy alex 2025-09-23 12:45:09 -07:00
• ad9358547d main alex 2025-09-23 12:44:03 -07:00
• f57c37b900 fixed a divison thingy alex 2025-09-23 12:40:26 -07:00