Commit graph

22383 commits

Author SHA1 Message Date
James R
fccdefb840 Audio: fix GME not reporting song length most of the time
Now add the intro time and looping time together to get
the length of the song, if the length field itself is not
specified (it's usually not).
2023-03-30 23:18:17 -07:00
AJ Martinez
535fc17875 Fix RRID/crypto primitive size defines 2023-03-30 20:36:10 -07:00
AJ Martinez
495b51f6c2 Merge branch 'licenses' into 'master'
Add LICENSE-3RD-PARTY.txt

See merge request KartKrew/Kart!1110
2023-03-31 03:00:58 +00:00
Oni
dec66ee9b1 Merge branch 'jam-project' into 'master'
Stereo Mode

See merge request KartKrew/Kart!1097
2023-03-31 01:07:38 +00:00
James R
6082d222fd Merge branch 'fix-encore-capsules' into 'master'
Don't render item capsule numbers mirrored in Encore mode

Closes #493

See merge request KartKrew/Kart!1119
2023-03-31 00:12:06 +00:00
James R
1592369071 Merge branch 'musicdef-volume-debug' into 'master'
Add musicdef console command

See merge request KartKrew/Kart!1114
2023-03-31 00:11:50 +00:00
toaster
5a5a607c9a M_DrawSoundTest: STER_DOT
Draws a dot matrix over the background level icon
2023-03-31 00:28:15 +01:00
toaster
027fd2be04 Time elapsed functionality
- Shown on the menu
- soundtest.autosequence
    - Plays all songs in sequence, skipping over the soundtest entry.
        - Plays each looping song twice (and fades out if it's the last one in the musicdef's tracks)
        - Plays non-looping songs once with no fade ever
   - Disabled when S_SoundTestStop called
- Songs that end outside of autosequence will now stop the visible Playing.
2023-03-31 00:27:20 +01:00
toaster
6f99a75c24 Duplicate current track title per VC discussion 2023-03-30 23:31:37 +01:00
toaster
fe8db18066 Store non-looping information in musicdef
Preface with a `\` (ie `Lump VOTEEA,\VOTEEB`) to indicate the preference is not to loop.
This is for special jingles that have definitive conclusions.
2023-03-30 23:28:51 +01:00
toaster
2c0645cba2 Improve Stereo text header drawing
- Use LSTitleHighString at the top of the menu for the music's title/Sound Test
- Only show Track for relevant entries
- Show cv_soundtest.value in hex for that Classic Sonic soundtest flavour
2023-03-30 18:36:09 +01:00
toaster
99f4641700 Improve level select icon handling
- Make it full base resolution...
- ...but use ClipRect to make it fit inside the window of the Stereo
2023-03-30 18:31:18 +01:00
AJ Martinez
9f8ed9c4ec Update more third-party licenses 2023-03-29 23:59:31 -07:00
James R
ed0d3adccc Don't render item capsule numbers mirrored in Encore mode 2023-03-29 19:09:45 -07:00
James R
0f5370efbb Merge branch 'palette-reload-fix' into 'master'
Reload palette even if rewinding a replay or reloading the gamestate (Resolves #443)

Closes #443

See merge request KartKrew/Kart!1118
2023-03-30 01:28:34 +00:00
James R
6e79ae9a3e Command_MusicDef_f: fix typo 2023-03-29 18:24:49 -07:00
James R
4e149d04cf Merge branch 'fix-skybox-change-after-finish' into 'master'
Do not change skybox for players after they finish the race

See merge request KartKrew/Kart!1115
2023-03-30 01:23:57 +00:00
James R
9aacbf6472 Merge branch 'improve-devmode-visibility' into 'master'
Improve devmode visibility and usability

See merge request KartKrew/Kart!1113
2023-03-30 01:23:40 +00:00
James R
43949031ac Merge branch 'fix-tripwire-lighting' into 'master'
Force Trip Wires to render at maximum brightness

Closes #318

See merge request KartKrew/Kart!1112
2023-03-30 01:23:04 +00:00
toaster
5a802219ce M_SoundTestNextPrev: Set cv_soundtest to 0 when returning to the soundtest entry 2023-03-30 01:11:22 +01:00
toaster
e5c3b566bf Stereo Volume
Access to soundvolume and musicvolume through the Stereo Mode menu
- Draws a knob and volume bar (with loudness warning)
- Changes which cvar is associated with it depending on selected song/lack of
    - If on any regular song, use digital music volume
    - If on soundtest, use sound volume
        - unless on entry 0 aka N/A, where no volume is visible at all
2023-03-30 01:01:16 +01:00
toaster
f9975d6a71 stereospecial_e
No more magic numbers for M_DrawSoundTest
2023-03-29 23:28:45 +01:00
Sal
1e06209659 Merge branch 'no-lua' into 'master'
Add -nolua command line parameter

See merge request KartKrew/Kart!1117
2023-03-29 21:42:42 +00:00
SteelT
4e8bc36521 Reload palette even if rewinding a replay or reloading the gamestate 2023-03-29 14:29:00 -04:00
James R
542e5b1cdf Add -nolua command line parameter
Disables loading Lua scripts entirely.
2023-03-29 09:03:37 -07:00
toaster
2446e53ff9 Start on Stereo Mode visuals
- Buttons have been implemented.
    - They push down when you press an input.
        - FUTURE WORK: Back doesn't get the opportunity to do so. Delay the exit of this menu?
    - Certain ones have special properties.
        - PLAY locks down when playing and not paused
        - PAUSE locks down when playing and paused
        - TRACK is a wheel/slidery thing
        - BACK should get pressed when you're exiting (see previous FUTURE WORK)
        - FUTURE WORK: The detection of these currently uses magic numbers.
- The Stereo itself is now drawn.
    - FUTURE WORK: The screen's contents are still the testing visuals.
2023-03-29 16:14:38 +01:00
toaster
d19a7d9a57 Add M_MenuConfirmHeld and M_MenuBackHeld, to go with M_MenuExtraHeld. 2023-03-29 16:04:48 +01:00
toaster
53fc4aec0a Adjustments to user handling of Stereo
Per VC discussion:
- Pressing STOP does not NULL your selected song
    - ...unless you press it a second time while already stopped
- Pressing PLAY should de-activate pause if active, not restart the track
- Pressing PAUSE while paused should not de-activate pause
- Removed the Extra functionality from TRACK.
2023-03-29 16:04:13 +01:00
toaster
bc07cfa94b S_SoundTestTogglePause
Instead of a fake S_StopMusic-based Pause, make it use the S_PauseAudio/S_ResumeAudio system.
2023-03-29 13:39:40 +01:00
toaster
b1b6756e6a S_AttemptToRestoreMusic
Per review, combine all spots where s_sound.c attempts to restore music into one gamestate-specific switch case system.
2023-03-29 12:56:28 +01:00
James R
eda16cacb5 line 448: do not change skybox after player finishes the race 2023-03-29 03:54:11 -07:00
James R
77e5bb4d19 line 448: fix skybox mobj reference leak
Calling P_SetTarget on the temporary skybox_t is
pointless. P_SwitchSkybox calls P_SetTarget when copying
to the player struct.
2023-03-29 03:54:11 -07:00
James R
8bd6c9cffb Add musicdef->debug_volume, add musicdef console command
musicdef -volume <volume> changes the volume of the
currently playing song. The change persists through song
changes and is visible with devmode music.

musicdef -show prints all changed musicdef volumes.

The intention of this command is to allow editing music
volumes quickly in game, without having to quit, edit
music.pk3, and reopen the game.
2023-03-29 01:22:40 -07:00
James R
b65eaf1a51 devmode music: reorder volume to the top and add empty space for readability 2023-03-29 00:37:45 -07:00
James R
411b960e1c devmode music: use half size font 2023-03-29 00:33:28 -07:00
James R
31ee3577fd devmode: draw over literally everything else
Draws over ping and FPS counters.
2023-03-29 00:11:01 -07:00
James R
78df6ec488 devmode: add devmode_screen cvar, select which splitscreen to display info for
Old behavior was just use the last splitscreen.

This does not the position devmode draws on the screen.
2023-03-29 00:09:50 -07:00
James R
c53ae816c1 Renderer: force Trip Wires to maximum brightness, ignore colormaps
Fixes sector light level and colormaps darkening Trip
Wires, especially in OpenGL.
2023-03-28 21:08:11 -07:00
Sal
4588a20a95 Merge branch 'ufo-script' into 'master'
Add "UFO" script type

See merge request KartKrew/Kart!1111
2023-03-29 00:39:34 +00:00
Sal
fe34e04abe Merge branch 'encore-fixies' into 'master'
Fix random Encore vote, error if ENCORE/TWEAKMAP lump is invalid, add debugencorevote command

Closes #333

See merge request KartKrew/Kart!1101
2023-03-29 00:32:00 +00:00
Sal
2555aac9d3 Merge branch 'player-persistence' into 'licenses'
Player IDs and persistence

See merge request KartKrew/Kart!1062
2023-03-29 00:07:33 +00:00
Sal
83b5b26a12 Merge branch 'packet-hack' into 'master'
Experimental: Improve level load processing

See merge request KartKrew/Kart!1077
2023-03-28 23:41:33 +00:00
Sally Coolatta
e7128baef0 Add UFO script type 2023-03-28 18:07:22 -04:00
toaster
9a343bd465 mapheader_t: PositionMusic property
A little off-piste, but a trivial addition since I'm changing this part of the code.
- Plays in Position outside of Encore
- Shows up first in the Sound Test sequence for that map
2023-03-28 15:14:09 +01:00
toaster
48eca2d8cf readlevelheader: Correct incorrect associated music debug message 2023-03-28 13:56:55 +01:00
toaster
3e476568ea mapheader_t: AssociatedMusic property
Enables things like the Goin' Down!? segment in Speed Highway to be connected directly to access to that map.
2023-03-28 13:50:05 +01:00
toaster
8e8c2273e9 S_FindMusicDef: Handle NULL/empty string explicitly 2023-03-28 13:47:25 +01:00
toaster
1f82285c39 S_SoundTestDefLocked: Account for Sealed Stars-style LF2_FINISHNEEDED completion lock. 2023-03-28 13:13:22 +01:00
toaster
8bd3786895 S_UpdateSoundTest: Add a "dotracks" parameter
- Integrates the maps with multiple tracks into the Next/Prev sequence, if true.
- For testing, currently active - but I may add features later that would be more fitting.
2023-03-28 13:06:39 +01:00
toaster
4f4976024c S_UpdateSoundTest: Corrections
- Fix inverted skipnull condition for forward sequence traversal
- Remove comment stating we used a naive implementation. The author of this commit used a triple pointer in the last one, this is anything but naive
2023-03-28 12:42:22 +01:00