stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-11-15 01:01:33 +00:00
Code Issues Projects Releases Packages Wiki Activity
8052 commits 174 branches 41 tags 300 MiB
Commit graph

8052 commits

This branch
This branch
All branches
Author SHA1 Message Date
toaster
60006e20fb Edit config to account for new behaviour (plus add gold mode for the Eggman Statue, which I forgot to add earlier). 2019-11-29 21:59:06 +00:00
toaster
339907fd5d This Black Eggman? ***YEET*** 
Resolve issue #399 in the silliest way possible: by having Brak be yeeted off the platform by an explosion at his feet, preventing the downed mech from being anywhere near the escape pod.
 2019-11-29 21:55:25 +00:00
MascaraSnake
bc00380aa4 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
ebcb17d607 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
ccbb122143 Holy shit 2019-11-28 12:10:57 -08:00
MascaraSnake
2495e58bdb 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
f5dd0c5c3b 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
546c54b390 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
9146888ce7 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
ec69195fc9 Keep counting players as finished even after dying 2019-11-27 17:32:02 +01:00
toaster
803b22a3e7 Change required for Tails' tails to behave like falling sprite. 2019-11-27 13:54:13 +00:00
toaster
7ff218efaf Change SPR_NFLT default to superised SPR2_FALL (resolves code side of #382). 2019-11-27 13:47:38 +00:00
toaster
ae84246721 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
c29540a201 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
bcbf5e7c38 Correct tutorialmode case doubling up on camerascale. 2019-11-27 12:54:00 +00:00
toaster
7ff4a9b1e7 Make camerascale have no effect in 2D mode (resolves #359 and resolves #363). 2019-11-27 12:31:23 +00:00
toaster
a3050063cd 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
9a1dd06776 Merge branch 'continuequestionmark' into 'master' 
Continue?

See merge request STJr/SRB2Internal!562
 2019-11-26 17:24:25 -05:00
MascaraSnake
c8c52315fa 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
3aa72c5553 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
07afb52a2a Merge branch 'deadstuff' into 'master' 
Matters of mortality

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

See merge request STJr/SRB2Internal!557
 2019-11-26 17:24:15 -05:00
MascaraSnake
e49e91c355 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
c55a6cb3f8 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
d56a117a93 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
fa01a32a7f 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
613ae0c9f8 Resolve #374. 2019-11-26 17:06:30 +00:00
MascaraSnake
e48dea4291 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
f50feb1639 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
b71cf97cac * 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
f1387a07a1 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
6ac44415fb 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
e8b3f84741 Prevent Tailsbot from considering flight when Sonic is exiting. 2019-11-26 11:53:49 +00:00
toaster
1dee1da7e3 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
67d0499903 Fix stuck closed captioning 2019-11-25 20:16:17 -03:00
MascaraSnake
05ee9c8a21 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
4c1c87df39 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
34baf101aa Merge branch 'nightsnoforce' into 'master' 
Charsel tweaks

See merge request STJr/SRB2Internal!551
 2019-11-25 16:54:27 -05:00
MascaraSnake
1128660c5c 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
73bb913ec9 Merge branch 'paperprojection' into 'master' 
Papersprite projection tweak

See merge request STJr/SRB2Internal!535
 2019-11-25 16:53:48 -05:00
MascaraSnake
858df0c704 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
f1584efe80 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
8adcea56c3 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
aaea0f095c Merge branch 'knuxstuff' into 'master' 
Minor Knuckles fixes

See merge request STJr/SRB2Internal!527
 2019-11-25 16:41:56 -05:00
MascaraSnake
f54eeb82b7 -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
toaster
64cda33d6d SMOOTH PAPERCOLLISION TIME!!!!!!!! 
resolves #273, damn i feel good
 2019-11-25 20:12:42 +00:00
Nev3r
1b360d2cd8 Fix the "play from nowhere as long as you're in the tagged areas" behavior in the Play Sound line executor. 2019-11-25 20:30:06 +01:00
toaster
ef556ca6d5 Fix Continue sprites not working for custom characters (incorrect SPR2_XTRA bounds check). 
Also, change all the references to XTRA_ constants to consistently check for > its value, instead of >= its value plus one (or that there's any frames at all) - for extra clarity/consistency, and capacity for re-ordering later.
 2019-11-25 18:52:38 +00:00
MascaraSnake
8596445de6 Merge branch 'statisticase' into 'master' 
Statisticase (resolves #339).

Closes #339

See merge request STJr/SRB2Internal!531
 2019-11-25 13:21:09 -05:00
MascaraSnake
3a12c13e50 Merge branch 'nightsmode-menu-fix' into 'master' 
Fix time emblem overlapping best time on NiGHTS Mode menu (Resolves #353)

Closes #353

See merge request STJr/SRB2Internal!539
 2019-11-25 13:20:31 -05:00