mazmazz
a40c6f0125
Intermission: Don't fade out level music when using win32 midi volume hack
2019-03-15 01:26:13 -04:00
mazmazz
1381343a2e
Implement MUSICINTERFADEOUT level header
2019-03-15 01:05:52 -04:00
mazmazz
a9b6bad96a
Merge branch 'public-gl-next' into public-musicplus-inter
2019-03-14 23:42:16 -04:00
mazmazz
bdb9e8cfda
When resetting volume on same music, make it fade instead of a hard change
2019-03-13 23:55:30 -04:00
mazmazz
2c823703f9
When changing to same music, reset the internal volume
2019-03-13 23:41:35 -04:00
mazmazz
aa22941d2c
Restore MUSIC_RELOADRESET if block in g_game
2019-03-13 21:18:23 -04:00
mazmazz
06f4f355ff
Fix custom fade source bug for Change Music linedef
2019-03-13 19:53:16 -04:00
mazmazz
832a6433c2
Remove MP3 warning
2019-03-13 19:51:45 -04:00
mazmazz
937a423664
Merge remote-tracking branch 'public-gl/next' into public-musicplus-core
2019-03-13 19:45:07 -04:00
Alam Ed Arias
a037977f09
Merge branch 'master' into next
2019-03-09 20:37:17 -05:00
Alam Ed Arias
d386febf56
TravisCI: add option for GCC 8.1
2019-03-09 19:41:56 -05:00
Alam Ed Arias
fc13137880
Merge branch 'master' into next
2019-03-04 17:15:04 -05:00
Alam Ed Arias
9dbdc6a3a5
No more errors for VC6 support
2019-03-04 16:46:14 -05:00
Alam Ed Arias
4b0e8db4c1
no more floating constants warnings, and disable bad array bounds warnings
2019-03-04 16:46:14 -05:00
Alam Ed Arias
86264a545e
Merge branch 'master' into next
2019-03-01 17:32:17 -05:00
Alam Ed Arias
2eb26bc68e
Fix building without BLUA support
2019-03-01 17:31:32 -05:00
Monster Iestyn
e4062e1dc0
Merge branch 'master' into next
2019-03-01 16:23:51 +00:00
Monster Iestyn
8d124101f4
Merge branch 'need-more-time' into 'master'
...
Stop Linux servers from hanging every 34 hours
See merge request STJr/SRB2!465
2019-03-01 11:22:32 -05:00
Monster Iestyn
659e8e8162
Merge branch 'master' into next
2019-03-01 16:05:49 +00:00
wolfy852
cc7112eaf5
Stop Linux servers from hanging every 34 hours
2019-03-01 00:07:58 -06:00
Alam Ed Arias
3cbb1204ad
Merge branch 'apng-oh-shit-fixes' into 'master'
...
Compiling errors for apng fixed
See merge request KartKrew/Kart-Public!69
2019-02-28 12:00:58 -08:00
wolfs
8a6f4b6405
Merge branch 'apng' into 'master'
...
Support aPNG in new versions of libpng
See merge request KartKrew/Kart-Public!63
2019-02-28 12:00:58 -08:00
Steel Titanium
c748882d04
Remove double define
2019-02-27 16:05:43 -05:00
Steel Titanium
7fc180604b
Upped MAXNETNODES
2019-02-27 15:59:50 -05:00
Monster Iestyn
538605117e
Merge branch 'master' into next
2019-02-27 20:35:07 +00:00
Monster Iestyn
ea0c251a92
Merge branch 'sdl-new-windowicon' into 'master'
...
SDL:Update XPM icon
See merge request STJr/SRB2!441
2019-02-27 13:34:24 -05:00
Monster Iestyn
e7952e4de7
Make sure that B_CheckRespawn can be called even if Tails is dead
2019-02-26 21:14:22 +00:00
Alam Ed Arias
482bfd0804
Merge branch 'hide-error-devmode' into 'next'
...
Show line number on error, also hide under devmode
See merge request STJr/SRB2!458
2019-02-21 23:05:09 -05:00
Alam Ed Arias
887a26f971
Merge branch 'master' into next
2019-02-21 22:42:26 -05:00
Steel Titanium
45e9e3f7f9
Disable multi statement macros errors.
2019-02-21 18:48:42 -05:00
Steel Titanium
93bed5f40d
Show line number on error, also hide under devmode
2019-02-11 16:39:58 -05:00
Monster Iestyn
4b8b8f90f4
Merge branch 'fix_skins_overflow' into 'next'
...
Fix skin overflow error
See merge request STJr/SRB2!455
2019-02-11 15:05:00 -05:00
Steel Titanium
221ec15af0
How did I forget about this
2019-01-26 23:22:30 -05:00
Steel Titanium
34920c2951
Setup the tables even eariler.
...
I really hate that PlayerMenu status hack, but that's really the only
way I could think off to show the entires for Tails, Knuckles and the
Sonic&Tails pair.
2019-01-26 23:16:49 -05:00
Steel Titanium
31a884e542
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2 into polyobj_fix_vanilia
2019-01-26 00:51:39 -05:00
TehRealSalt
bcdfe2eb14
Update the SP menu stuff to use MAXSKINS
...
Co-authoered-by: Steel Titanium (steeltitanium1@gmail.com>
2019-01-26 00:22:05 -05:00
Alam Ed Arias
2f65d2860a
Merge branch 'master' into next
2019-01-20 17:01:01 -05:00
Sryder
517a32e96d
Disable the APNG code if the version of libpng is greater than 1.4.
...
Since supposedly the current code *can't* work with newer versions of libpng that have the apng patch, it won't compile if that's what people have.
It seems like some distros are adding the apng patch to libpng and that'll make things annoying to compile for people.
I think it goes without saying, but if there's ever a fix to make newer libpng versions work with the APNG code then this can be reverted.
2019-01-20 18:50:28 +00:00
Steel Titanium
123b97c5ed
Fix skins overflow
2019-01-15 14:29:43 -05:00
fickleheart
81c73032e4
Fix rendering gaps on polys with upper/lower textures
2019-01-12 20:15:58 -05:00
Digiku
8e862b3c98
Update f_finale.c - Small credits update
2019-01-07 16:50:59 -05:00
Digiku
e45c54dc60
Update f_finale.c - Remove Torgo's real name by request
2019-01-07 03:41:25 -05:00
Digiku
031e234d86
Merge branch 'changecontrol-text-overflow-fix' into 'master'
...
Resolve buffer overflow crash when configuring System Menu and GIF controls
See merge request STJr/SRB2!445
2019-01-04 19:39:17 -05:00
Digiku
e42e1178ed
Increase M_ChangecontrolResponse message buffer by 25 chars
2019-01-04 19:38:36 -05:00
mazmazz
c5e9d6c97f
DD Compile fixes
2019-01-02 06:48:06 -05:00
mazmazz
5807384dbd
Remove S_MusicExists lua
2019-01-02 06:26:18 -05:00
Steel Titanium
2ba11a6d69
Support for per-map intermission music
2019-01-02 05:15:23 -05:00
mazmazz
0724d042bc
Add safe lua music functions
...
S_MusicExists
S_SetInternalMusicVolume
S_StopFadingMusic
S_FadeMusic
S_FadeOutStopMusic
2019-01-02 04:58:03 -05:00
mazmazz
6086a9f238
Merge branch 'public-musicplus-le-changemusic' into public-musicplus-core
2019-01-02 03:47:51 -05:00
mazmazz
e244b34093
Merge remote-tracking branch 'public-gl/master' into public-musicplus-core
2019-01-02 02:15:16 -05:00
