Commit graph

25186 commits

Author SHA1 Message Date
Oni
e77a52e9fa Merge branch 'sealed-vanish' into 'master'
Winning player vanishes when crossing finish line in Sealed Stars

See merge request KartKrew/Kart!1677
2023-12-08 04:36:17 +00:00
Oni
44701386ec Merge branch 'fix-shield-noclip' into 'master'
Lightning/Bubble/Flame Shield: add MF_NOCLIPHEIGHT

Closes #777

See merge request KartKrew/Kart!1674
2023-12-08 04:36:03 +00:00
James R.
eca0310828 Merge branch 'fix-super-flicky-targeting' into 'master'
Do not let Super Flicky target spectators

Closes #785

See merge request KartKrew/Kart!1672
2023-12-08 03:28:06 +00:00
James R.
3c9f4fe3b5 Merge branch 'fix-ufo-desync' into 'master'
Fix Battle UFO desync if midgame joins + UFO bobbing speed fix

Closes #783

See merge request KartKrew/Kart!1671
2023-12-08 03:27:42 +00:00
James R
5cba9d63b3 Hardcode Lost Colony Fuel Canisters 2023-12-07 19:19:02 -08:00
James R
f6ce183cee Add Lost Colony Fuel Canister states 2023-12-07 19:18:33 -08:00
James R
df023246a5 Broly: separate explosion behavior from main class 2023-12-07 19:15:22 -08:00
James R
b5062e8627 Broly: move Broly class into srb2::objects namespace 2023-12-07 19:14:26 -08:00
James R
11555a2a3c Add objects/objects.hpp, common header for object classes 2023-12-07 16:06:39 -08:00
Eidolon
4627e9b17b Merge branch 'fix-zero-lump-sfx' into 'master'
Fix zero lump sfx

Closes #789

See merge request KartKrew/Kart!1678
2023-12-07 23:58:28 +00:00
James R
a96a64dff6 Broly: scale hitbox 2023-12-07 15:42:58 -08:00
James R
c5f421831f Broly: customize scale start/end 2023-12-07 15:42:14 -08:00
toaster
11fcb0b9ae Goner Setup: Cook 3 - Add "Outro"
One last guaranteed visit to the setup, to get a sendoff before the game truly begins.
(The "survey program" joke is now themed softlock prevention.)
2023-12-07 23:36:02 +00:00
toaster
8a2445820e General clearup relating to Goner Setup
- Clean up handling of goner_levelworking to retry current dialogue if something changes gamedata->gonerlevel
- Create wrapper func for resetting ALL text
- Gamedata-modifying cheats will set to GDGONER_DONE
2023-12-07 23:11:05 +00:00
toaster
ae8db80a75 Goner Setup: Background has stronger presence
- Show pure blue with NO SIGNAL when Video Options have not been configured
- Show underneath other menus
2023-12-07 23:06:37 +00:00
James R
dc20fca17d Broly: convert to C++ 2023-12-07 14:35:47 -08:00
toaster
91682c3250 Fix transitions for Level Select -> Time Attack
Previous version was too specific
2023-12-07 16:36:04 +00:00
Oni
940ce281ae Merge branch 'fix-hazard-scale-comparisons' into 'master'
Don't do scale-to-scale collision checks vs static hazards (resolves #491, #781)

Closes #781 and #491

See merge request KartKrew/Kart!1665
2023-12-07 05:22:12 +00:00
Oni
6639db90f3 Merge branch 'trick-prisons' into 'master'
Trick prisons

Closes #784

See merge request KartKrew/Kart!1673
2023-12-07 05:21:57 +00:00
James R
4931f32bb8 SpawnerList::random_id: avoid division by zero in PRNG function 2023-12-06 04:06:00 -08:00
James R
b6c7a42a97 Pause menu: changing gametype goes to vote screen
- If you change it during the vote screen, voting
  restarts.
2023-12-06 00:00:54 -08:00
Eidolon
c5db728606 Immediately load 0-length sfx lumps as nullopt 2023-12-05 19:19:01 -06:00
Eidolon
98ba6c0590 Fix behavior of SpanStream/VecStream seek-from-end 2023-12-05 19:18:42 -06:00
toaster
6d0f90216c Fix bug with default background when transitioning between gametype select and Special Mode 2023-12-05 21:38:06 +00:00
toaster
60e6445fd2 Special Mode Time Attack swag to unwind
- Play O_SSTAR3
- Special darkened background
- Imagery to replace the minimap, since Special Mode maps generally don't have them as a rule
    - Sealed Stars:
        - Star Within The Seal, from the standard Evaluation
    - Versus:
        - The DeviantArt SignatuRes
- Fix messed-up transitions between Time Attack main menu and Replay, Guests, and Ghosts submenus
    - Special Mode specifically:
        - Forced unexpected wipes
    - All modes:
        - Don't slide away the minimap (or replacement imagery) when going between these menus
        - Fix music not being correctly attached
- Correctly center minimaps in Time Attack view
2023-12-05 21:23:58 +00:00
James R
8546643b0c level_nosync only temporarily resists batch operations
It's supposed to resist Music_StopAll so it doesn't get
reset when the level changes. But only do this for one
turn, so level music does not have the potential to leak
into other contexts.
2023-12-05 04:18:27 -08:00
James R
806067f48f Add Music_BatchExempt, temporarily exemplify a tune from batch operations 2023-12-05 04:15:21 -08:00
James R
4746f877c3 Tricking players tumble other players, in all gametypes 2023-12-04 20:57:11 -08:00
James R
d97fece311 S_ShowMusicCredit: use at most 3/4 screen width 2023-12-04 20:40:18 -08:00
James R
e51fa390c1 Obj_BeginEmeraldOrbit: set emerald punt_ref to orbit target 2023-12-04 20:26:17 -08:00
James R
2277b2017e K_UpdateTripwire: set Tripwire Blaster punt_ref to player 2023-12-04 20:25:47 -08:00
James R
d80689f0d1 K_HandleFollower: set follower punt_ref to player 2023-12-04 20:25:30 -08:00
James R
7aa5b47851 P_RunOverlays: copy punted state from target 2023-12-04 20:24:25 -08:00
James R
1a78e55f4c P_DoPlayerExit: abuse K_MakeObjectReappear to vanish player if they win a Sealed Star 2023-12-04 20:22:41 -08:00
James R
be8d8178bb Add level_nosync tune, played if GTR_NOPOSITION
- Does not reset if level music does not change between
  levels
2023-12-04 20:19:55 -08:00
James R
95a0fcabd5 Music_Init: refactor some code for less duplication 2023-12-04 20:18:14 -08:00
James R
97a66a1856 srb2::music::TuneManager::insert: add optional field, to duplicate an existing tune's configuration 2023-12-04 20:17:17 -08:00
James R
f7eddffdb4 Give GTR_NOPOSITION to GT_SPECIAL 2023-12-04 20:14:00 -08:00
toaster
9d24a4cb6d Fix some oversights caused by the Goner Setup's access to various Options menus 2023-12-04 21:03:51 +00:00
toaster
94a341b629 Cheat updates
- The devmode cheat returns to title screen
- The warp cheat unlocks all hidden levels
2023-12-04 20:36:58 +00:00
toaster
85d8cfdf85 menu_t: Add bgroutine
All backgrounds are now handled by a seperate routine.
This will allow more fine handling without a ton of special cases everywhere.
Creates an absolutely nasty diff because all menu_t have been updated in one blast 🥹
For the things that DO need to draw outside of GS_MENU (M_DrawOptionsCogs, the Wrongwarp), the behaviourflag MBF_DRAWBGWHILEPLAYING has also been added.
2023-12-04 20:10:03 +00:00
toaster
792fcf2ad8 Profile edit character select: Get transition to work 2023-12-04 13:44:15 +00:00
toaster
17c0ceba23 Profile edit polish
- Rename the Name fields to "Profile ID" and "Player Tag" respectively, for clarity
- Re-order and re-align, so the given area on the Profile Card is lined up for readability
- Use the smaller version of the gamemode font, to have the screen less crammed full
2023-12-04 13:27:47 +00:00
toaster
36c3dbfc0e Goner setup polish
- Checkpoint sound for reaching a new option
- Fix header text for Video and Sound menus
- Reset password field access when menu is reset by gamedata wipe
2023-12-04 13:06:55 +00:00
James R
e1f2ed11c7 S_ShowMusicCredit: subtract indentation amount from available screen space 2023-12-03 17:06:01 -08:00
James R
eea1d76871 Lightning/Bubble/Flame Shield: add MF_NOCLIPHEIGHT 2023-12-03 16:45:17 -08:00
James R
7d998d0d91 Let player punt if tricking 2023-12-03 16:28:56 -08:00
James R
38d9875d4c Let player kill shootable objects if player can punt 2023-12-03 16:28:56 -08:00
James R
6a94d8cfa2 Do not punt Prison 2023-12-03 16:10:19 -08:00
James R
df9b4fbe12 Do not let Super Flicky target spectators 2023-12-03 15:35:41 -08:00