thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
4282 commits 1 branch 12 tags 205 MiB
Commit graph

61 commits

Author SHA1 Message Date
TehRealSalt
a8b57e6f0d Title demos don't interrupt the music 2018-11-13 21:01:59 -05:00
TehRealSalt
e9a432f7d0 Merge branch 'sfx-clean' 2018-11-12 04:26:02 -05:00
TehRealSalt
339a2a6ee6 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
Sryder
9350721d12 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
TehRealSalt
c7b0df8172 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
TehRealSalt
fc156e6fb5 Preface with splitscreen checks 2018-10-29 05:26:17 -04:00
TehRealSalt
95875289b8 - Reduce volume reduction 
- Don't apply to sounds without an origin mobj
 2018-10-25 22:53:58 -04:00
TehRealSalt
5ebd3119da Divide sound volume by number of local players 2018-10-23 20:53:05 -04:00
mazmazz
82e60f806e Merge remote-tracking branch 'steeltitanium/music-clean' into test-public-music-cleanup 2018-10-19 23:56:56 -04:00
mazmazz
bf93dace76 Merge remote-tracking branch 'public-gitlab/master' into public-music-cleanup 2018-10-19 22:04:26 -04:00
Sal
dbf7096d27 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
TehRealSalt
430a5dfcc1 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
TehRealSalt
9891080360 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
toaster
1142fddc71 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
Sryder
4132b39b9a 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
Steel Titanium
7428fb991c 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
Steel Titanium
9b8b5ea57c Move commands and console variable into s_sound.c 2018-10-11 16:29:43 -04:00
mazmazz
4da5d45cf5 S_ChangeMusic: More specific load/play fail messages 2018-09-18 09:38:41 -04:00
mazmazz
db37bfc921 Separate StopMusic and UnloadMusic 2018-09-14 12:47:33 -04:00
mazmazz
4069c36b16 Bring back music_data handle, for srb2dd 2018-09-14 12:29:58 -04:00
mazmazz
af2496de9e Compile fixes 2018-09-14 10:58:41 -04:00
mazmazz
6d6cd4f4c4 Case-insensitive music_name comparison 
(cherry picked from commit a7ae059949b320723727aea4468a370bc63c3910)
 2018-09-14 10:49:44 -04:00
mazmazz
245bc9a66f Volume fixes 
# Conflicts:
#	src/sdl/mixer_sound.c

(cherry picked from commit d39b7011c5b12e5b7abe3e493971e003469a1f3d)
 2018-09-14 10:49:44 -04:00
mazmazz
37a2f1d2b7 Refactor I_MusicType MusicPlaying and MusicPaused -> I_SongType ... 
(cherry picked from commit 4b82de9e540d6dc0651bbe8db8e5e15cba39f650)
 2018-09-14 10:45:38 -04:00
mazmazz
74d6302f09 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
mazmazz
89dcae23a2 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
mazmazz
b51cf6c060 Toggle Digi/MIDI music in menu accurately; add S_MusicType 
(cherry picked from commit 4aa100aa575cc7fc14a743085222c806ba2c714a)
 2018-09-14 10:37:08 -04:00
mazmazz
23acc47b39 nodigimusic nomusic nosound -> digital_disabled midi_disabled sound_disabled 
(cherry picked from commit 07738fb0bcf640a4349337373f451fe68e024b2a)
 2018-09-14 10:35:51 -04:00
mazmazz
f41ad3073d 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
mazmazz
1ca6ac1c67 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
mazmazz
ff91315cbc 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
toaster
44c33561b5 Merge branch 'sonicitems' into encore 2018-08-26 12:45:02 +01:00
toaster
41b7625fa7 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
toaster
a291659b12 Merge branch 'sonicitems' into encore 2018-08-08 12:04:17 +01:00
toaster
a8ef5030f9 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
toaster
d582a9dd97 Encore mode - a fresh take on mirror mode! 
* Palette remaps.
* Branding.

TODO:
* Doesn't work in GL. (Mostly.) I have SOME ideas on how to tackle this, but...
* Transmaps are broken in Encore for some reason.
* I tried to make in-level colormaps shimmy over, but it didn't quite work, so I commented it out and only semi-fixed it.
 2018-07-23 23:50:41 +01:00
toaster
baa1024ffb Don't look at this commit too closely until after netgame, I want to surprise yalls!! 
* Lots of menu changes!
	* Little arrows next to changeable cvars!
	* Show default value for sliders!
	* Pretty pretty pretty.
	* I don't know how to describe some of these changes.
* Effectively nuke MIDI music support!
* Skiddown at the start of a race is more interesting!
* Spinning in waterslides!
* Tiny bugfix in voting, plus a little celebration...
 2018-06-30 23:18:13 +01:00
TehRealSalt
e9a1dbec82 Better menus 2018-06-14 20:18:29 -04:00
TehRealSalt
3d9f1a90e1 Merge branch 'master' into sonicitems 2018-06-07 19:39:45 -04:00
TehRealSalt
681ee4fcfa Exit siren, disable constant forcing of Mario Mode sounds 2018-06-03 18:20:21 -04:00
Steel Titanium
8f169e184d Default sound volume is too loud 2018-04-11 14:40:05 -04:00
TehRealSalt
9ba13c8ea4 Merge remote-tracking branch 'refs/remotes/origin/master' into sonicitems 
# Conflicts:
#	src/k_kart.c
#	src/k_kart.h
#	src/lua_baselib.c
#	src/p_inter.c
#	src/p_spec.c
 2018-03-31 00:44:03 -04:00
TehRealSalt
79983e8b77 Fix errors 2018-03-24 08:13:33 -04:00
TehRealSalt
ebc55d62ee Splitscreen sound improvements 
- Fixed a simple oversight that prevented P3 and P4's sounds from ever
playing
- Changed how sound priority works, now compares distances between

(Untested as of commit since my computer wants a quick restart before it
compiles :V)
 2018-03-23 22:50:42 -04:00
TehRealSalt
79ba08ac7d Merge remote-tracking branch 'refs/remotes/origin/master' into sonicitems 
# Conflicts:
#	src/d_netcmd.c
#	src/g_game.c
#	src/k_kart.c
#	src/p_enemy.c
#	src/p_inter.c
#	src/p_map.c
#	src/p_user.c
#	src/sounds.c
#	src/sounds.h
#	src/y_inter.c
 2018-03-12 00:58:13 -04:00
TehRealSalt
7b05192695 Fixed stereoreverse, and its effects are applied to mirror mode 
How long has this cvar been broken?!
 2018-02-20 20:04:33 -05:00
TehRealSalt
495ee25f18 Chaotix sound effects, new music names 2018-02-10 16:01:09 -05:00
TehRealSalt
349b27e0de Change splitscreen into UINT8, fix HUD slightly more 2017-12-18 20:59:04 -05:00
TehRealSalt
0393e24fa6 A lot lol 
The importants:
- Fixed compiling
- Combined G_BuildTiccmd for all players, no more need for a function
for each
- You can actually start 3p/4p mode
 2017-12-16 22:32:43 -05:00
ZTsukei
580f909c6c Added Accelcode, start boosting, reverted drifting, etc. 2017-02-07 17:19:58 -05:00