Commit graph

25794 commits

Author SHA1 Message Date
James R
cef3b6d841 srb2::Dialogue::NewText: free word-wrapped string 2024-01-16 06:31:56 -08:00
James R
bfa6e4f401 srb2::Draw::TextElement: add parse method
- Parse and translate special characters
- Currently supported:
  - Button codes
    - <up>
    - <down>
    - <right>
    - <left>
    - <r>
    - <l>
    - <start>
    - <a>
    - <b>
    - <c>
    - <x>
    - <y>
    - <z>
  - All button codes can be suffixed with '_pressed' or
    '_animated'
    - E.g. <b_pressed> or <start_animated>
2024-01-16 06:21:13 -08:00
James R
0d765d9fd1 srb2::Draw: TextElement enhancements
- Add default constructor
- Add text method with no arguments: returns TextElement
  that inherits font and flags from drawer
2024-01-16 06:20:22 -08:00
James R
1d1d1d8a27 srb2::Draw: add missing small_button method 2024-01-16 05:20:17 -08:00
James R
0e4222ae99 String drawing: add support for button character codes
- Bits 5 and 6 define the button state
  - 0xB0 - unpressed (neutral state)
  - 0xA0 - animating between pressed and unpressed
  - 0X90 - pressed down
- Bits 1 - 4 define the button type
  - 0x00 - up
  - 0x01 - down
  - 0x02 - right
  - 0x03 - left
  - 0x07 - R shoulder
  - 0x08 - L shoulder
  - 0x09 - start
  - 0x0A - A
  - 0x0B - B
  - 0x0C - C
  - 0x0D - X
  - 0x0E - Y
  - 0x0F - Z
- Button offsets and dimensions tweaked to my own taste
2024-01-16 05:19:36 -08:00
James R
0d07b83896 String drawing: fix width calculation not accounting for string dance character code 2024-01-16 05:12:12 -08:00
James R
a1e4479f5d String drawing: remove support for transparency character codes
- Frees up 5-7 bit range when 8th bit is set
2024-01-16 05:03:58 -08:00
James R.
6259c30a2e Merge branch 'fix-gachatarget-hitbox' into 'master'
Fix gachatarget hitbox size

See merge request KartKrew/Kart!1839
2024-01-16 03:52:05 +00:00
Oni
14d6477aad Merge branch 'orbital-whumble' into 'master'
Orbital items only inflict stumble

See merge request KartKrew/Kart!1840
2024-01-15 08:11:05 +00:00
AJ Martinez
5dd4733309 Fix inverted Grow check in orbital stumble 2024-01-14 23:26:05 -07:00
AJ Martinez
dad09dc86f Don't attempt to stumble invinc/grow players (someone get a fire extinguisher) 2024-01-14 23:07:40 -07:00
AJ Martinez
3da44990d0 Orbital items only inflict stumble 2024-01-14 22:40:14 -07:00
SteelT
678250ab3c Fix gachatarget hitbox
Fixes the targets in sealed star 8 having really small hitboxes
2024-01-14 23:07:34 -05:00
SteelT
281d4e72bd Merge branch 'message-drawer' into 'master'
Battle HUD message drawer

See merge request KartKrew/Kart!1838
2024-01-15 03:28:44 +00:00
AJ Martinez
6f2d467542 Merge remote-tracking branch 'origin/master' into message-drawer 2024-01-14 17:58:52 -07:00
AJ Martinez
36dd4e171d UFO conveyance fixes 2024-01-14 17:58:03 -07:00
AJ Martinez
516e418912 HUD messages: 2P split fixes, text revisions 2024-01-14 17:30:09 -07:00
AJ Martinez
e9ee268965 Per-viewport HUD messages 2024-01-14 17:13:03 -07:00
Oni
eebe8f5389 Merge branch 'fix-inconsistent-cloud-scale' into 'master'
Fix inconsistent cloud scale

Closes #898

See merge request KartKrew/Kart!1818
2024-01-14 23:02:47 +00:00
Sal
5a659d7a6c Merge branch 'snifferbot-spectapalooza' into 'master'
Prevent bots from smelling spectators (resolves #238)

Closes #238

See merge request KartKrew/Kart!1801
2024-01-14 21:05:43 +00:00
Sal
65aaf679b6 Merge branch 'easy-top-bounce' into 'master'
Slow down top if player's out of control

Closes #627

See merge request KartKrew/Kart!1836
2024-01-14 21:04:21 +00:00
AJ Martinez
25149db4eb WIP: Per-player mid-round announcements 2024-01-14 04:18:54 -07:00
AJ Martinez
1e39081856 WIP: Mid-round status messages 2024-01-14 03:05:49 -07:00
Oni
7ad7afe1d9 Merge branch 'fix-spectator-tally' into 'master'
Set viewpoint to own self when Tally starts

Closes #904 and #848

See merge request KartKrew/Kart!1813
2024-01-14 07:44:33 +00:00
Oni
c10a042759 Merge branch 'allow-assignment-in-vote' into 'master'
Allow gamepad reassignment in vote + from joystick input

Closes #837

See merge request KartKrew/Kart!1831
2024-01-14 07:43:15 +00:00
Oni
271a5a44ed Merge branch 'battle-fixes-five-nights' into 'master'
Battle Fixes at Freddy's (includes gameplay changes that affect Race too!)

Closes #879, #893, #900, #918, #906, #903, #913, #907, and #905

See merge request KartKrew/Kart!1837
2024-01-14 07:41:31 +00:00
James R
2213386498 HUD: fix 1P Battle GOAL offset in Duel 2024-01-13 22:56:19 -08:00
James R
bb2affc484 Battle: base PWR level on correct score value 2024-01-13 22:56:19 -08:00
James R
9c7e8b8be3 Battle: cap point limit at 20 2024-01-13 22:56:19 -08:00
James R
ce1fe0028a Insta-Whip: respect flashing tics unless player is in damage state
- Matches new flashing tics behavior
2024-01-13 22:56:19 -08:00
James R
9af09ec507 Bubble/Guard: fix reflected item intangibility, transfer ownership of reflected items
- Ignores item just-thrown intangibility only if the item
  owner is the same (standard behavior)
- Player who reflected the item takes ownership of it
  - Required to make intangibility work correctly
  - Improvement to game design
2024-01-13 22:56:18 -08:00
James R
f8f2c51a8d Bubble/Guard: reflect strength 4x -> 6x 2024-01-13 22:56:18 -08:00
James R
9e650fa6c0 Guard: reflect items like Bubble
- Clash + player knockback
2024-01-13 22:56:18 -08:00
James R
92f6e61243 Battle: downscale hitlag VFX and Gahabom explosion (not in Prisons)
- Hitlag VFX: 3/4x
- Gachabom explosion: 1/2x
2024-01-13 22:56:18 -08:00
James R
26b03a810c HUD: fix GOAL not turning rainbow if point limit is less than 5 2024-01-13 22:56:18 -08:00
James R
99a2a3fb74 Let Bubble blow-up destroy any MF_SHOOTABLE object 2024-01-13 22:56:18 -08:00
James R
dd1db7cd4a Reset viewpoint to self when you spawn 2024-01-13 22:56:17 -08:00
James R
3c85a9a436 Director: let it switch to splitscreen players 2024-01-13 22:56:17 -08:00
James R
5ec2e156ab Battle: fix viewpoint switching to eliminated player 2024-01-13 22:56:17 -08:00
James R
db4e2e692b Add LobbySize option to level headers, controls whether the map appears in vote, based on player count
- Prevents a map from appearing on the vote screen if
  there are too many players
- LobbySize
  - Duel - 2 players max
  - Small - 5 players max
  - Medium - 10 players max
  - Large - 16 players max (default if not set)
- Future proofing
  - Doesn't count bot players in gametypes that don't
    support bots
2024-01-13 22:56:17 -08:00
James R
fd7eb42e9d Vote: fix Encore appearing on Battle, if gametype was changed 2024-01-13 22:56:16 -08:00
James R
9fa7cb096b P_DamageMobj: items and PvP damage bypass flashing tics if the victim is in a damage state 2024-01-13 22:56:16 -08:00
James R
92cd95311c Add P_IsKartItem: true for anything the player can hold or throw (except shield overlays) 2024-01-13 22:56:16 -08:00
James R
57c501f6ee Revert "0 flashtics in Battle"
This reverts commit 79eb400f49.
2024-01-13 22:56:16 -08:00
James R
a349b1acf0 Revert "Add K_UpdateDamageFlashing, refactor Battle 0-flashing tics"
This reverts commit 3856fbf1c6.
2024-01-13 22:56:16 -08:00
James R
da2e6f1bfe battlebumpers: let minimum be 0
Useful for testing.
2024-01-13 22:56:15 -08:00
AJ Martinez
98c390cbc5 Expose topAccel to netsave/lua 2024-01-13 20:33:00 -07:00
AJ Martinez
a76507e17f Slow down top if player's out of control 2024-01-13 20:30:20 -07:00
Oni
f9c192b04d Merge branch 'no-gp-encore' into 'master'
Menus/Grand Prix: do not carry over Encore setting from Match Race

Closes #830

See merge request KartKrew/Kart!1816
2024-01-13 23:11:31 +00:00
Oni
2c7af6e283 Merge branch 'overtime-in-skybox' into 'master'
Fix Overtime Barrier lasers appearing in skybox

Closes #881

See merge request KartKrew/Kart!1804
2024-01-13 23:09:06 +00:00