lifning
/
SRB2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
6,707 Commits 1 Branch 29 Tags 122 MiB
Commit Graph

6707 Commits

Author SHA1 Message Date
Monster Iestyn 17e53ee27b Edit a lot of the rest of the polyobject-related code in P_LineOpening to make more sense and be more optimised. 
* If you collide with a line belonging to a polyobject, you should NEVER have to care about any FOFs that might be present in either sector of the linedef. This could lead to colliding with ghostly FOFs that aren't actually there or something dumb, if someone decided to give either of the polyobject's control sectors FOFs for some reason. We don't want that, obviously.
* Polyobjects without POF_CLIPPLANE apparently are supposed to have a top and bottom "physical" height of value INT32_MAX and _MIN respectively, according to P_CheckPosition ...let's be consistent with this.
* Finally, there is no more need for that back = front nonsense hack anymore with my changes made.
 2019-08-08 16:37:09 +01:00
Monster Iestyn a8b7ecab4d P_LineOpening: set int32 max/min as defaults for opentop, openbottom etc if a linedef you touched belongs to a polyobjetc. the only thing that really matters in this scenario is the polyobject itself after all! 
(This is an untested fix for VAda's apparent collision with thin air below a polyobject in ACZ2 in beta 5)
 2019-08-07 23:27:26 +01:00
MascaraSnake 506093acbb Merge branch 'fang-fixes' into 'master' 
Fang fixes

Closes #154 and #140

See merge request STJr/SRB2Internal!285
 2019-08-07 14:46:02 -04:00
MascaraSnake 3196fd225d Merge branch 'fixme' into 'master' 
Build fixes

See merge request STJr/SRB2Internal!287
 2019-08-07 14:45:41 -04:00
MascaraSnake 088f39adbd Merge branch 'musicplus-strtok' into 'master' 
Use strtok instead of strtok_r

See merge request STJr/SRB2Internal!286
 2019-08-07 14:34:25 -04:00
Alam Ed Arias b5279c34fa Fix compiling without MixerX support 2019-08-07 12:42:07 -04:00
Alam Ed Arias a6fe6ebcd3 Fix signed vs unsigned comapre 2019-08-07 12:41:22 -04:00
Alam Ed Arias cebc1d46f0 All C files should a newline at the end 2019-08-07 12:39:51 -04:00
Alam Ed Arias 4e78617c29 fix PARANOIA builds 2019-08-07 12:39:04 -04:00
mazmazz 688fdf35f9 Use strtok instead of strtok_r 2019-08-07 01:29:05 -04:00
MascaraSnake aac9592e31 Set Fang's minimum bounce strength to 1.5 times jump strength 2019-08-06 23:35:20 +02:00
MascaraSnake 842b503d90 Don't zero out momz when landing on slopes. 
This fixes Fang's bounce on slopes and doesn't seem to make a difference otherwise, but there's still a non-zero chance this broke something.
 2019-08-06 23:18:53 +02:00
toaster 3add792986 Fix spindashing on a moving surface causing you to change state to rolling instead of spindashing. 
(MI said I could commit to master since it was only a single line.)
 2019-08-04 19:11:58 +01:00
toaster b06af59907 Merge branch 'revert_revert_musicplus' into 'master' 
Revert "Revert MusicPlus"

See merge request STJr/SRB2Internal!282
 2019-08-04 13:58:01 -04:00
toaster 5585059f6b Merge branch 'ringsparkle' into 'master' 
New ring sparkles

See merge request STJr/SRB2Internal!271
 2019-08-04 11:46:40 -04:00
Steel Titanium 153ed82849 Last min changes 2019-08-04 11:34:55 -04:00
toaster af07412ac8 Merge branch 'statefix' into 'master' 
Quick state fixes

See merge request STJr/SRB2Internal!283
 2019-08-04 10:53:38 -04:00
toaster 1fbd3eff40 * Fix the thing where you "roll" in run/walk frames if you hold spin after jumping. 
* Fix the thing where you don't go through super transformation frames when starting NiGHTS.
 2019-08-04 15:25:13 +01:00
toaster 015abfc970 Revert "Revert "Fix MIDI Soundfont code shadowing a global variable."" 
This reverts commit 99dbcb9f65.
 2019-08-04 12:04:01 +01:00
toaster 384dc0674e Revert "Revert "Merge branch 'musicplus-aug2019-b' into 'master'"" 
This reverts commit 603d5805f7.
 2019-08-04 12:03:57 +01:00
MascaraSnake a302db2dc0 Merge branch 'revert_musicplus' into 'master' 
Revert musicplus (for now)

See merge request STJr/SRB2Internal!281
 2019-08-04 07:02:48 -04:00
toaster 603d5805f7 Revert "Merge branch 'musicplus-aug2019-b' into 'master'" 
This reverts commit 56bfdb7113, reversing
changes made to c29cfbef9b.
 2019-08-04 11:32:55 +01:00
toaster 99dbcb9f65 Revert "Fix MIDI Soundfont code shadowing a global variable." 
This reverts commit 3591e3d092.
 2019-08-04 11:28:04 +01:00
MascaraSnake 5cff567a34 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 3591e3d092 Fix MIDI Soundfont code shadowing a global variable. 2019-08-04 10:28:10 +01:00
toaster a87e1b8aa6 Fix inadvertent fallthrough and associated whitespace. 2019-08-04 10:27:36 +01:00
toaster 48e09d56bf Fix HWR_DrawConsoleFill. 2019-08-04 10:27:09 +01:00
Digiku 56bfdb7113 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 cdb7250da4 Merge branch 'musicplus-feature-postboss' into musicplus-aug2019-b 2019-08-04 03:22:36 -04:00
Digiku c29cfbef9b 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 ce39341c31 Merge branch 'musicplus-sdlmixerx' into musicplus-aug2019 2019-08-04 02:52:33 -04:00
mazmazz bddafbeece Merge branch 'internal-musicplus-jingle' into musicplus-aug2019 2019-08-04 02:41:37 -04:00
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