Commit graph

7163 commits

Author SHA1 Message Date
toaster
a07b747d9c Fix condition which was MEANT to allow attacking Fangboss from the side while bouncing, but instead made it extremely difficult to pull off. 2019-10-13 15:30:51 +01:00
toaster
ce4f322af7 Mixed declaration + out-of-bounds GCC error fixes for OpenMPT fixes (can't believe I didn't catch the former earlier) 2019-10-13 12:17:24 +01:00
MascaraSnake
7e27bcb915 Merge branch 'openglskydome2' into 'master'
OpenGL sky dome

See merge request STJr/SRB2Internal!350
2019-10-12 11:06:47 -04:00
MascaraSnake
b4e826a047 Merge branch 'openmpt-crash-fix' into 'master'
libopenmpt related changes

See merge request STJr/SRB2Internal!351
2019-10-12 11:02:45 -04:00
MascaraSnake
399500e9bf Merge branch 'sneakers-reduction' into 'master'
Reduce speed sneaker factor to 1.67x

See merge request STJr/SRB2Internal!368
2019-10-12 11:00:24 -04:00
MascaraSnake
4f7026d169 Merge branch 'OGL_regressions' into 'master'
Correct minor OGL regressions

See merge request STJr/SRB2Internal!361
2019-10-12 09:53:20 -04:00
MascaraSnake
03f60e972a Merge branch 'left-right-ra-level-select' into 'master'
Left and Right Arrow keys also select level in Record Attack

See merge request STJr/SRB2Internal!363
2019-10-12 09:53:05 -04:00
MascaraSnake
269e5251ab Merge branch 'amytweaks' into 'master'
Amy tweaks

See merge request STJr/SRB2Internal!366
2019-10-12 09:52:44 -04:00
toaster
a99fb74d4a Prevent Time Attack level handler always beeping. 2019-10-12 09:42:03 -04:00
MascaraSnake
ced4a91eba Merge branch 'rvz-hardcode' into 'master'
RVZ hardcode

Closes #178

See merge request STJr/SRB2Internal!357
2019-10-12 09:37:23 -04:00
MascaraSnake
acb34f6290 Merge branch 'amycameo' into 'master'
Amy for Frozen Hillside (full pitch in description)

See merge request STJr/SRB2Internal!356
2019-10-12 07:16:26 -04:00
MascaraSnake
aac5d42116 Merge branch 'hoop_drawdist' into 'master'
Only apply NiGHTS draw distance to hoops

See merge request STJr/SRB2Internal!370
2019-10-12 03:10:53 -04:00
MascaraSnake
bf6513a209 Merge branch 'fastgoop' into 'master'
Increased THZ goop speed by 25%

Closes #229

See merge request STJr/SRB2Internal!367
2019-10-12 03:10:26 -04:00
lachwright
9a6877715b Allow rollout rock's splash sound delay reduction to occur above water 2019-10-12 04:41:50 +08:00
lachwright
561389dd9f Don't spam splash sounds on the rollout rock 2019-10-12 04:35:51 +08:00
MascaraSnake
86a77b4886 Only apply NiGHTS draw distance to hoops, because it turns out they're pretty much the sole cause of NiGHTS lag 2019-10-11 21:02:11 +02:00
toaster
e9867c4bd7 Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into rvz-hardcode
# Conflicts:
#	src/p_map.c
2019-10-10 17:51:29 +01:00
MascaraSnake
0ed9f1e602 Merge branch 'intro-sky-fix' into 'master'
Fix the sky on the intro cutscene not scrolling.

Closes #220

See merge request STJr/SRB2Internal!353
2019-10-10 02:36:53 -04:00
MascaraSnake
fe5c1a9ca5 Merge branch 'promiscuousplanes' into 'master'
Headbumps and associated

Closes #242

See merge request STJr/SRB2Internal!360
2019-10-10 02:36:10 -04:00
MascaraSnake
68edb0e8fa Merge branch 'bumperstuff' into 'master'
Change the time NiGHTS bumpers aren't responded to to 5 tics rather than 9.

Closes #246

See merge request STJr/SRB2Internal!365
2019-10-10 02:35:33 -04:00
MascaraSnake
ab31cc01b4 Merge branch 'acz_touchups' into 'master'
ACZ touchups

Closes #209, #208, and #158

See merge request STJr/SRB2Internal!359
2019-10-10 02:34:46 -04:00
MascaraSnake
a85b17df98 Merge branch 'specialstage_water' into 'master'
Don't deplete special stage timer in water if you have water protection

See merge request STJr/SRB2Internal!364
2019-10-10 02:33:05 -04:00
lachwright
3e4b3d6107 Reduce speed sneaker's top speed factor to 1.67x 2019-10-09 21:39:51 +08:00
lachwright
a3ecd3836e Add sounds to rollout rock in lava 2019-10-09 15:06:50 +08:00
lachwright
54699398a0 Make MT_PUMA not hurt players' ears when placed in groups or loading the map (new functionality for A_PlaySound) 2019-10-09 14:24:27 +08:00
toaster
10136232e2 Change one of the Pyrefly captions. 2019-10-08 19:45:43 +01:00
toaster
ed304a5b19 Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into rvz-hardcode
# Conflicts:
#	src/p_mobj.c
2019-10-08 19:43:43 +01:00
toaster
b81ff754f0 Increased THZ goop speed by 25%, per Cobalt's script. (Hardcoding it was way more difficult than it looked, I'm rusty at my maths :V ) 2019-10-08 16:38:53 +01:00
MascaraSnake
00ac7095d1 Players can jostle free from Pterabytes 2019-10-08 00:00:41 +02:00
MascaraSnake
b055dea4ba Don't apply autobrake to Pterabyte-carried players 2019-10-07 22:33:06 +02:00
MascaraSnake
88b377c306 Make the Pyrefly glowing and damaging in its fire-spawning state 2019-10-07 22:23:52 +02:00
MascaraSnake
1d90472835 Merge branch 'rvz-hardcode' of git.magicalgirl.moe:STJr/SRB2Internal into rvz-hardcode 2019-10-07 19:12:03 +02:00
MascaraSnake
a711960d3b Fixed wrong sound being played by Pyreflies with Ambush 2019-10-07 19:11:36 +02:00
lachwright
e8aea6da8a Colorize non-buoyant rollout rocks (MF2_AMBUSH distinguishability) 2019-10-07 22:51:13 +08:00
lachwright
90b867bf22 Allow rock to disappear if unridden for 12 seconds 2019-10-07 22:22:51 +08:00
toaster
f1119579be Address checkbox 1 and 2 of #235.
* If using twinspin and have melee ability too, go into melee landing when hitting the ground.
* Only have melee go directly forward if standing/idle, otherwise use drawangle.
2019-10-07 15:03:28 +01:00
lachwright
b04180e5bf Add Ambush and Flip flag behaviors 2019-10-07 20:55:58 +08:00
toaster
0ace4a2a3f Change the time NiGHTS bumpers aren't responded to to 5 tics rather than 9. 2019-10-07 13:08:49 +01:00
lachwright
2d4b2a66d0 Better rollout behavior in lava 2019-10-07 15:25:32 +08:00
MascaraSnake
5b8b17ecf4 Don't deplete special stage timer in water if you have water protection 2019-10-07 09:01:17 +02:00
lachwright
4780898619 Collision polish 2019-10-07 14:51:32 +08:00
MascaraSnake
4476c8140f Fixed a typo 2019-10-07 08:36:40 +02:00
lachwright
7bdc29b13a Readability changes 2019-10-07 13:36:36 +08:00
lachwright
4b96eeb578 Readability changes 2019-10-07 13:35:10 +08:00
lachwright
7c50193dcb Let ridden rollout rocks collide with other players 2019-10-07 13:14:23 +08:00
James R
595d0c80c7 A-arrows on Record Attack level select
Menu code sucks, did you know?
2019-10-06 14:45:42 -07:00
James R
233ea2d07a Key handler to allow selecting map by arrow keys in Record Attack
Enter still goes to the platter.
2019-10-06 14:11:16 -07:00
MascaraSnake
62b244148a Fixed solid objects (such as Minus-carried TNT barrels) not colliding with players.
Springs and gas jets are exempt because all hell might break loose otherwise.
2019-10-06 19:53:54 +02:00
toaster
7f085863e2 * Add rudimentary support for MF2_LINKDRAW in GL.
* Allow MF_ENEMY objects to flash, just as they do in Software.
2019-10-06 16:31:13 +01:00
toaster
70c0763840 Good catch by MS. 2019-10-06 16:17:11 +01:00