Commit graph

8112 commits

Author SHA1 Message Date
toaster
2aafcf9e5b Match final countdown timer to timer (resolves #400). 2019-11-29 20:35:59 +00:00
toaster
0c20a68c23 Make Cobalt-picked sound effect audible from far away, like the original. 2019-11-29 20:04:14 +00:00
toaster
9f92374fb6 Merge branch 'master' into spd 2019-11-29 19:19:55 +00:00
toaster
0f21a18159 Give the Robo-Hood a cute jump sound whenever it's fleeing you. 2019-11-29 19:18:05 +00:00
toaster
de3731de93 Prevent exit sectors having any effect whatsoever outside of platform gametypes (resolve #396). 2019-11-29 19:11:17 +00:00
toaster
d74991ded1 Don't flip P1 of a two-character save card, for aesthetique reasons. 2019-11-29 15:58:37 +00:00
toaster
76eae5c237 Fix screen buffer not being cleared if a map command is used during the intermission. 2019-11-29 15:25:55 +00:00
MascaraSnake
d6c7a08fb2 Merge branch 'endelinger' into 'master'
Endelinger (resolves #384).

Closes #384

See merge request STJr/SRB2Internal!569
2019-11-28 16:10:04 -05:00
MascaraSnake
4a5b746533 Merge branch 'sleepwalkin' into 'master'
Sleepwalkin (resolves most of #382)

Closes #382

See merge request STJr/SRB2Internal!567
2019-11-28 16:08:40 -05:00
James R
d73c709556 Holy shit 2019-11-28 12:10:57 -08:00
MascaraSnake
0e1da4e4b1 Merge branch 'campokes' into 'master'
Camera pokes (resolves #359, #363, and #383).

Closes #359, #363, and #383

See merge request STJr/SRB2Internal!566
2019-11-28 14:21:18 -05:00
toaster
3f5b91d11b Update ending cutscene(s) to linger for an additional two seconds, so that the music can properly fade out (resolves #384). 2019-11-28 19:11:12 +00:00
MascaraSnake
f5fdceb877 Merge branch 'mpspecfix2' into 'master'
Counting spheres (resolves #378).

Closes #378

See merge request STJr/SRB2Internal!564
2019-11-28 13:54:47 -05:00
LJ Sonic
4574fd52b5 Merge branch 'exit-move-fixes' into 'master'
Keep counting players as finished even after dying

See merge request STJr/SRB2Internal!568
2019-11-27 17:49:42 -05:00
Louis-Antoine
41a6cf5d26 Keep counting players as finished even after dying 2019-11-27 17:32:02 +01:00
toaster
4d4aca1082 Change required for Tails' tails to behave like falling sprite. 2019-11-27 13:54:13 +00:00
toaster
2c2169f3c3 Change SPR_NFLT default to superised SPR2_FALL (resolves code side of #382). 2019-11-27 13:47:38 +00:00
toaster
300159143a Fix camera not being flipped when camera is stopped due to game design hack reasons (resolves #383). 2019-11-27 13:37:03 +00:00
LJ Sonic
3eea61558e Merge branch 'exit-move-lj' into 'master'
No more drowning with exitmove now.

See merge request STJr/SRB2Internal!563
2019-11-27 08:17:22 -05:00
toaster
50ae50a2a5 Correct tutorialmode case doubling up on camerascale. 2019-11-27 12:54:00 +00:00
toaster
ff26826ca0 Make camerascale have no effect in 2D mode (resolves #359 and resolves #363). 2019-11-27 12:31:23 +00:00
toaster
1544049af0 Resolve #378, because I knew as soon as I saw that issue name that it was my fault. 2019-11-27 09:03:21 +00:00
MascaraSnake
075dab5718 Merge branch 'continuequestionmark' into 'master'
Continue?

See merge request STJr/SRB2Internal!562
2019-11-26 17:24:25 -05:00
MascaraSnake
0bc2f41ffb Merge branch 'burningpoint' into 'master'
Burning points (resolves #373).

Closes #373

See merge request STJr/SRB2Internal!561
2019-11-26 17:24:22 -05:00
MascaraSnake
b009373c08 Merge branch 'ballstuck' into 'master'
BALL STUCK!! BALL!!!! STUCK!!!!!! (Resolve #374)

Closes #374

See merge request STJr/SRB2Internal!560
2019-11-26 17:24:20 -05:00
MascaraSnake
bef6ba1556 Merge branch 'deadstuff' into 'master'
Matters of mortality

See merge request STJr/SRB2Internal!558
2019-11-26 17:24:17 -05:00
MascaraSnake
43d7b93d7f Merge branch 'bottweaks' into 'master'
Bot fixes

See merge request STJr/SRB2Internal!557
2019-11-26 17:24:15 -05:00
MascaraSnake
194ecb57b7 Merge branch 'unslide' into 'master'
Unslide (resolves #369).

Closes #369

See merge request STJr/SRB2Internal!556
2019-11-26 17:24:12 -05:00
toaster
665a778054 MascaraSnake is a bully and will make a pariah out of me in front of his doctoral student colleagues if I don't change this 2019-11-26 17:10:59 -05:00
toaster
33a79ae8c0 Now we have mixed case level title font, and since we had a question mark graphic in that for a while, make the continue screen a tad nicer. 2019-11-26 18:25:36 +00:00
toaster
0b790acb42 Move the fireball despawn to later so its target/tracer isn't nulled until AFTER the enemy it touches is killed, allowing for correct point delivery (resolves #373). 2019-11-26 17:56:42 +00:00
toaster
b177507be2 Resolve #374. 2019-11-26 17:06:30 +00:00
MascaraSnake
885834f465 Merge branch 'cc-jingles' into 'master'
Fix stuck closed captioning with no audio

See merge request STJr/SRB2Internal!555
2019-11-26 08:42:38 -05:00
toaster
49de43afaf Change the default value of cv_coopstarposts (as per #321), and make it NOT a cheat to change since the other options are in effect more restrictive. (Leaving cv_cooplives at its current value for now, though.) 2019-11-26 12:37:57 +00:00
toaster
b2426e7668 * Prevent that GOD AWFUL random camera turn that happens sometimes during the fade after you die (when you input camera turn stuff after death) by locking the camera during PST_REBORN.
* Remove whitespace in P_DeathThink.
2019-11-26 12:33:56 +00:00
toaster
d61cf9a938 Instead of making conditions which check for death individually check for special stages to prevent lives loss, just set G_GametypeUsesLives to false in a special stage. 2019-11-26 12:30:32 +00:00
toaster
644ba73c5b Make P_CanPickupItem check whether Sonic is in a state to recieve it when Tailsbot tries to get it.
Specfically, this fixes the case where Sonic runs into something hazardous and spills his rings, but Tailsbot is immediately behind and ends up picking them all up the tic before they also get hurt.
2019-11-26 11:55:31 +00:00
toaster
1223fac552 Prevent Tailsbot from considering flight when Sonic is exiting. 2019-11-26 11:53:49 +00:00
toaster
93e1fdd0bb Fix issue where you can get stuck in pain frames after stepping up, or after sliding (resolves #369). 2019-11-26 10:11:52 +00:00
Jaime Passos
9178660d34 Fix stuck closed captioning 2019-11-25 20:16:17 -03:00
MascaraSnake
bb881947e0 Merge branch 'paperslid' into 'master'
SMOOTH PAPERCOLLISION TIME!!!!!!!!

Closes #273

See merge request STJr/SRB2Internal!554
2019-11-25 17:07:56 -05:00
MascaraSnake
701d724f1d Merge branch 'xtrafix' into 'master'
Stop being so XTRA (resolves #362).

Closes #362

See merge request STJr/SRB2Internal!552
2019-11-25 17:02:32 -05:00
MascaraSnake
f1bbfcc95d Merge branch 'nightsnoforce' into 'master'
Charsel tweaks

See merge request STJr/SRB2Internal!551
2019-11-25 16:54:27 -05:00
MascaraSnake
c169fc64ec Merge branch 'fix-play-sfx-exec-part2' into 'master'
Fix the "play sound from nowhere as long as you're in the tagged areas" behavior

See merge request STJr/SRB2Internal!553
2019-11-25 16:54:08 -05:00
MascaraSnake
742b4eb142 Merge branch 'paperprojection' into 'master'
Papersprite projection tweak

See merge request STJr/SRB2Internal!535
2019-11-25 16:53:48 -05:00
MascaraSnake
ab7fe745c6 Merge branch 'charlock' into 'master'
Charlock (resolves #345).

Closes #345

See merge request STJr/SRB2Internal!528
2019-11-25 16:44:38 -05:00
MascaraSnake
50545cbc6a Merge branch 'unglue-metalsonic' into 'master'
Unglue Metal Sonic after floating onto a platform

Closes #344

See merge request STJr/SRB2Internal!526
2019-11-25 16:44:18 -05:00
MascaraSnake
b52c71b6e2 Merge branch 'minusflip' into 'master'
Have Minus rotate in mid-air

Closes #326

See merge request STJr/SRB2Internal!532
2019-11-25 16:43:49 -05:00
MascaraSnake
0f149b0feb Merge branch 'knuxstuff' into 'master'
Minor Knuckles fixes

See merge request STJr/SRB2Internal!527
2019-11-25 16:41:56 -05:00
MascaraSnake
0261148cb3 -Fix player being able to push up spikes
-Minor tweaks to make paper collision slightly more reliable
2019-11-25 22:35:40 +01:00