Digiku
|
a28cc10861
|
Merge branch 'op-nights-bumper' into 'master'
Objectplace: Place NiGHTS Bumpers with the player's fly angle
See merge request STJr/SRB2Internal!166
|
2018-08-29 06:01:27 -04:00 |
|
Digiku
|
f8332f6765
|
Merge branch 'nights-nightserizeangle' into 'master'
NiGHTS: Reset player another/flyangle on De/Nightserize
See merge request STJr/SRB2Internal!139
|
2018-08-29 04:27:02 -04:00 |
|
Digiku
|
4882b7c3f8
|
Merge branch 'intermission-bonuslivesmax' into 'master'
Intermission: MaxBonusLives level header option for # of lives in score tally
See merge request STJr/SRB2Internal!162
|
2018-08-29 04:25:03 -04:00 |
|
Digiku
|
9746442a93
|
Merge branch 'le-ringspheres' into 'master'
Line Execs: Make Ring triggers accept spheres in NiGHTS levels
See merge request STJr/SRB2Internal!163
|
2018-08-29 04:24:47 -04:00 |
|
Digiku
|
78c78d9e63
|
Merge branch 'sphere-ring-concurrence' into 'master'
Change SETSPHERES console command to SETRINGS to handle player->spheres transparently
See merge request STJr/SRB2Internal!167
|
2018-08-29 04:24:23 -04:00 |
|
mazmazz
|
b0be27a54e
|
Fix music fade out when MUSICPOSTBOSS is not specified or doesn't exist
|
2018-08-28 18:46:30 -04:00 |
|
Monster Iestyn
|
73a66d22df
|
At toaster's suggestion, have 2p control whether closed captioning is moved up if the powerup display is 1st person only
|
2018-08-28 20:57:43 +01:00 |
|
Monster Iestyn
|
1af8d3ac02
|
Merge branch 'master' into hud-n-menu-tidbits
# Conflicts:
# src/m_menu.c
# src/screen.c
# src/st_stuff.c
|
2018-08-28 20:51:46 +01:00 |
|
Monster Iestyn
|
58a844d3cf
|
Merge branch 'public_next'
# Conflicts:
# src/r_things.c
# src/v_video.c
|
2018-08-28 19:31:08 +01:00 |
|
mazmazz
|
9c35b3dfc5
|
Merge branch 'musicplus-core' into musicplus-sdlmixerx
|
2018-08-28 10:27:49 -04:00 |
|
mazmazz
|
9a5b8ec671
|
Merge branch 'musicplus-core' into musicplus-feature-postboss
|
2018-08-28 10:23:13 -04:00 |
|
mazmazz
|
75e6ad72ed
|
Fix MIDI looping/non-looping
|
2018-08-28 10:16:06 -04:00 |
|
mazmazz
|
0bea5729a7
|
Revise LUAh_MusicChange hook
|
2018-08-28 10:10:56 -04:00 |
|
mazmazz
|
9244a13721
|
Merge branch 'music-sdlmixerx' into musicplus-sdlmixerx
|
2018-08-27 08:40:36 -04:00 |
|
mazmazz
|
359a71c059
|
Move cvars to D_RegisterClientCommands for config recall
|
2018-08-27 08:40:24 -04:00 |
|
mazmazz
|
36d650c530
|
Remove MP3 warning for win32 Mixer X
|
2018-08-27 06:16:55 -04:00 |
|
mazmazz
|
b760fbe89b
|
Corrected unterminated #endif in sdl_sound
|
2018-08-27 06:15:01 -04:00 |
|
mazmazz
|
b701316505
|
Merge branch 'music-sdlmixerx' into musicplus-sdlmixerx
|
2018-08-27 05:59:55 -04:00 |
|
mazmazz
|
07ae007980
|
Remove unused methods (for now?)
|
2018-08-27 05:53:43 -04:00 |
|
mazmazz
|
9f6e913d43
|
Load Fluidsynth soundfont upon cvar change
|
2018-08-27 05:52:01 -04:00 |
|
mazmazz
|
878dc1af92
|
Lazy midi reload support on menu
|
2018-08-27 00:43:25 -04:00 |
|
mazmazz
|
535aed24bb
|
Advanced submenu for sound options
|
2018-08-26 23:58:43 -04:00 |
|
mazmazz
|
cc9d554dfd
|
Revert "Sound scroll menu attempt"
This reverts commit 7b11855041.
|
2018-08-26 23:46:55 -04:00 |
|
mazmazz
|
7b11855041
|
Sound scroll menu attempt
|
2018-08-26 23:46:20 -04:00 |
|
mazmazz
|
28545822ba
|
Checkpoint: Add FluidSynth and Timidity support
|
2018-08-26 23:03:38 -04:00 |
|
mazmazz
|
8ee27d3297
|
Makefile comments
|
2018-08-26 23:02:57 -04:00 |
|
mazmazz
|
59185f4ad1
|
New SDL Mixer X builds with FluidSynth and Timidity
|
2018-08-26 23:02:29 -04:00 |
|
Monster Iestyn
|
61836e1565
|
Merge branch 'master' into next
|
2018-08-26 21:10:41 +01:00 |
|
Monster Iestyn
|
c67767c580
|
Merge branch 'yo_screen_so_wide_y_is_invalid' into 'master'
Yo Screen So Wide y Is Invalid
See merge request STJr/SRB2!271
|
2018-08-26 16:07:06 -04:00 |
|
mazmazz
|
65e5794ee3
|
HAVE_MIXERX and NOMIXERX compile flags (win32 only)
|
2018-08-26 15:12:00 -04:00 |
|
mazmazz
|
73b4c4c5b4
|
Fix S_ChangeMusic newmusic -> mmusic, merge error
|
2018-08-26 14:22:14 -04:00 |
|
mazmazz
|
768ce1a46f
|
Make SDL Mixer X win32-exclusive
|
2018-08-26 14:20:41 -04:00 |
|
mazmazz
|
eafed06a29
|
New SDL2 test files
|
2018-08-26 14:12:11 -04:00 |
|
mazmazz
|
35fdcee071
|
Merge branch 'music-cleanup' into music-sdlmixerx
|
2018-08-26 14:04:54 -04:00 |
|
toaster
|
710550bb9d
|
Missed one!
|
2018-08-26 12:38:53 +01:00 |
|
mazmazz
|
0f42363a97
|
Fixed post-boss music change with mapmusname comparison
|
2018-08-25 22:19:15 -04:00 |
|
mazmazz
|
a7ae059949
|
Case-insensitive music_name comparison
|
2018-08-25 22:00:31 -04:00 |
|
mazmazz
|
c82a5de4b7
|
Merge branch 'musicplus-core' into musicplus-feature-postboss
|
2018-08-25 21:55:49 -04:00 |
|
mazmazz
|
9f3549e5e1
|
Remove tolower music_name, because we do case-insensitive matching now
|
2018-08-25 21:53:22 -04:00 |
|
mazmazz
|
01c6dbed5c
|
Case-insensitive music matching
|
2018-08-25 21:50:56 -04:00 |
|
mazmazz
|
48b6255e93
|
Case-insensitive music_name comparison
|
2018-08-25 21:42:39 -04:00 |
|
mazmazz
|
083de09f88
|
Load mapmus vars post-boss even if another tune is playing, like a jingle
|
2018-08-25 17:42:46 -04:00 |
|
Monster Iestyn
|
d5ab3e75a5
|
Merge branch 'v_video_killed_the_r_radio_star' into 'master'
v_video Killed The r_radio Star
See merge request STJr/SRB2!270
|
2018-08-25 16:43:25 -04:00 |
|
Monster Iestyn
|
ed5bed4d2c
|
Merge branch 'zalloc_potter_and_the_death-free_hallows' into 'master'
Zalloc Potter and the Death-Free Hallows
See merge request STJr/SRB2!269
|
2018-08-25 16:43:14 -04:00 |
|
Monster Iestyn
|
0b8c231989
|
Merge branch 'lighting_fixes_plane_n_simple' into 'master'
Lighting fixes? Plane and simple!
See merge request STJr/SRB2!268
|
2018-08-25 16:43:00 -04:00 |
|
mazmazz
|
7d882c482f
|
UINT32 muspostbosspos fix
|
2018-08-25 16:28:56 -04:00 |
|
mazmazz
|
4dd6b733d6
|
MUSICPOSITION -> MUSICPOS
* Added muspos level header var to lua
# Conflicts:
# src/dehacked.c
# src/lua_maplib.c
# src/p_setup.c
|
2018-08-25 16:23:01 -04:00 |
|
mazmazz
|
493bc86b08
|
MUSICPOSITION -> MUSICPOS
* Added muspos level header var to lua
|
2018-08-25 16:21:34 -04:00 |
|
mazmazz
|
ed8288a028
|
MUSICPOSTBOSSPOSITION -> MUSICPOSTBOSSPOS
|
2018-08-25 16:18:09 -04:00 |
|
toaster
|
85474e33dd
|
Introduce a temporary measure to enable the old stuff, minus one of the most obviously terrible bugbears of yesteryear. Let it be known that any downstream poirt will almost certainly toggle this ASAP.
|
2018-08-25 21:17:34 +01:00 |
|