Commit graph

25413 commits

Author SHA1 Message Date
toaster
75205e3f79 New ACS functions (resolves #697)
- For Tutorials specifically
    - void Dialogue_AutoDismiss(void)
        - Dismisses the current dialogue (including from other threads).
    - str CheckTutorialChallenge(void)
        - Returns special values depending on state relevant to the Tutorial Challenge.
            - Returns a blank string in netgames, or if none of the following are true.
            - Returns "Active" if the skip is in progress.
            - Returns "Failed" if the skip was just failed.
            - Returns "Locked" if not available with this gamedata.
- Other tiny check functions
    - bool PositionStart(void)
        - Returns true if leveltime < starttime.
    - bool FreePlay(void)
        - Returns true if in Free Play.
2023-12-10 18:23:57 +00:00
toaster
cdb2b44aa6 ACS-Dialogue interface: New threads with dialogue auto-skip previous threads with dialogue
If some dialogue needs to be never-missable, that's the mapper's responsibility - but now they won't get randomly interleaved if multiple are activated just by regular free driving, which was the worst kind of default
2023-12-10 16:10:45 +00:00
toaster
de7d53b4ea M_LevelListFromGametype: Fix invalid Tutorial-specific behaviour 2023-12-10 15:21:51 +00:00
toaster
97f39abef3 Merge branch 'master' of https://git.do.srb2.org/KartKrew/Kart into tutorial-pass 2023-12-09 17:33:47 +00:00
toaster
1505167422 Goner Setp: Add scroll 2023-12-09 17:32:15 +00:00
Oni
a07b54bc5c Merge branch 'fix-music-reset' into 'master'
Fix Sealed Star / Tutorial music overriding other levels

Closes #791

See merge request KartKrew/Kart!1683
2023-12-09 02:40:19 +00:00
Oni
df57953025 Merge branch 'hardcode-rocks' into 'master'
Hardcode Angel Island and Endless Mine

See merge request KartKrew/Kart!1680
2023-12-09 01:55:46 +00:00
James R
b68947e636 Hardcode Endless Mine faucet / rain
- Note: rain does not use the weather system
2023-12-08 17:42:17 -08:00
James R
69541b9422 Hardcode bustable rocks -- Angel Island + Endless Mine 2023-12-08 17:42:17 -08:00
James R
441d526a15 Hardcode Angel Island scenery objects 2023-12-08 17:42:17 -08:00
James R.
5233217b86 Merge branch 'hardcode-balloons' into 'master'
Hardcode Carnival Night balloon edits (also seen in Joypolis)

See merge request KartKrew/Kart!1682
2023-12-09 01:40:14 +00:00
James R
51d9e4bf4b P_Ticker: fix typo playing level music 2023-12-08 17:32:29 -08:00
toaster
c34b5f6034 SPB Capsule improvements
- Destroy all SPB Capsules in the stage when an SPB becomes relevant
    - When an SPB is put in a player's roulette
    - When an SPB is thrown
        - Automatically happens when SPB Capsule is touched
- Don't respawn a popped SPB Capsule while an SPB is out
2023-12-08 22:24:38 +00:00
toaster
ee0eff89b4 K_SPBInGame: Optimise to use trackercap instead of full thinkerlist romp 2023-12-08 22:19:06 +00:00
toaster
7d313af4db MT_ITEMCAPSULE: In GT_TUTORIAL, only respawn after 5 seconds 2023-12-08 22:18:13 +00:00
toaster
24b5bb8f86 Options menu pass 1
- Surface ReduceVFX and Tilting
- Group the Show FPS, Input Delay, and FOCUS LOST together on HUD options
- Reduce the importance of console
    - Console back colour now exclusively part of the Online Chat Options
    - Hide Console text size
- Move Chat Spam Protection to Server Options
- Improve some tooltips
     - Skyboxes
     - Message tint
- Remove embarassing waifu hidden text
2023-12-08 20:47:05 +00:00
toaster
536bed7dc6 When resetting the Goner Setup, make sure itemOn is set to a valid entry 2023-12-08 13:46:10 +00:00
toaster
6c7a1c14e5 Merge branch 'master' of https://git.do.srb2.org/KartKrew/Kart into tutorial-pass 2023-12-08 13:08:43 +00:00
toaster
c82d24b4bc Music starts after Sound Options completed
Currently plays _OCEAN for testing, but will be changed to play _GONER when Journey In Modulating Time's short loop is ready.
Explicitly restricts the basic title screen's music from playing, too.
2023-12-08 13:08:06 +00:00
toaster
f09c0a4b6c Forgot to commit compilation corrections last night
- Fix repeat for GDGONER_VIDEO text
- M_GonerSurveyResponse
2023-12-08 13:05:07 +00:00
James R
50f8db9f4d Balloon: bob at random phase 2023-12-08 03:57:51 -08:00
James R
dd22ef5c88 Balloon: state edits 2023-12-08 03:57:46 -08:00
James R
581df0848d Balloon, Bumper: increase shadow size 2023-12-08 03:54:51 -08:00
Oni
49b09a3cf5 Merge branch 'hardcode-lost-colony' into 'master'
Hardcode Lost Colony Fuel Canisters

See merge request KartKrew/Kart!1681
2023-12-08 04:45:59 +00:00
Oni
6378c9d544 Merge branch 'no-position-no-music-reset' into 'master'
Do not reset music in Sealed Stars and Tutorials

See merge request KartKrew/Kart!1676
2023-12-08 04:37:17 +00:00
Oni
20f2f6d515 Merge branch 'gametype-vote' into 'master'
Pause menu: changing gametype goes to vote screen

See merge request KartKrew/Kart!1679
2023-12-08 04:36:51 +00:00
Oni
14b037cde4 Merge branch 'fix-music-credit-too-long' into 'master'
S_ShowMusicCredit: subtract indentation amount from available screen space

Closes #775

See merge request KartKrew/Kart!1675
2023-12-08 04:36:33 +00:00
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