mazmazz
4a5bcf43a2
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 76be77b93a
2018-09-14 14:53:56 -04:00
Monster Iestyn
b82ddd4f08
Merge branch 'public_next'
2018-09-14 19:51:20 +01:00
mazmazz
517756606c
I_InitMusic SDL2: Don't unload GME indiscriminately
...
(cherry picked from commit cb4e075137
2018-09-14 13:57:24 -04:00
mazmazz
297653fa34
srb2dd music cleanup fixes
...
(cherry picked from commit 0999b0f8a8
2018-09-14 13:57:22 -04:00
mazmazz
a5948c3629
Separate StopMusic and UnloadMusic
...
(cherry picked from commit e72610a3dc
2018-09-14 13:57:20 -04:00
mazmazz
7f884591a7
Bring back music_data handle, for srb2dd
...
(cherry picked from commit 8e05de17f0
2018-09-14 13:56:14 -04:00
mazmazz
09df2c387a
newmusic -> mmusic typo, S_ChangeMusic
2018-09-14 13:55:07 -04:00
mazmazz
5c20aa79dd
More unnecessary if conditions, toggle SFX menu
2018-09-14 13:54:41 -04:00
mazmazz
aa1ec4d996
Sound menu toggle fix: unnecessary if condition
2018-09-14 11:25:25 -04:00
mazmazz
e8a5735f75
Merge branch 'lightfade-ticbased' into le-fadefof
2018-09-14 08:42:02 -04:00
mazmazz
714464993e
420: Removed unnecessary include (gametic no longer needed)
2018-09-14 08:26:52 -04:00
Monster Iestyn
6fbc014ea3
Merge branch 'thwomp-fixes' into 'next'
...
Thwomp fixes: Don't trigger on spectator; don't trigger on ~FF_EXISTS
See merge request STJr/SRB2!277
2018-09-13 14:47:40 -04:00
mazmazz
db41034ad9
Block song position changes on GME because unstable
2018-09-13 13:27:42 -04:00
mazmazz
8e4569381f
Merge branch 'master' into musicplus-core
2018-09-13 13:24:46 -04:00
mazmazz
ca5602f13b
Merge branch 'colormap-overhaul-change-ldef' into colormap-overhaul-fade
2018-09-13 12:19:28 -04:00
mazmazz
adca20b07f
Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef
2018-09-13 12:19:10 -04:00
mazmazz
07af82aa84
Missed fog boolean -> integer
2018-09-13 12:18:53 -04:00
mazmazz
761150b12d
455: Fog flag fix for fading
2018-09-13 12:18:10 -04:00
mazmazz
21506873be
Merge branch 'colormap-overhaul-change-ldef' into colormap-overhaul-fade
2018-09-13 12:10:14 -04:00
mazmazz
103db964fe
Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef
2018-09-13 12:08:56 -04:00
mazmazz
6824e6a359
Make extracolormap_t->fog UINT8; it's not boolean, but categorical
2018-09-13 12:08:46 -04:00
Digiku
89a6694d67
Don't trigger thwomp on spectators
2018-09-13 11:32:40 -04:00
mazmazz
c32c72c401
Thwomp fix: Don't trigger (look for players) when ~FF_EXISTS
2018-09-13 11:32:38 -04:00
mazmazz
3fc8ed5a9f
455: Set timing by either Back Y or Front Y, but not line length
2018-09-13 10:53:03 -04:00
mazmazz
94939f6613
455: Don't override fadergba on default/no colormap init (~BOUNCY)
2018-09-13 10:43:41 -04:00
mazmazz
5aa66f8872
455: Add speed increment timing (~EFFECT4) to FadeColormap
2018-09-13 10:43:32 -04:00
mazmazz
539092bec5
491, 492: Allow BLOCKMONSTERS raw translucency value in floorheight
2018-09-13 00:26:49 -04:00
mazmazz
4ab3a986f3
492 PolyObj Fade, 491 PolyObj Translucency, 490 PolyObj changes
...
* 490: Set proper render flags according to spawnflags
* 491: Add relative calc (EFFECT3) and Front X alpha param (DONTPEGTOP)
* 492:
* Tic-based (EFFECT4) and speed timing
* Add relative calc (EFFECT3) and Front X alpha param (DONTPEGTOP)
* Set proper render flags according to spawnflags
* Fix OpenGL >= NUMTRANSMAPS render bug
2018-09-13 00:06:11 -04:00
mazmazz
0697a1b90a
PolyObjFade: Apply RENDER, SOLID, and NOSPECIALS flags according to spawnflags
2018-09-13 00:06:08 -04:00
mazmazz
2f9e014aab
490 PolyVisible: Set proper spawn render flags instead of RENDERALL
2018-09-13 00:06:06 -04:00
mazmazz
63a3125df2
420: A parenthesis
2018-09-12 21:49:03 -04:00
mazmazz
46067f0579
Merge remote-tracking branch 'origin/lightfade-ticbased' into lightfade-ticbased
2018-09-12 21:35:46 -04:00
mazmazz
41fe080a68
420: Allow Back Y Offset for timing parameter
2018-09-12 21:32:12 -04:00
mazmazz
baf3aa5078
Merge branch 'colormap-overhaul-change-ldef' into colormap-overhaul-fade
2018-09-12 21:06:32 -04:00
mazmazz
dc72835679
Merge branch 'colormap-overhaul' into colormap-overhaul-fade
2018-09-12 21:06:27 -04:00
mazmazz
3b05f7f925
Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef
2018-09-12 21:06:07 -04:00
mazmazz
0b2caa948f
Init side->colormap_data pointer to NULL (for paranoia)
2018-09-12 21:05:50 -04:00
mazmazz
05c91f1f81
455: Change to side->colormap_data
2018-09-12 20:52:05 -04:00
mazmazz
17a78ba674
Merge branch 'colormap-overhaul-change-ldef' into colormap-overhaul-fade
2018-09-12 20:47:00 -04:00
mazmazz
1fcfa7fcf1
Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef
2018-09-12 20:46:02 -04:00
mazmazz
f7ff440250
Add colormap_data to side_t and store colormaps there on setup
2018-09-12 20:43:48 -04:00
mazmazz
fad12d6be3
Merge branch 'master' into le-fadefof
2018-09-12 18:01:42 -04:00
mazmazz
30b9ed59c0
Merge branch 'colormap-overhaul-change-ldef' into colormap-overhaul-fade
2018-09-12 17:40:24 -04:00
mazmazz
fec74d5d82
Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef
2018-09-12 17:39:59 -04:00
mazmazz
ad9ef5d593
Merge errors
2018-09-12 17:39:30 -04:00
mazmazz
978b9bdea2
Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef
2018-09-12 17:30:09 -04:00
mazmazz
c58e9b0bae
Merge remote-tracking branch 'origin/master' into colormap-overhaul
2018-09-12 17:28:22 -04:00
mazmazz
9fb9b44383
Fade FOF colormap support
2018-09-12 16:59:35 -04:00
mazmazz
06fa05f6cd
Merge branch 'colormap-overhaul-change-ldef' into colormap-overhaul-fade
2018-09-12 16:30:10 -04:00
mazmazz
8535fb01c2
Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef
2018-09-12 16:29:02 -04:00
