 cellos51
|
52fa45e426
|
Refactor joker selection logic in game shop
|
2025-07-18 20:38:34 -04:00 |
|
|
cellos51
|
c06b179764
|
really bad purchasing system for jokers
|
2025-07-18 20:25:12 -04:00 |
|
|
cellos51
|
176910c483
|
Jokers appear in the shop but don't do anything yet
|
2025-07-18 19:29:17 -04:00 |
|
|
cellos51
|
4a5644eddb
|
Defining a basic system for jokers
|
2025-07-17 21:47:50 -04:00 |
|
|
cellos51
|
ea2e503222
|
Ante up on boss defeat
|
2025-07-17 18:02:46 -04:00 |
|
|
cellos51
|
54d8aa2ec6
|
Applied most refactors from previous merge by @MeirGavish
|
2025-07-16 21:31:05 -04:00 |
|
|
cellos51
|
a37ba18386
|
Fixed palette issue
|
2025-07-16 15:57:07 -04:00 |
|
|
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 |
|
|
MeirGavish
|
5d5a8a2d4b
|
Fixed an error in previous hand background commit
|
2025-07-13 23:42:03 +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 |
|
|
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 |
|
|
cellos51
|
191c1a7264
|
Made blind tokens visible in GAME_BLIND_SELECT state
|
2025-07-12 19:47:49 -04:00 |
|
|
cellos51
|
1fc194448e
|
fixed blind descend animation
|
2025-07-11 18:56:52 -04:00 |
|
|
cellos51
|
6266ea9fa5
|
Unified timer default value to be 0
|
2025-07-11 18:32:17 -04:00 |
|
|
cellos51
|
beaf365e0c
|
Fixed compilation issue and changed default background
|
2025-07-11 13:52:33 -04:00 |
|
|
MeirGavish
|
43a32f5a99
|
Merge branch 'main' into start_at_blind_selection
|
2025-07-11 19:42:52 +03: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
|
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
|
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 |
|
|
cellos51
|
b246249be7
|
Updated shop state to have rough functionality to switch to the next state
|
2025-07-09 20:00:03 -04:00 |
|
|
MeirGavish
|
83af67c3ed
|
Merged "main" into "refactors" (manually)
|
2025-07-09 22:27:21 +03:00 |
|
|
MeirGavish
|
d787a918b6
|
Refactored so only set_hand() sets the global variable and not hand_get_type() so as to conform to set/get semantics
|
2025-07-09 22:17:16 +03:00 |
|
|
MeirGavish
|
83aa422f3e
|
Refactor - replaced (almost) all magic numbers for TTE rects with rect definitions
|
2025-07-09 17:12:00 +03:00 |
|
|
MeirGavish
|
b822d2b365
|
Moved code to new graphic_utils.c/.h header and added Rect wrapper struct
|
2025-07-09 04:59:19 +03:00 |
|
|
MeirGavish
|
2aaee73bac
|
Replaced round end menu hack with clear rect function
|
2025-07-09 04:11:55 +03:00 |
|
|
MeirGavish
|
de3e75928d
|
Merge branch 'main' into refactors
|
2025-07-09 00:45:07 +03:00 |
|
|
MeirGavish
|
2a92b3ecaa
|
Added SBB and CBB defines for SE/tile bases to remove their magic numbers
|
2025-07-09 00:40:59 +03:00 |
|
|
MeirGavish
|
ef973f54fe
|
Another indent fix
|
2025-07-08 19:19:16 +03:00 |
|
|
MeirGavish
|
f392237b68
|
Fixed indent error from previous commit
|
2025-07-08 19:15:12 +03:00 |
|
|
MeirGavish
|
e65b43e966
|
Fixed five of a kind bug
|
2025-07-08 19:11:48 +03:00 |
|
|
cellos51
|
a56bba2c0e
|
implemented shop screen after round end
|
2025-07-05 19:34:48 -04:00 |
|
|
cellos51
|
8f7f093290
|
i keep accidentally pushing the game state
|
2025-07-05 14:32:08 -04:00 |
|
|
cellos51
|
6435b92378
|
Slight update to graphics and added shop background image
|
2025-07-03 21:49:29 -04:00 |
|
|
cellos51
|
4a8c7d62aa
|
Set game state back to GAME_PLAYING from GAME_ROUND_END
|
2025-07-01 17:32:02 -04:00 |
|
|
cellos51
|
bbd66f2b58
|
Pretty much finished the round end screen
|
2025-07-01 17:31:25 -04:00 |
|
|
cellos51
|
d7ad34af92
|
Fixed some oversights
|
2025-06-30 21:29:35 -04:00 |
|
|
cellos51
|
67b917fc7c
|
Yandere dev style code for the almost finished round end screen
|
2025-06-30 21:20:51 -04:00 |
|
|
cellos51
|
26d6665e6e
|
Fixed tiles on round end screen
|
2025-06-30 12:38:26 -04:00 |
|