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
9812 commits 1 branch 12 tags 205 MiB
Commit graph

73 commits

Author SHA1 Message Date
James R
2274129f57 Update copyright year to 2020 2020-02-19 14:08:45 -08:00
James R
4f8775d560 Fix NOMIXER compiling 2019-12-30 20:08:29 -08:00
Steel Titanium
a5cdb0a4b3 Update copyright date on source files 2019-12-06 13:49:42 -05:00
toaster
534b98251b Revert "Revert "Merge branch 'musicplus-aug2019-b' into 'master'"" 
This reverts commit a76668f55a.
 2019-08-04 12:03:57 +01:00
toaster
a76668f55a Revert "Merge branch 'musicplus-aug2019-b' into 'master'" 
This reverts commit 0f89fb123f, reversing
changes made to 8fb211d8cf.
 2019-08-04 11:32:55 +01:00
mazmazz
f7936876be Merge branch 'master' into musicplus-sdlmixerx 2019-06-29 19:31:01 -04:00
mazmazz
2eb04ab17d Merge branch 'public_next' 2019-03-14 22:15:34 -04:00
mazmazz
81352aece1 WIP 20190101 merge 
d_netcmd.c
filesrch.c
m_menu.c
p_setup.c
p_spec.c
r_data.c
r_main.c
r_things.c
w_wad.c
w_wad.h
 2019-01-02 01:09:15 -05:00
mazmazz
2326a58bc7 Merge remote-tracking branch 'public-gl/master' into public-musicplus-core 2019-01-01 10:41:40 -05:00
mazmazz
e1c0a7158b Indentation 2018-12-08 14:10:56 -05:00
mazmazz
71aa97fc22 Force directsound to fix wrong-pitch sound effects 2018-12-08 14:05:58 -05:00
mazmazz
4b63f20e9d Merge branch 'musicplus-core' into musicplus-sdlmixerx 2018-11-13 14:34:40 -05:00
mazmazz
df7d23f00d Merge branch 'master' into musicplus-core 2018-11-13 13:46:30 -05:00
Monster Iestyn
4c3bfe81bd Merge branch 'public_next' 
# Conflicts:
#	src/Makefile
#	src/doomtype.h
#	src/hardware/hw_clip.c
#	src/hardware/hw_main.c
#	src/sdl12/sdl_sound.c
 2018-11-10 19:18:34 +00:00
Monster Iestyn
b34e8c5390 Remove FUNCMATH from functions with a void return value or args, or examine variables other than their args (which could be modified) 2018-11-08 16:26:55 +00:00
Monster Iestyn
a0c822fec8 Merge branch 'public_next' 
# Conflicts:
#	src/d_main.c
#	src/m_menu.c
#	src/s_sound.c
#	src/sdl/sdl_sound.c
 2018-10-20 15:31:48 +01:00
mazmazz
bf93dace76 Merge remote-tracking branch 'public-gitlab/master' into public-music-cleanup 2018-10-19 22:04:26 -04:00
Monster Iestyn
0b70c725c8 Merge branch 'public_next' 
# Conflicts:
#	src/nds/i_sound.c
#	src/r_data.c
#	src/sdl12/mixer_sound.c
#	src/sdl12/sdl_sound.c
#	src/win32ce/win_snd.c
 2018-10-19 22:46:19 +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
mazmazz
fa22f65610 Merge branch 'musicplus-core' into musicplus-sdlmixerx 2018-09-19 18:53:41 -04:00
mazmazz
50fa4e52fd MusicPlus core: NOMIXER=1 compile fix 2018-09-18 13:23:59 -04:00
mazmazz
d65967908d MusicPlus core: NOMIXER=1 compile fix 2018-09-18 13:23:42 -04:00
mazmazz
32c48af258 MusicPlus Core (positioning and fading) 2.2 -> 2.1 backport 2018-09-18 10:22:17 -04:00
mazmazz
707d649d67 Merge branch 'musicplus-core' into musicplus-sdlmixerx 2018-09-15 01:17:33 -04:00
mazmazz
b2e3352c5a Merge branch 'music-cleanup' into musicplus-core 2018-09-15 00:46:02 -04:00
mazmazz
21e1b72f5b Rip out SDL Mixer code from sdl_sound.c because superfluous 
* Mixer code has been in mixer_sound.c; this file is not invoked unless compiling with NOMIXER=1
* Remove everything under #ifdef HAVE_MIXER because this is never triggered
* Comment out #ifdef HAVE_LIBGME because we don't support playing music anyway (but theoretically, it could have worked separately from Mixer)
* Stub new music calls

(cherry picked from commit 74c6ae9661)
 2018-09-14 14:53:56 -04:00
mazmazz
74c6ae9661 Rip out SDL Mixer code from sdl_sound.c because superfluous 
* Mixer code has been in mixer_sound.c; this file is not invoked unless compiling with NOMIXER=1
* Remove everything under #ifdef HAVE_MIXER because this is never triggered
* Comment out #ifdef HAVE_LIBGME because we don't support playing music anyway (but theoretically, it could have worked separately from Mixer)
* Stub new music calls
 2018-09-14 14:52:24 -04:00
mazmazz
223160ffbd Refactor I_MusicType MusicPlaying and MusicPaused other targets 
(cherry picked from commit 9e6eebeb8d6b4119d87e9678bb6b0687e3dc5217)
 2018-09-14 10:45:39 -04:00
mazmazz
03c5f5635d Refactoring and reordering other targets 
(cherry picked from commit cf065e106f68fb8af3b0568eba188c8235b1656e)
 2018-09-14 10:43:46 -04:00
mazmazz
dcf0dd70fd nodigimusic nomusic nosound refactor other targets 
(cherry picked from commit 86f151db654beb14e8d6893cdff2adaa965e8e4b)
 2018-09-14 10:35:56 -04:00
mazmazz
bcc99d705d I_MusicPlaying, I_MusicPaused other targets 
(cherry picked from commit d5ec38815968e267aceb59a48a6cb6d3292c0b69)
 2018-09-14 10:28:35 -04:00
mazmazz
a8ce3d3002 Consolidate I_SetDigMusicVolume and I_SetMIDIMusicVolume other targets 
(cherry picked from commit 9fb9386f84b3739fe765a78bcb9683eb7e98bc36)
 2018-09-14 10:23:47 -04:00
mazmazz
32ab93a012 Added I_GetMusicType and removed midimode variable: other targets 
(cherry picked from commit 14b393ab16736bb44dab6fd4a90b7bdd8ff782e0)
 2018-09-14 09:55:45 -04:00
mazmazz
5a4e6cf924 Loose ends other targets 
(cherry picked from commit 9a5fc5f66a31baf713c6f32f7a696b933da6907b)
 2018-09-14 09:41:08 -04:00
mazmazz
1e9fdb0454 Corrected unterminated #endif in sdl_sound 2018-08-27 06:15:01 -04:00
mazmazz
193735bc5f Merge branch 'music-sdlmixerx' into musicplus-sdlmixerx 2018-08-27 05:59:55 -04:00
mazmazz
0939cabd57 Make SDL Mixer X win32-exclusive 2018-08-26 14:20:41 -04:00
mazmazz
ed6ec14797 Merge branch 'music-cleanup' into music-sdlmixerx 2018-08-26 14:04:54 -04:00
mazmazz
db410cb236 Update functions for other targets 2018-08-24 18:20:53 -04:00
mazmazz
1f5e62197e Merge branch 'music-cleanup' into musicplus-core 
Pending rewrite of fade music changing

# Conflicts:
#	src/android/i_sound.c
#	src/djgppdos/i_sound.c
#	src/i_sound.h
#	src/s_sound.c
#	src/s_sound.h
#	src/sdl/mixer_sound.c
#	src/sdl/sdl_sound.c
#	src/win32/win_snd.c
 2018-08-23 21:07:39 -04:00
mazmazz
5972ff3e90 Refactor I_MusicType MusicPlaying and MusicPaused other targets 2018-08-23 20:23:16 -04:00
mazmazz
2b9cadd477 Refactoring and reordering other targets 2018-08-23 17:54:40 -04:00
mazmazz
971b5c6727 nodigimusic nomusic nosound refactor other targets 2018-08-23 12:43:38 -04:00
mazmazz
8830943906 I_MusicPlaying, I_MusicPaused other targets 2018-08-23 12:31:01 -04:00
mazmazz
d79f38871e Consolidate I_SetDigMusicVolume and I_SetMIDIMusicVolume other targets 2018-08-23 11:54:58 -04:00
mazmazz
70d3315ac4 Added I_GetMusicType and removed midimode variable: other targets 2018-08-23 10:19:04 -04:00
mazmazz
a7df3be449 Loose ends other targets 2018-08-23 09:37:02 -04:00
mazmazz
b4b4285666 Revert "Nix'd midimusicvolume other targets" 
This reverts commit 31fd0f0cf5.

# Conflicts:
#	src/android/i_sound.c
#	src/dummy/i_sound.c
#	src/win32/win_snd.c
 2018-08-23 09:09:12 -04:00
mazmazz
8be165db5b Playback routines other targets 2018-08-23 09:06:31 -04:00
mazmazz
31fd0f0cf5 Nix'd midimusicvolume other targets 2018-08-23 07:39:45 -04:00