37e79ebfbd
Redone credits for joiners in a less stupid way, + redone start ambience in a less stupid way
2019-01-10 01:03:53 -05:00
2ccdd3e4b7
Fix Music toggle trying to play a non-existent song in Kart
2019-01-09 21:13:06 -05:00
de72403fb9
Add MUSICDEF lump for defining custom songs & replacing existing songs
...
Very rudimentary at the moment, but it's workable
2019-01-09 21:00:45 -05:00
72bc1b48f6
Merge branch 'next' into music-credits
2019-01-09 03:08:20 -05:00
3e37d131ed
Minor touchups/cleanup
2019-01-04 16:47:03 -05:00
5d51754936
In-game music credits
2019-01-04 04:44:55 -05:00
2422501ab9
Add a mapobjectscale global
...
Should be no different than it was before, now it's just less tedious to type :V
2018-12-12 21:55:59 -05:00
46571fbda2
Fixes to merge process
2018-11-29 10:07:35 -05:00
5534017954
Merge remote-tracking branch 'srb2public/next' into merge-next
2018-11-29 08:49:50 -05:00
ba111d42ca
Last minute changes.
2018-11-26 00:24:11 -05:00
cf01e820c4
Take the command line params into account
...
Really I'm just making it return early if either of the parms are used.
2018-11-25 22:39:11 -05:00
7d4c9dda91
Add newline to end of file
2018-11-25 14:24:50 -05:00
981a1192fb
Save sound toggles to config
2018-11-25 14:22:52 -05:00
e5fef95d94
Sound volume distance indication now scales with mapheader scale.
2018-11-25 13:30:43 +00:00
ea7162a76a
Update source copyrights to 2018
2018-11-25 07:35:38 -05:00
1ab5ac58a7
Title demos don't interrupt the music
2018-11-13 21:01:59 -05:00
d0f21ca415
Merge branch 'sfx-clean'
2018-11-12 04:26:02 -05:00
93ab9850a3
Clean-up of unused/removed sfx, replacement of the last remaining Mario sfx, and new sfx in some spots
...
- Replaced eggitem landing sfx
- Replaced banana landing sfx
- Replaced item tossing sfx
- Replaced item clashing sfx
- Added sfx for drift spark tier changing
- Added sfx for brake drifting
- Reverted Mario Mode sound replacement back to vanilla
2018-11-11 17:30:30 -05:00
6af56273bf
Merge branch 'next' of git@git.magicalgirl.moe:STJr/SRB2.git into nextmerge
...
# Conflicts:
# src/d_main.c
# src/d_main.h
# src/d_netcmd.c
# src/doomtype.h
# src/hardware/hw_md2.h
# src/p_user.c
# src/r_splats.h
# src/s_sound.c
# src/s_sound.h
# src/screen.c
# src/sdl/i_system.c
2018-11-10 21:14:53 +00:00
499faec555
Merge remote-tracking branch 'srb2public/next'
...
(Huge change: NO_MIDI is now a define, simply because that makes it easier for me to resolve merge conflicts if I can see the original code and the new code. Also means that people who REALLY miss MIDI can compile & fix it themselves :P)
2018-11-07 16:15:14 -05:00
f8d87c8f08
Preface with splitscreen checks
2018-10-29 05:26:17 -04:00
146c8b228b
- Reduce volume reduction
...
- Don't apply to sounds without an origin mobj
2018-10-25 22:53:58 -04:00
5ff1817c34
Divide sound volume by number of local players
2018-10-23 20:53:05 -04:00
cc0d1db9d8
Merge remote-tracking branch 'steeltitanium/music-clean' into test-public-music-cleanup
2018-10-19 23:56:56 -04:00
a288b95458
Merge remote-tracking branch 'public-gitlab/master' into public-music-cleanup
2018-10-19 22:04:26 -04:00
bcc1911672
Merge branch 'nextmerge_plus_rain' into 'master'
...
Next-merge plus rain
See merge request KartKrew/Kart!41
2018-10-16 16:36:18 -04:00
a919260fd2
Default sound channels
...
Now that we figured out that the sound cut-outs were due to a race condition and not this option, I feel content putting it with these other engine tweaks.
2018-10-16 13:26:03 -04:00
5701fe8a51
Give engines SF_TOTALLYSINGLE, and bug-fix it so that it can work like a flag
...
Sryder's request
2018-10-16 12:30:47 -04:00
a1e1aa81b5
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into nextmerge_plus_rain
...
# Conflicts:
# src/d_netcmd.c
# src/d_netcmd.h
# src/g_game.c
# src/p_floor.c
# src/p_user.c
# src/r_data.c
# src/r_data.h
# src/v_video.c
2018-10-14 21:52:05 +01:00
6184f91dd3
Add an int to I_PlaySound to tell an interface which channel number SRB2 is using.
...
I've voided this out on other sound interfaces than SDL Mixer ones because I'm both not sure whether they need it, and not sure how to make them work with it if they do.
2018-10-13 23:01:11 +01:00
450b536147
Remove the condition in restartaudio command.
...
No longer needed as S_RegisterSoundStuff will return early if in
dedicated mode.
2018-10-11 20:11:37 -04:00
b3faed190b
Move commands and console variable into s_sound.c
2018-10-11 16:29:43 -04:00
34e403afcb
S_ChangeMusic: More specific load/play fail messages
2018-09-18 09:38:41 -04:00
e72610a3dc
Separate StopMusic and UnloadMusic
2018-09-14 12:47:33 -04:00
8e05de17f0
Bring back music_data handle, for srb2dd
2018-09-14 12:29:58 -04:00
4b1bc53db1
Compile fixes
2018-09-14 10:58:41 -04:00
fac7d19637
Case-insensitive music_name comparison
...
(cherry picked from commit a7ae059949b320723727aea4468a370bc63c3910)
2018-09-14 10:49:44 -04:00
5f22b7d973
Volume fixes
...
# Conflicts:
# src/sdl/mixer_sound.c
(cherry picked from commit d39b7011c5b12e5b7abe3e493971e003469a1f3d)
2018-09-14 10:49:44 -04:00
eacf0ba00b
Refactor I_MusicType MusicPlaying and MusicPaused -> I_SongType ...
...
(cherry picked from commit 4b82de9e540d6dc0651bbe8db8e5e15cba39f650)
2018-09-14 10:45:38 -04:00
5bac836d4c
Minor refactoring and reordering
...
* I_GetMusicType() -> I_MusicType()
* Wrap MIDI volume hack in #ifdef _WIN32
(cherry picked from commit a7d51bf81030c228937a8e759f8f43b85817fce6)
2018-09-14 10:42:27 -04:00
8c78d86c36
Play the opposite type music (Digital/MIDI) when toggling between them in menu
...
* S_MusicInfo method to retrieve name, flags, and looping
(cherry picked from commit f6ec93198f0dcfa1d053cca88172c3e3c7ba310c)
2018-09-14 10:38:32 -04:00
7e7899ae83
Toggle Digi/MIDI music in menu accurately; add S_MusicType
...
(cherry picked from commit 4aa100aa575cc7fc14a743085222c806ba2c714a)
2018-09-14 10:37:08 -04:00
a414ccf24a
nodigimusic nomusic nosound -> digital_disabled midi_disabled sound_disabled
...
(cherry picked from commit 07738fb0bcf640a4349337373f451fe68e024b2a)
2018-09-14 10:35:51 -04:00
011a043dba
Refactoring, music statues
...
* S_Init -> S_InitSfxChannels because it did mostly SFX anyway
* S_MusicPlaying, S_MusicPaused, S_MusicName, S_MusicExists new status methods
* I_MusicPlaying, I_MusicPaused
(cherry picked from commit f5f0b5e76c2fd405c8cc895dde653c5ed2652622)
2018-09-14 10:28:29 -04:00
a7ed7b2c90
Consolidate I_SetDigMusicVolume and I_SetMIDIMusicVolume into one method
...
* In s_sound, they are merged to one method as well, but there are still two separate digvolume and seqvolume variables
* Simplified Dig/MidiMusicDisabled in s_sound
* Method reordering
(cherry picked from commit 701cc5a7dd1dfead87a42ec7558c9fa6a1deb193)
2018-09-14 10:23:37 -04:00
06b7367941
Added I_GetMusicType and removed midimode variable
...
* Revised S_PlayMusic arguments
* Now music plays again!
(cherry picked from commit 55f3803e4b9f8104c90cc6c769d54121e5bac0b8)
2018-09-14 09:42:29 -04:00
b505ea43f0
Merge branch 'sonicitems' into encore
2018-08-26 12:45:02 +01:00
08a23d7b87
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2.git into sonicitems
...
# Conflicts:
# src/g_game.c
# src/v_video.c
2018-08-26 12:42:55 +01:00
6f4308905f
Merge branch 'sonicitems' into encore
2018-08-08 12:04:17 +01:00
cd28a95908
Fix two bugs with how I disabled midi music for Kart.
...
* Correct the thing where it would print "music not found" when digital music is disabled.
* Make the MIDI music rejection text print if MIDI music is found (and digital music is on).
2018-08-07 21:51:03 +01:00
TehRealSalt