57f756ddf1
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
d9129db5ed
Add scroll-wheel weapon changing to default controls
...
(resolves #248 )
2019-10-13 15:19:31 +01:00
e62d097265
Fix "requested skin not found!" print happening whenever you select an unlockable character.
...
Also, since I'm less paranoid now - readd the skin number to its print.
2019-10-13 15:10:19 +01:00
636760760f
Fix for A_ConnectToGround on gravflipped objects, courtesy of toaster.
2019-10-13 14:41:17 +02:00
0350262a0f
On the recommendation of Sryder, revert everything relating to the `cpusleep` changes except for the new default value of 1.
2019-10-13 13:12:07 +01:00
6033f70b01
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into kartport_bugfixes
2019-10-13 12:18:00 +01:00
4b965fe43b
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
9ca227237a
Better cpusleep command. Sal said it better than I can, so in her words:
...
* Default to 1, which means potential for a 1-frame loss every once in a while but no longer a complete cpu hog
* New minimum is 0, since -1 just did the exact same thing as 0 except slightly more optimized.
2019-10-13 12:05:12 +01:00
5502242e8b
MD2 crash fix.
2019-10-13 11:59:38 +01:00
008f576560
Revert stupid 2.1-compat fuckup I did in slopes code.
2019-10-13 11:55:50 +01:00
a550eb79d3
Additional crash fix for papersprites.
2019-10-13 11:53:53 +01:00
a03ecac921
Merge branch 'openglskydome2' into 'master'
...
OpenGL sky dome
See merge request STJr/SRB2Internal!350
2019-10-12 11:06:47 -04:00
a7c0fe9672
Merge branch 'openmpt-crash-fix' into 'master'
...
libopenmpt related changes
See merge request STJr/SRB2Internal!351
2019-10-12 11:02:45 -04:00
71f93e7071
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
6fab3d28b2
Merge branch 'OGL_regressions' into 'master'
...
Correct minor OGL regressions
See merge request STJr/SRB2Internal!361
2019-10-12 09:53:20 -04:00
8af715eb36
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
d401862714
Merge branch 'amytweaks' into 'master'
...
Amy tweaks
See merge request STJr/SRB2Internal!366
2019-10-12 09:52:44 -04:00
a2a5983256
Prevent Time Attack level handler always beeping.
2019-10-12 09:42:03 -04:00
d735e1b9c2
Merge branch 'rvz-hardcode' into 'master'
...
RVZ hardcode
Closes #178
See merge request STJr/SRB2Internal!357
2019-10-12 09:37:23 -04:00
68a82c3849
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
15bba9e1b0
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
0f562d27d7
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
3600e1b140
Allow rollout rock's splash sound delay reduction to occur above water
2019-10-12 04:41:50 +08:00
a01373741b
Don't spam splash sounds on the rollout rock
2019-10-12 04:35:51 +08:00
68599ccc63
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
1560453797
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
354429ca39
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
7fedde9811
Merge branch 'promiscuousplanes' into 'master'
...
Headbumps and associated
Closes #242
See merge request STJr/SRB2Internal!360
2019-10-10 02:36:10 -04:00
c17a3227a0
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
a138c0ebf2
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
7ceef506fc
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
b2529136e0
Reduce speed sneaker's top speed factor to 1.67x
2019-10-09 21:39:51 +08:00
d553b6a011
Add sounds to rollout rock in lava
2019-10-09 15:06:50 +08:00
82fcdf4d43
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
43e13b38c9
Change one of the Pyrefly captions.
2019-10-08 19:45:43 +01:00
1155a7c3a0
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
4870107974
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
bc794a2227
Players can jostle free from Pterabytes
2019-10-08 00:00:41 +02:00
788415a4db
Don't apply autobrake to Pterabyte-carried players
2019-10-07 22:33:06 +02:00
0fceb66e71
Make the Pyrefly glowing and damaging in its fire-spawning state
2019-10-07 22:23:52 +02:00
ce5d0691ac
Merge branch 'rvz-hardcode' of git.magicalgirl.moe:STJr/SRB2Internal into rvz-hardcode
2019-10-07 19:12:03 +02:00
8062422f13
Fixed wrong sound being played by Pyreflies with Ambush
2019-10-07 19:11:36 +02:00
3412eb655a
Colorize non-buoyant rollout rocks (MF2_AMBUSH distinguishability)
2019-10-07 22:51:13 +08:00
77dd5260ab
Allow rock to disappear if unridden for 12 seconds
2019-10-07 22:22:51 +08:00
46a1d6897c
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
c64997bfe5
Add Ambush and Flip flag behaviors
2019-10-07 20:55:58 +08:00
d84564d9f2
Change the time NiGHTS bumpers aren't responded to to 5 tics rather than 9.
2019-10-07 13:08:49 +01:00
95f6e2008f
Better rollout behavior in lava
2019-10-07 15:25:32 +08:00
2113774a6a
Don't deplete special stage timer in water if you have water protection
2019-10-07 09:01:17 +02:00
bfb9bac5bd
Collision polish
2019-10-07 14:51:32 +08:00
toaster