MeirGavish
7bbaec261b
Merge branch 'main' into game_over_screen
2025-08-19 13:33:20 +03:00
MeirGavish
9164fba996
Even Steven card corner fix
2025-08-17 14:51:04 +03:00
MeirGavish
1b9785bc1f
Sly Joker card corner fix
2025-08-17 13:42:56 +03:00
MeirGavish
c3f9f57e7f
Merge pull request #74 from theturtlemafia/ttm/joker-scope-joker-1
...
Adds Blue Joker, Even Steven, Odd Todd, Scholar, Business Card and unused code for jokers without sprites Raised Fist, Reserved Parking, Scary Face, Abstract Joker, Bull, and Smiley Face
2025-08-17 12:46:46 +03:00
MeirGavish
46141090a0
Added joker sprites by @GreenNinja2525 for Blue Joker, Even Steven, Odd Todd, Scholar and Business Card. Disabled jokers with no sprites.
2025-08-17 12:36:20 +03:00
MeirGavish
2539954dea
Fixed build error from previous merge and applied review comments
2025-08-17 11:10:00 +03:00
MeirGavish
04515839dc
(Manual conflict res) merged main into ttm/joker-scope-joker-1
2025-08-17 11:03:27 +03:00
MeirGavish
8524a78271
Merge pull request #102 from cellos51/joker_selling
...
Joker Selling
2025-08-17 10:57:38 +03:00
MeirGavish
376309a9ef
(Manual conflict res on game.c) Merged main into ttm/joker-scop-1
2025-08-17 10:37:03 +03:00
MeirGavish
947fac7358
Added joker selling animation
2025-08-16 21:33:23 +03:00
MeirGavish
64274ae465
Added joker selling (still no animation) + fixed SpriteObject constructor focused bug
2025-08-16 15:38:34 +03:00
MeirGavish
92fa279059
Refactored jokers stack to be a list (AI used)
2025-08-16 13:18:44 +03:00
MeirGavish
bc8847d2cb
Merge branch 'main' into joker_selling
2025-08-16 12:41:38 +03:00
MeirGavish
b63559862f
renamed int_list.c to list.c
2025-08-16 12:41:11 +03:00
MeirGavish
3e775f2ac6
Added game over menu tiles to background_gfx.png and removed dedicated background file
2025-08-16 12:27:31 +03:00
MeirGavish
ff17883b6f
Merge branch 'main' into game_over_screen
2025-08-16 12:00:32 +03:00
MeirGavish
3557e7d34d
Fixed inconsistent joker 'A's and rounded card corners
2025-08-16 10:56:22 +03:00
MeirGavish
eaefc8e522
Merge pull request #101 from cellos51/joker_selling
...
Selection Grid System
2025-08-16 08:27:51 +03:00
MeirGavish
ae019be190
Fixed shop initial selection to be visible + extracted shop outro
2025-08-16 06:41:33 +03:00
MeirGavish
168e34375d
Refactored shop_jokers to use list so purchased jokers can't be selected
2025-08-15 21:32:10 +03:00
MeirGavish
2a4f045db6
Refactored list code to be generic void* list
2025-08-15 20:03:17 +03:00
MeirGavish
d1677e82d2
Added Selection Grid system and refactored shop code to use it
2025-08-15 19:30:07 +03:00
MeirGavish
b218d4ac3e
(Manual conflict res) Merge branch 'main' into ttm/joker-scope-joker-1
2025-08-15 10:56:41 +03:00
MeirGavish
06dc4f9c62
Extracted focus to SpriteObject for joker selling - WIP
2025-08-15 10:38:20 +03:00
MeirGavish
5ef7fa49aa
Added more undesired IDE artifacts to .gitignore
2025-08-12 17:22:42 +03:00
MeirGavish
85e0d764ff
Merge pull request #97 from cellos51/optimizations
...
Removed floating point operations to improve performance
2025-08-12 11:44:07 +03:00
MeirGavish
0e080b916e
Reverted removals of float2fx() as they're compiler-optimized but kept float optimization
2025-08-12 11:40:22 +03:00
MeirGavish
658b0572d9
Removed all uses of float for optimization
2025-08-12 03:01:02 +03:00
MeirGavish
05af8217ff
Small affine background CBB/SBB fix
2025-08-12 01:59:04 +03:00
theturtlemafia
254efd7841
implement feedback
2025-08-09 19:23:47 -04:00
MeirGavish
8a905907fc
Merge pull request #92 from cellos51/joker_pooling
...
Joker pooling + Shop code refactor
2025-08-09 23:05:40 +03:00
MeirGavish
38282d0f2a
Small refactors
2025-08-09 21:31:41 +03:00
MeirGavish
f77a58a07c
Merge branch 'main' into joker_pooling
2025-08-09 20:51:59 +03:00
MeirGavish
3441a1dae8
Joker pooling - Existing or owned jokers can't appear in shop + shop code refactor
2025-08-09 20:48:18 +03:00
MeirGavish
fc81c04fbc
Merge pull request #89 from cellos51/graphic_fixes
...
Card corner fixes
2025-08-09 17:39:07 +03:00
MeirGavish
3260769023
Card corner fixes
2025-08-09 17:35:17 +03:00
MeirGavish
a87929d9f2
Merge pull request #87 from cellos51/revert-85-main
...
Revert "Fix "A" in Zany and Wily Joker for consistency" due to messing of palette data
2025-08-09 08:33:18 +03:00
MeirGavish
08689d41ea
Revert "Fix "A" in Zany and Wily Joker for consistency"
2025-08-09 08:32:11 +03:00
MeirGavish
9d4b6a04b8
Merge branch 'main' into joker_pooling
2025-08-09 06:19:16 +03:00
MeirGavish
d60a6bf9ff
Merge pull request #86 from TheBreadPerson/word
...
Complete refactor of naming conventions for memcpy
2025-08-08 22:59:58 +03:00
TheBreadPerson
6007071b7d
Complete refactor of naming conventions for memcpy
2025-08-08 14:04:09 -04:00
MeirGavish
b98025619f
Merge pull request #75 from cellos51/boss_backgrounds
...
Switching to a boss blind now changes the background palette
2025-08-08 18:18:04 +03:00
cellos51
6363613f15
Added & back to the tile8_mem in affine_background_init() and changed memcpy16 to 32
2025-08-08 10:44:55 -04:00
cellos51
650c09af28
Converted void to u16 in functions
2025-08-08 09:54:24 -04:00
MeirGavish
ed3e5f695a
Merge pull request #85 from GreenNinja2525/main
...
Fix "A" in Zany and Wily Joker for consistency
2025-08-08 16:14:35 +03:00
Wheeler
ab91438a0d
Change "A" in Zany and Wily Joker for consistency
2025-08-08 08:32:12 -04:00
MeirGavish
31ba1f166c
Added some documentation for affine_background_load_palette()
2025-08-08 15:03:18 +03:00
MeirGavish
ecbfd97de1
Added some documentation to memcpy16_tile8_with_palette_offset()
2025-08-08 14:47:45 +03:00
MeirGavish
c750d48bfa
Merge pull request #84 from cellos51/jokers_with_graphics
...
Added Joker art updates by @GreenNinja2525 with some minor tweaks
2025-08-08 11:46:22 +03:00
MeirGavish
e615588e29
Changed Fibonacci spiral border color to be more like the original
2025-08-08 11:44:16 +03:00
MeirGavish