mazmazz
|
8dc29fb5d2
|
Merge branch 'musicplus-sdlmixerx' into musicplus-aug2019
|
2019-08-04 02:40:53 -04:00 |
|
mazmazz
|
fd4d3a6a69
|
Mixer X menu touchup
|
2019-08-04 02:30:34 -04:00 |
|
mazmazz
|
fbaf5106fd
|
Revert djgppdos fade function inadvertent merge
|
2019-08-04 02:09:35 -04:00 |
|
mazmazz
|
91265379df
|
Revert MUSSERV code removal from S_LoadMusic
(but we'll probably purge it later, anyway...)
|
2019-08-04 02:04:02 -04:00 |
|
mazmazz
|
d4f6a145f1
|
Fix HWR_DrawConsoleFill call extra input
|
2019-08-04 01:33:15 -04:00 |
|
mazmazz
|
6f50faf161
|
Fix HWR_DrawConsoleFill call extra input
|
2019-08-04 01:33:06 -04:00 |
|
mazmazz
|
d373b101fc
|
Merge branch 'gcc7-fixes-aug2019' into musicplus-sdlmixerx
|
2019-08-04 01:10:34 -04:00 |
|
mazmazz
|
b99f06c0c9
|
Merge remote-tracking branch 'origin/master' into musicplus-sdlmixerx
|
2019-08-04 01:10:21 -04:00 |
|
mazmazz
|
353fefbd42
|
Slight refactor for jingle resume lapse time
|
2019-08-04 00:59:32 -04:00 |
|
mazmazz
|
81d0840301
|
Jingle resume: Don't set music position when music is replaced
|
2019-08-04 00:56:17 -04:00 |
|
mazmazz
|
da55b4b82a
|
Fix 1up intermission jingle not playing
|
2019-08-04 00:15:31 -04:00 |
|
mazmazz
|
6ecc062c6a
|
Fix HWR_DrawConsoleFill call extra input
|
2019-08-04 00:15:15 -04:00 |
|
mazmazz
|
8a41b530b3
|
Merge branch 'gcc7-fixes-aug2019' into internal-musicplus-jingle
|
2019-08-03 23:44:06 -04:00 |
|
mazmazz
|
dd9efebab5
|
Merge remote-tracking branch 'origin/master' into internal-musicplus-jingle
|
2019-08-03 23:38:49 -04:00 |
|
mazmazz
|
5b284c8170
|
gcc7 compile fixes (Fall through; spr2 var comparison)
|
2019-08-03 23:01:10 -04:00 |
|
mazmazz
|
07d1363da9
|
gcc7 compile fixes (Fall through; spr2 var comparison)
|
2019-08-03 23:00:21 -04:00 |
|
mazmazz
|
5f2a45befd
|
Merge remote-tracking branch 'origin/master' into musicplus-feature-dying-fp
|
2019-08-03 22:49:20 -04:00 |
|
mazmazz
|
a9b66109fc
|
Fix titlemap music bug
|
2019-08-03 22:49:12 -04:00 |
|
mazmazz
|
efc8e42083
|
Fix titlemap music bug
|
2019-08-03 22:48:40 -04:00 |
|
mazmazz
|
1b59b224c0
|
Merge branch 'master' into musicplus-feature-dying-fp
|
2019-08-03 22:22:39 -04:00 |
|
Steel Titanium
|
00b73e2209
|
Stuff
|
2019-08-03 21:21:01 -04:00 |
|
Steel Titanium
|
7a1b1edbf1
|
Merge branch 'master' into newmenus
|
2019-08-03 18:59:21 -04:00 |
|
Steel Titanium
|
00c3329ba9
|
Ring sparkle mirroring
|
2019-08-03 18:28:53 -04:00 |
|
Steel Titanium
|
26689e168e
|
Merge branch 'master' of git.magicalgirl.moe:STJr/SRB2Internal into ringsparkle
|
2019-08-03 17:33:28 -04:00 |
|
Steel Titanium
|
9ea7a6dfca
|
Work on menus
|
2019-08-03 17:30:51 -04:00 |
|
toaster
|
8a0f1e7ed4
|
Merge branch 'ending' into 'master'
ENDINGS
See merge request STJr/SRB2Internal!264
|
2019-08-03 16:23:51 -04:00 |
|
toaster
|
9f34a7aa82
|
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
|
97072d9faa
|
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
|
5ef190fc69
|
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
|
8f729c33d3
|
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
|
f9037509a1
|
Remove commented out P_CheckSector calls and add extra comments explaining the situation
|
2019-08-03 19:06:45 +01:00 |
|
Monster Iestyn
|
dff544404d
|
Merge branch 'master' into snaptoground-fix
|
2019-08-03 18:23:09 +01:00 |
|
Monster Iestyn
|
38ecd00ac9
|
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
|
c82c2ee815
|
Merge branch 'titlemaplua' into 'master'
Titlemap Lua
See merge request STJr/SRB2Internal!270
|
2019-08-03 13:14:46 -04:00 |
|
toaster
|
f3baac8577
|
Fix the minor issues since steel's busy
|
2019-08-03 08:04:02 -04:00 |
|
toaster
|
544a160fc3
|
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
|
105df2395d
|
MI made a good argument for bossdisabled not being conditional on fromnetsave.
|
2019-08-03 12:09:18 +01:00 |
|
toaster
|
876f87e793
|
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
|
16c541ef1b
|
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
|
c4f0fdb783
|
Perfect bonus support for non-NiGHTS special stages
|
2019-08-02 22:52:53 +01:00 |
|
toaster
|
8d56133425
|
Fix old Special Stage failure sounds not always playing.
|
2019-08-02 20:02:55 +01:00 |
|
Monster Iestyn
|
af38c0e227
|
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
|
94c1873b8c
|
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
|
8520243ab6
|
Merge branch 'emeraldfixes' into 'master'
Special stage related fixes
See merge request STJr/SRB2Internal!269
|
2019-08-02 13:08:20 -04:00 |
|
Monster Iestyn
|
146271e49d
|
Merge branch 'maniaspheresfix' into 'master'
MANIASPHERES de-hardcode
See merge request STJr/SRB2Internal!268
|
2019-08-02 13:06:52 -04:00 |
|
Monster Iestyn
|
ee64d98e39
|
Merge branch 'spring-things' into 'master'
Additional spring flags
See merge request STJr/SRB2Internal!256
|
2019-08-02 13:06:38 -04:00 |
|
Monster Iestyn
|
2503c2f392
|
Merge branch 'followmobj_scale' into 'master'
Smiles tail scale
See merge request STJr/SRB2Internal!273
|
2019-08-02 13:05:50 -04:00 |
|
Monster Iestyn
|
aab3a029f2
|
Merge branch 'diagonalrings' into 'master'
Diagonal spring ring fixes
See merge request STJr/SRB2Internal!267
|
2019-08-02 13:03:11 -04:00 |
|
Monster Iestyn
|
42a36de459
|
Modify P_CheckSector with a modified version of Sal's attempted proper fix for polyobjects crushing, so that we only need to check the polyobject's control sector directly in the waypoints code.
This time I've definitely fixed that teleport to ground issue I'm pretty sure, I don't get it in my tests at least.
|
2019-08-02 16:51:44 +01:00 |
|
sphere
|
d2c3b88020
|
Merge remote-tracking branch 'origin/master' into spring-things
|
2019-08-02 15:11:13 +02:00 |
|