Alam Ed Arias
644aba78d5
Merge branch 'public_next' into private
2019-07-29 18:31:01 -04:00
Alam Ed Arias
62e45e5f5b
SDL2: fixed compiling mixer interface with MSVC
2019-07-29 17:56:35 -04:00
Steel Titanium
490e3fe9a9
Merge branch 'master' into musicplus-sdlmixerx
2019-07-22 22:20:08 -04:00
Steel Titanium
d44702cb0e
Some fixup
2019-07-22 22:01:05 -04:00
Monster Iestyn
f266eda97b
Merge branch 'public_next'
2019-07-16 18:28:49 +01:00
Steel Titanium
db525c43a7
Fix crash with GME sounds when being freed
2019-07-14 14:55:04 -04:00
Monster Iestyn
3fec42c436
Add static keyword to these variables for correctness
2019-07-14 16:23:01 +01:00
Steel Titanium
c0927754a1
Seperate declarations from code
2019-07-09 15:51:11 -04:00
Steel Titanium
ccecb4c6cd
Some few comments
2019-07-09 00:56:22 -04:00
Steel Titanium
2b3118b288
Better loading code for modules
2019-06-29 20:35:31 -04:00
mazmazz
f7936876be
Merge branch 'master' into musicplus-sdlmixerx
2019-06-29 19:31:01 -04:00
mazmazz
7bbd05e85d
Merge branch 'public-notpublic-musicplus-jingle' into internal-musicplus-jingle
2019-06-29 18:33:45 -04:00
mazmazz
53fe455a8f
Merge branch 'public-musicplus-jingle' into public-notpublic-musicplus-jingle
2019-06-29 18:10:44 -04:00
Steel Titanium
813ccf71e5
Merge branch 'next' into public-musicplus-libopenmpt
2019-06-03 15:36:50 -04:00
Steel Titanium
ff040ccced
Update libopenmpt to 0.4.4
2019-05-23 22:05:28 -04:00
Steel Titanium
ea29bae39e
Forgot some references
2019-05-20 23:31:23 -04:00
Steel Titanium
991181afa2
circleci: Fix compiling error
2019-05-20 23:22:23 -04:00
wolfy852
1136d88bd6
Merge remote-tracking branch 'remotes/srb2pub/next' into upstream-merge
2019-05-07 21:43:12 -05:00
wolfy852
2222738e1c
Merge remote-tracking branch 'remotes/srb2pub/public_flatsprite' into next
...
# Conflicts:
# src/d_netcmd.c
# src/doomdef.h
# src/doomstat.h
# src/f_finale.c
# src/g_game.c
# src/hu_stuff.c
# src/m_menu.c
# src/p_spec.c
# src/p_user.c
# src/r_main.c
# src/r_things.c
# src/s_sound.c
# src/v_video.c
# src/y_inter.c
2019-05-06 22:40:12 -05:00
mazmazz
d2236a32c3
Remove song_length tag search
...
Because songs without this tag will skiplag when loading.
2019-05-02 19:14:23 -04:00
mazmazz
7301140b10
Remove MP3 widechar tag searching
...
1. It's slow, 2. It's incorrect
2019-05-02 19:13:56 -04:00
mazmazz
7f0b923107
Merge branch 'public-gl-next' into public-musicplus-jingle
2019-03-15 18:42:19 -04:00
mazmazz
832a6433c2
Remove MP3 warning
2019-03-13 19:51:45 -04:00
Steel Titanium
d475bcb0b7
Some few changes
2019-01-05 23:42:25 -05:00
SeventhSentinel
1d58c6b8c2
merge srb2 next
2019-01-05 15:59:23 -05:00
mazmazz
2c2a96b554
MUS_MODPLUG fix
2019-01-04 18:39:09 -05:00
mazmazz
c0ca2c8980
Remove dynamic openmpt loading
2019-01-03 20:52:09 -05:00
Marco Z
51976778e2
Fix MSVC compile errors
2019-01-03 20:34:10 -05:00
mazmazz
1dd2899521
Merge branch 'public-musicplus-core' into public-musicplus-libopenmpt
2019-01-02 02:14:49 -05:00
mazmazz
8dc37a850b
Fix loop_point and song_length floating point comparisons
2019-01-01 10:47:16 -05:00
mazmazz
2326a58bc7
Merge remote-tracking branch 'public-gl/master' into public-musicplus-core
2019-01-01 10:41:40 -05:00
Digiku
7920dbe4a8
Merge branch 'float_equal' into 'master'
...
Clear Float equal warnings
See merge request STJr/SRB2!383
2018-12-20 16:58:37 -05:00
Alam Ed Arias
261e1e623c
Clear float equal warnings
2018-12-14 20:34:06 -05:00
mazmazz
71aa97fc22
Force directsound to fix wrong-pitch sound effects
2018-12-08 14:05:58 -05:00
Sryder
0847d7e29d
Fix 2 of the Unsuffixed Float Constant warnings
...
The other one is related to M_PI for me, which I'm still not sure about where it's getting it from
2018-11-29 22:12:14 +00:00
mazmazz
89a3c889dd
stray #if to #ifdef
2018-11-19 20:52:01 -05:00
toaster
5fe9cbba3d
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into nextmerge_again
...
# Conflicts:
# src/d_clisrv.c
# src/m_misc.c
2018-11-18 18:26:50 +00:00
Sryder
67f0b120c7
Squash various warnings
...
Shadowed declarations
Unsuffixed float constants
There's an unsuffixed float constant I can't fix because the define is outside of SRB2. We could have our own copy of Pi if we really wanted.
2018-11-14 21:53:57 +00:00
Alam Ed Arias
45c8920bb1
Clean up warnings
2018-11-14 10:52:16 -05:00
mazmazz
366aeadac4
Fix x64 build issue
2018-11-13 17:12:18 -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
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
Monster Iestyn
51ee510b85
Merge branch 'gcc-compiling-cleanup' into 'master'
...
Compiling cleanup and fixes
See merge request STJr/SRB2!311
2018-11-10 13:56:17 -05: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
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
Steel Titanium
d7a0a3c94b
Update copyright info on some files
2018-11-01 14:47:19 -04:00
mazmazz
bf93dace76
Merge remote-tracking branch 'public-gitlab/master' into public-music-cleanup
2018-10-19 22:04:26 -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
