mazmazz
a1e2ee2e11
Postboss: S_ChangeMusicAdvanced -> Ex
2018-09-16 23:44:42 -04:00
mazmazz
5f5ea5eec6
Merge branch 'musicplus-core' into musicplus-feature-postboss
2018-09-16 23:32:18 -04:00
mazmazz
ce37b8f121
S_ChangeMusicAdvanced -> S_ChangeMusicEx
2018-09-16 23:10:23 -04:00
mazmazz
8315170069
Separate Lua from musicplus-core
2018-09-16 23:09:37 -04:00
mazmazz
a8c4912810
Mixer: Add missing tag declarations in I_LoadSong
2018-09-15 01:14:24 -04:00
mazmazz
b2e3352c5a
Merge branch 'music-cleanup' into musicplus-core
2018-09-15 00:46:02 -04:00
mazmazz
fab6316954
Mixer: HAVE_LIBGME ifdef in I_LoadSong
2018-09-15 00:34:55 -04:00
mazmazz
b6894de26a
Fix Windows buildbot for MP3_MAD/MODPLUG define (the header we use is 2.0.2)
...
(cherry picked from commit 89a26f28bd
2018-09-14 17:48:12 -04:00
mazmazz
aac7857d16
Mixer: Better MODPLUG/MP3_MAD defines
2018-09-14 17:27:00 -04:00
mazmazz
c4305c5963
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
(cherry picked from commit a2dd03bff6
2018-09-14 17:09:21 -04:00
mazmazz
00987dd7e5
Don't call I_StartupSound in SFX toggle
...
* Mixer: make I_StartupSound return early if already set up
* Restartaudio: Add StopSFX call
(cherry picked from commit c64d52c1f9
2018-09-14 16:43:48 -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
cacb12392b
I_InitMusic SDL2: Don't unload GME indiscriminately
...
(cherry picked from commit f2ca028bbf
2018-09-14 13:57:24 -04:00
mazmazz
69359d4db0
srb2dd music cleanup fixes
...
(cherry picked from commit 5822cbbbe4
2018-09-14 13:57:22 -04:00
mazmazz
dc20a41c25
Separate StopMusic and UnloadMusic
...
(cherry picked from commit db37bfc921
2018-09-14 13:57:20 -04:00
mazmazz
64cc452077
Bring back music_data handle, for srb2dd
...
(cherry picked from commit 4069c36b16
2018-09-14 13:56:14 -04:00
mazmazz
093158b80b
newmusic -> mmusic typo, S_ChangeMusic
2018-09-14 13:55:07 -04:00
mazmazz
1b2d28bc7a
More unnecessary if conditions, toggle SFX menu
2018-09-14 13:54:41 -04:00
mazmazz
b767a0bfd1
Sound menu toggle fix: unnecessary if condition
2018-09-14 11:25:25 -04:00
mazmazz
e24ea0cb4d
Block song position changes on GME because unstable
2018-09-13 13:27:42 -04:00
mazmazz
9c56f953a5
Merge branch 'master' into musicplus-core
2018-09-13 13:24:46 -04:00
Monster Iestyn
7d49951cc0
Merge branch 'change-colormap-ldef' into 'master'
...
New linedef executor special: change tagged sector's colormap
See merge request STJr/SRB2Internal!149
2018-09-11 17:21:31 -04:00
Monster Iestyn
bab4a67516
Merge branch 'master' into change-colormap-ldef
2018-09-11 16:43:01 +01:00
Monster Iestyn
78130e830e
Merge branch 'public_next'
...
# Conflicts:
# src/p_setup.c
# src/r_data.c
2018-09-11 16:41:27 +01:00
Monster Iestyn
d8f73b0d97
Merge branch 'master' into next
2018-09-11 16:34:16 +01:00
Monster Iestyn
bf6379c3df
Merge branch 'colormap-code-cleanup' into 'master'
...
Colormap code cleanup
See merge request STJr/SRB2!275
2018-09-11 11:31:56 -04:00
mazmazz
ccf37b96f8
Merge branch 'musicplus-core' into musicplus-feature-postboss
2018-09-11 11:25:21 -04:00
mazmazz
1bb41a00bc
Don't decrement fade timer if song is paused
2018-09-11 11:20:46 -04:00
mazmazz
2b4d7d1ad4
Change to percentage calc from interval decrement for volume fade
2018-09-11 11:17:30 -04:00
Monster Iestyn
22b799a655
Remove commented out stuff, now I've confirmed everything works fine without them
2018-09-10 15:49:21 +01:00
mazmazz
473d902696
Remove bottommap and topmap from savegame because unused
2018-09-10 09:03:58 -04:00
mazmazz
8a4bb895af
Savegame netsync for sector colormaps; add spawn_midmap and co for comparison
2018-09-10 09:01:09 -04:00
Monster Iestyn
a5ba47cb3a
R_CreateColormap2 and R_MakeColormaps have been made obsolete, it's just R_CreateColormap now, like it used to be!
...
With that, I moved R_CreateColormap2's exclusive software colormap malloc code to R_CreateColormap, and merged the two software-only blocks of code into one. I also disabled any unneeded variables and fixed a preprocessor-related goofup
2018-09-09 22:48:09 +01:00
mazmazz
47cf5ebdd7
Merge branch 'master' into change-colormap-ldef
2018-09-09 08:40:38 -04:00
Monster Iestyn
ae6085ef1a
Merge branch 'netcode-nitpicking' into 'next'
...
Netcode nitpicking
See merge request STJr/SRB2!274
2018-09-07 15:59:49 -04:00
Digiku
8d015bd7cc
Merge branch 'flicky-things' into 'master'
...
Flicky Thing Types
See merge request STJr/SRB2Internal!154
2018-09-06 16:02:19 -04:00
mazmazz
fbd6b2c826
Flicky colors indexing fix
2018-09-06 13:20:55 -04:00
mazmazz
a430d133b4
Compiler errors
2018-09-06 13:16:50 -04:00
mazmazz
4dcf3835e3
Stray comments
2018-09-06 12:13:03 -04:00
mazmazz
7f404345f0
Make default flicky home radius 384
2018-09-06 11:59:55 -04:00
mazmazz
fd037fe763
Limit random fish color to SRB2's defaults
2018-09-06 11:56:55 -04:00
mazmazz
2b93a38f8e
Change default radius to 448
...
* Put default radius back in FLICKY_CENTER states
2018-09-06 11:54:06 -04:00
mazmazz
7b3c4aee33
Impose home radius on aimless flickies; improve randomness of flickyhitwall angle
2018-09-06 11:17:08 -04:00
mazmazz
04a59aacc4
Only allow flicky bounce (MF_NOCLIPTHING) if also in-place (MF_GRENADEBOUNCE)
2018-09-06 10:32:26 -04:00
mazmazz
c61cbcdf22
Erase default home radius from states and impose default on home check
2018-09-06 10:20:01 -04:00
mazmazz
fe508088b2
Re-organize flags for FLICKY_CENTER
...
* Flickies can be in-place with just one flag (MF_GRENADEBOUNCE)
* Flickies can now hop whether orbiting, aimless, or in-place
* Removed ability to customize movedir for orbit; will always be random
* Removed ability to customize gravity sink for aimless flying flickies
* Misc: Use P_SetTarget to set actor->tracer for flicky center
2018-09-06 10:17:41 -04:00
mazmazz
2d86dddb00
Merge branch 'master' into flicky-things
2018-09-06 08:09:02 -04:00
mazmazz
0ff48976b1
Impose default radius for orbiting flickies
2018-09-06 08:08:53 -04:00
mazmazz
9ef7c09d89
Make default behavior: aimless flying flickies stay at Z height
2018-09-06 08:07:13 -04:00
mazmazz
6426d88141
Store extravalue1 (home radius) immediately in A_FlickyCenter, not during player look routine
2018-09-06 07:55:15 -04:00
