toaster
|
a76668f55a
|
Revert "Merge branch 'musicplus-aug2019-b' into 'master'"
This reverts commit 0f89fb123f, reversing
changes made to 8fb211d8cf.
|
2019-08-04 11:32:55 +01:00 |
|
toaster
|
d880a02fa1
|
Revert "Fix MIDI Soundfont code shadowing a global variable."
This reverts commit 8a1b36322d.
|
2019-08-04 11:28:04 +01:00 |
|
MascaraSnake
|
f8e4a2431a
|
Merge branch 'gcc7_corrections_aug2019' into 'master'
ACTUALLY fix for gcc7
See merge request STJr/SRB2Internal!280
|
2019-08-04 06:19:33 -04:00 |
|
toaster
|
8a1b36322d
|
Fix MIDI Soundfont code shadowing a global variable.
|
2019-08-04 10:28:10 +01:00 |
|
toaster
|
ec4b68888f
|
Fix inadvertent fallthrough and associated whitespace.
|
2019-08-04 10:27:36 +01:00 |
|
toaster
|
c1af18cf66
|
Fix HWR_DrawConsoleFill.
|
2019-08-04 10:27:09 +01:00 |
|
Digiku
|
0f89fb123f
|
Merge branch 'musicplus-aug2019-b' into 'master'
MusicPlus August 2019 merge
Closes #6
See merge request STJr/SRB2Internal!279
|
2019-08-04 03:33:05 -04:00 |
|
mazmazz
|
8a637168f4
|
Merge branch 'musicplus-feature-postboss' into musicplus-aug2019-b
|
2019-08-04 03:22:36 -04:00 |
|
Digiku
|
8fb211d8cf
|
Merge branch 'gcc7-fixes-aug2019' into 'master'
gcc7 compile fixes (Fall through; spr2 var comparison)
See merge request STJr/SRB2Internal!277
|
2019-08-04 03:19:25 -04:00 |
|
mazmazz
|
7ef6ffbf42
|
Merge branch 'musicplus-sdlmixerx' into musicplus-aug2019
|
2019-08-04 02:52:33 -04:00 |
|
mazmazz
|
12e86aaa44
|
Merge branch 'internal-musicplus-jingle' into musicplus-aug2019
|
2019-08-04 02:41:37 -04:00 |
|
mazmazz
|
16cc42166b
|
Merge branch 'musicplus-sdlmixerx' into musicplus-aug2019
|
2019-08-04 02:40:53 -04:00 |
|
mazmazz
|
753ea04fe3
|
Mixer X menu touchup
|
2019-08-04 02:30:34 -04:00 |
|
mazmazz
|
cc31ab232d
|
Revert djgppdos fade function inadvertent merge
|
2019-08-04 02:09:35 -04:00 |
|
mazmazz
|
7b0b6c5dc1
|
Revert MUSSERV code removal from S_LoadMusic
(but we'll probably purge it later, anyway...)
|
2019-08-04 02:04:02 -04:00 |
|
mazmazz
|
e100a04f71
|
Fix HWR_DrawConsoleFill call extra input
|
2019-08-04 01:33:15 -04:00 |
|
mazmazz
|
51d80dcea0
|
Fix HWR_DrawConsoleFill call extra input
|
2019-08-04 01:33:06 -04:00 |
|
mazmazz
|
336f54e90c
|
Merge branch 'gcc7-fixes-aug2019' into musicplus-sdlmixerx
|
2019-08-04 01:10:34 -04:00 |
|
mazmazz
|
8ab76b50c6
|
Merge remote-tracking branch 'origin/master' into musicplus-sdlmixerx
|
2019-08-04 01:10:21 -04:00 |
|
mazmazz
|
ffa9475c54
|
Slight refactor for jingle resume lapse time
|
2019-08-04 00:59:32 -04:00 |
|
mazmazz
|
d0eb838583
|
Jingle resume: Don't set music position when music is replaced
|
2019-08-04 00:56:17 -04:00 |
|
mazmazz
|
05008f5dff
|
Fix 1up intermission jingle not playing
|
2019-08-04 00:15:31 -04:00 |
|
mazmazz
|
efccaf3dc4
|
Fix HWR_DrawConsoleFill call extra input
|
2019-08-04 00:15:15 -04:00 |
|
mazmazz
|
dd37b9fa0a
|
Merge branch 'gcc7-fixes-aug2019' into internal-musicplus-jingle
|
2019-08-03 23:44:06 -04:00 |
|
mazmazz
|
ae05d8c0dd
|
Merge remote-tracking branch 'origin/master' into internal-musicplus-jingle
|
2019-08-03 23:38:49 -04:00 |
|
mazmazz
|
ae1632b7bf
|
gcc7 compile fixes (Fall through; spr2 var comparison)
|
2019-08-03 23:01:10 -04:00 |
|
mazmazz
|
3684095619
|
gcc7 compile fixes (Fall through; spr2 var comparison)
|
2019-08-03 23:00:21 -04:00 |
|
mazmazz
|
d83bee2bad
|
Merge remote-tracking branch 'origin/master' into musicplus-feature-dying-fp
|
2019-08-03 22:49:20 -04:00 |
|
mazmazz
|
0abb038938
|
Fix titlemap music bug
|
2019-08-03 22:49:12 -04:00 |
|
mazmazz
|
eee3eaee57
|
Fix titlemap music bug
|
2019-08-03 22:48:40 -04:00 |
|
mazmazz
|
5fa27c57e0
|
Merge branch 'master' into musicplus-feature-dying-fp
|
2019-08-03 22:22:39 -04:00 |
|
toaster
|
dec517f224
|
Merge branch 'ending' into 'master'
ENDINGS
See merge request STJr/SRB2Internal!264
|
2019-08-03 16:23:51 -04:00 |
|
toaster
|
c841193acc
|
Merge branch 'bossenable' into 'master'
Boss enable linedef (type 449)
See merge request STJr/SRB2Internal!272
|
2019-08-03 16:23:22 -04:00 |
|
toaster
|
618d0844e4
|
Merge branch 'snaptoground-fix' into 'master'
Snap to ground fix
Closes #165
See merge request STJr/SRB2Internal!274
|
2019-08-03 16:22:47 -04:00 |
|
toaster
|
9386a36fac
|
Merge branch 'mpspec_cleanup' into 'master'
MP/Old Special Stage ring stuff
See merge request STJr/SRB2Internal!276
|
2019-08-03 16:22:23 -04:00 |
|
toaster
|
e7faa83e23
|
Merge branch 'linedef-award-rings' into 'master'
New award rings linedef executor
See merge request STJr/SRB2Internal!263
|
2019-08-03 16:21:58 -04:00 |
|
Monster Iestyn
|
eb477ee784
|
Remove commented out P_CheckSector calls and add extra comments explaining the situation
|
2019-08-03 19:06:45 +01:00 |
|
Monster Iestyn
|
2106263988
|
Merge branch 'master' into snaptoground-fix
|
2019-08-03 18:23:09 +01:00 |
|
Monster Iestyn
|
d7f00f95d9
|
Merge branch 'speciallosesound' into 'master'
Fix old Special Stage failure sounds not always playing
See merge request STJr/SRB2Internal!275
|
2019-08-03 13:18:40 -04:00 |
|
Monster Iestyn
|
dab52b522b
|
Merge branch 'titlemaplua' into 'master'
Titlemap Lua
See merge request STJr/SRB2Internal!270
|
2019-08-03 13:14:46 -04:00 |
|
toaster
|
211fd5be56
|
Fix the minor issues since steel's busy
|
2019-08-03 08:04:02 -04:00 |
|
toaster
|
06a7d0d8d2
|
Add a condition to bail on the HUD's ring counting down calculation if nummaprings is 0 or -1.
|
2019-08-03 12:25:46 +01:00 |
|
toaster
|
3d0eece7fc
|
MI made a good argument for bossdisabled not being conditional on fromnetsave.
|
2019-08-03 12:09:18 +01:00 |
|
toaster
|
cd4a16dd62
|
Have the ring bonus in MP Special Stages be based on the shared sum of all players'.
|
2019-08-02 23:56:25 +01:00 |
|
toaster
|
293c5dacf5
|
Add rings to old/MP special stage HUD + make both them and spheres (in old special stage only) count down rather than up, to match s3k
|
2019-08-02 23:51:22 +01:00 |
|
toaster
|
a5eccac199
|
Perfect bonus support for non-NiGHTS special stages
|
2019-08-02 22:52:53 +01:00 |
|
toaster
|
27f012740b
|
Fix old Special Stage failure sounds not always playing.
|
2019-08-02 20:02:55 +01:00 |
|
Monster Iestyn
|
cbd408278f
|
Merge branch 'bustables_misc' into 'master'
Bustables and landing events
Closes #157 and #162
See merge request STJr/SRB2Internal!262
|
2019-08-02 13:16:53 -04:00 |
|
Monster Iestyn
|
6456bda2d5
|
Merge branch 'anglestuff' into 'master'
Spring angles and ring angles
See merge request STJr/SRB2Internal!266
|
2019-08-02 13:10:23 -04:00 |
|
Monster Iestyn
|
7af04015a2
|
Merge branch 'emeraldfixes' into 'master'
Special stage related fixes
See merge request STJr/SRB2Internal!269
|
2019-08-02 13:08:20 -04:00 |
|