Commit graph

7184 commits

Author SHA1 Message Date
MascaraSnake
ce72421d35 Make shatter blocks solid 2019-10-13 23:08:54 +02:00
MascaraSnake
b9b43dffcb Merge branch 'anotherctgfix' into 'master'
Fix reverse gravity cacti (and all other A_ConnectToGround stuffs)

See merge request STJr/SRB2Internal!378
2019-10-13 13:27:24 -04:00
toaster
940785a665 Fix reverse gravity cacti (and all other A_ConnectToGround stuffs). 2019-10-13 17:48:40 +01:00
MascaraSnake
4c8a9efc00 Merge branch 'nightsangle' into 'master'
Fixed NiGHTS spawnpoint angle camera jump fuckups

See merge request STJr/SRB2Internal!376
2019-10-13 12:47:32 -04:00
MascaraSnake
c84a538c85 Merge branch 'hidegrade' into 'master'
Hide NiGHTS grade in singleplayer if ranking is below GRADE_A

Closes #250

See merge request STJr/SRB2Internal!377
2019-10-13 12:47:11 -04:00
toaster
ce85daeaca Hide NiGHTS grade in singleplayer if ranking is below GRADE_A, on Rob's request.
(Resolves #250)
2019-10-13 16:30:29 +01:00
toaster
d501ff895e Fixed NiGHTS spawnpoint angle camera jump fuckups. 2019-10-13 16:15:46 +01:00
MascaraSnake
9f07b50098 Merge branch 'lenient_acz3' into 'master'
Make ACZ3 Boss damage while bouncing more lenient

See merge request STJr/SRB2Internal!375
2019-10-13 11:08:26 -04:00
MascaraSnake
925eb63632 Merge branch 'scrollwep' into 'master'
Add scroll-wheel weapon changing to default controls

Closes #248

See merge request STJr/SRB2Internal!374
2019-10-13 11:08:13 -04:00
MascaraSnake
ea6b6be758 Merge branch 'bogus_requestskin' into 'master'
Fix bogus "requested skin not found!" print

Closes #247

See merge request STJr/SRB2Internal!373
2019-10-13 11:07:59 -04:00
MascaraSnake
c885f3a3d2 Merge branch 'connect-to-ground-fix' into 'master'
Fix for A_ConnectToGround on gravflipped objects

See merge request STJr/SRB2Internal!372
2019-10-13 11:07:46 -04:00
MascaraSnake
a2208bc513 Merge branch 'kartport_bugfixes' into 'master'
Kart-port bugfixes (round 1)

See merge request STJr/SRB2Internal!371
2019-10-13 11:07:24 -04:00
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
8f7a13137b Add scroll-wheel weapon changing to default controls
(resolves #248)
2019-10-13 15:19:31 +01:00
toaster
176ee4499f 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
sphere
f585b7c896 Fix for A_ConnectToGround on gravflipped objects, courtesy of toaster. 2019-10-13 14:41:17 +02:00
toaster
fd1a880805 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
toaster
ac0ca69456 Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into kartport_bugfixes 2019-10-13 12:18:00 +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
toaster
6a045930fa 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
toaster
4a7ed2d9ec MD2 crash fix. 2019-10-13 11:59:38 +01:00
toaster
9cf3bd2e74 Revert stupid 2.1-compat fuckup I did in slopes code. 2019-10-13 11:55:50 +01:00
toaster
cead718d81 Additional crash fix for papersprites. 2019-10-13 11:53:53 +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