thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-12-02 06:04:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
2622 commits 2 branches 14 tags 206 MiB
Commit graph

2622 commits

This branch
This branch
All branches
Author SHA1 Message Date
Sryder
052df3265e Call SDL_RWclose after an SDL_RWFromMem call to close the RWops. 2018-10-07 00:15:11 +01:00
Monster Iestyn
951b4d1582 Draw a star for continues if invalid skin numbers are somehow supplied 2018-10-05 22:42:36 +01:00
Steel Titanium
413d5e46c6 Really fix DD compiling this time. 2018-10-04 22:56:11 -04:00
Steel Titanium
8368647b29 Fix DD compiling 2018-10-04 22:44:26 -04:00
Steel Titanium
1656b77bc0 Restore deleted endif 2018-10-04 22:38:59 -04:00
Steel Titanium
2eb9bebcd9 Split zlib and libpng 2018-10-04 19:47:19 -04:00
Alam Ed Arias
1b8c18fbc8 Merge branch 'master' into next 2018-10-02 09:14:59 -04:00
Monster Iestyn
7d076d799c Merge branch 'linux-better-mem-report' into 'master' 
Use MemAvailable instead

See merge request STJr/SRB2!281
 2018-10-01 16:25:21 -04:00
Monster Iestyn
f3ebe6585e Move player + player mobj existence checks to top of P_MoveChaseCamera. This is the only place it makes sense to even check them tbh. 
While I'm at it, let's also use the "mo" variable instead of player->mo throughout the function (to be consistent)
 2018-09-30 22:18:48 +01:00
Monster Iestyn
57f76051bd Redo OpenGL skewing support, so that it now itself supports the lower unpegged effect for FOFs in OpenGL! 2018-09-28 17:02:02 +01:00
Steel Titanium
5efb94a35b Fix the weird indentation 2018-09-21 12:05:52 -04:00
Steel Titanium
7f7c5b60ae Rearrange the code. 
Thanks again MonsterIestyn!
 2018-09-21 11:26:08 -04:00
Steel
502414d609 Remove this that somehow slipped in. 2018-09-21 07:21:49 -04:00
Steel
ac8658fac8 Fix up errors with buildbots 2018-09-21 07:16:54 -04:00
Steel Titanium
43cbb0d11e Add some stuff 2018-09-20 18:33:50 -04:00
Steel Titanium
13a3f197bd Use MemAvailable instead 2018-09-20 18:30:46 -04:00
mazmazz
4da5d45cf5 S_ChangeMusic: More specific load/play fail messages 2018-09-18 09:38:41 -04:00
Monster Iestyn
e48e3e15c4 Merge branch 'public-var2s-fix' into 'next' 
Level spec thinker: Netsync var2s

See merge request STJr/SRB2!280
 2018-09-17 14:43:44 -04:00
mazmazz
f307c6d1b6 Line exec trigger netsync: Save var2s in addition to vars 2018-09-17 14:13:31 -04:00
Monster Iestyn
9481e7d358 Fix order of operations messups by adding brackets 2018-09-16 20:25:07 +01:00
Monster Iestyn
94b02c8e44 Merge branch 'mario-block-sync' into 'next' 
Fix for Mario block FOF texture synchronisation in netgames

See merge request STJr/SRB2!279
 2018-09-15 10:15:47 -04:00
mazmazz
76e3b7a7cd Mixer: HAVE_LIBGME ifdef in I_LoadSong 2018-09-15 00:35:24 -04:00
mazmazz
89a26f28bd Fix Windows buildbot for MP3_MAD/MODPLUG define (the header we use is 2.0.2) 2018-09-14 17:47:04 -04:00
mazmazz
ead04aeeeb Mixer: Better MODPLUG/MP3_MAD defines 
(cherry picked from commit 5b724e18b5268b0492b3f8b8980aadd2dd41e235)
 2018-09-14 17:27:31 -04:00
mazmazz
a2dd03bff6 Fix compile errors on buildbots 
* Check SDL Mixer 2.0.3 for MUS_MODPLUG_UNUSED, MUS_MP3_MAD_UNUSED
* Mixed D+C in I_LoadSong
 2018-09-14 17:07:13 -04:00
mazmazz
c64d52c1f9 Don't call I_StartupSound in SFX toggle 
* Mixer: make I_StartupSound return early if already set up
* Restartaudio: Add StopSFX call
 2018-09-14 16:39:10 -04:00
Monster Iestyn
128e5fd2bb Make sure that T_MarioBlockChecker is synced in netgames, so that the textures of Mario Blocks can change when there are no more items 2018-09-14 21:01:07 +01: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
f2ca028bbf I_InitMusic SDL2: Don't unload GME indiscriminately 2018-09-14 13:36:01 -04:00
mazmazz
5822cbbbe4 srb2dd music cleanup fixes 2018-09-14 13:24:15 -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
e7d87ea486 Menu sound toggle fixes (and add starpost sfx to menu) 2018-09-14 11:24:28 -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
6a6a7a60c7 I_SongPlaying detect GME properly 
(cherry picked from commit e88d1477616ca66472ecb50d371e37dc79c77c0f)
 2018-09-14 10:49:44 -04:00
mazmazz
4fd0638220 Stub I_UnloadSong because we already unload in I_StopMusic 
* Stop-gap for now. Ideally the logic would be in the respective places.

# Conflicts:
#	src/sdl/mixer_sound.c

(cherry picked from commit eae5d3333f5001512c82f22f2b1433a955b3a6c3)
 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
900fdbee99 A word 
(cherry picked from commit fb6f8c8a0752c229f5b7369729437c8fecb54d45)
 2018-09-14 10:49:44 -04:00
mazmazz
d288dd2b5c GME fix: play song in I_PlaySong, not I_LoadSong 
(cherry picked from commit 5f21bf230d9716b7cc5b52e4bf3591ebe01e9f3a)
 2018-09-14 10:45:39 -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
37a2f1d2b7 Refactor I_MusicType MusicPlaying and MusicPaused -> I_SongType ... 
(cherry picked from commit 4b82de9e540d6dc0651bbe8db8e5e15cba39f650)
 2018-09-14 10:45:38 -04:00
mazmazz
03c5f5635d Refactoring and reordering other targets 
(cherry picked from commit cf065e106f68fb8af3b0568eba188c8235b1656e)
 2018-09-14 10:43:46 -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
dcf0dd70fd nodigimusic nomusic nosound refactor other targets 
(cherry picked from commit 86f151db654beb14e8d6893cdff2adaa965e8e4b)
 2018-09-14 10:35:56 -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
bcc99d705d I_MusicPlaying, I_MusicPaused other targets 
(cherry picked from commit d5ec38815968e267aceb59a48a6cb6d3292c0b69)
 2018-09-14 10:28:35 -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