stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-12-21 02:10:39 +00:00
Code Issues Projects Releases Packages Wiki Activity
8405 commits 172 branches 41 tags 280 MiB
Commit graph

7284 commits

Author SHA1 Message Date
Jaime Passos
7384522aef Fix Continue game state wipes 2019-12-05 01:47:51 -03:00
lachwright
fdf3944f60 Merge branch 'master' into signpost-cleanup 2019-12-05 12:37:03 +08:00
lachwright
8ddfdf2d0f Fix signpost camera for S_SKIN camerascale, exitmove, opposite gravity, and analog mode 2019-12-05 12:36:25 +08:00
sphere
d1b456b893 Edit some rock crumble states to match new sprites. 2019-12-05 02:22:25 +01:00
Jaime Passos
6adb957f0f Slap colormap fades everywhere 2019-12-04 19:25:39 -03:00
MascaraSnake
e6f1b82cc4 Merge branch 'minusoneframes' into 'master' 
Minus One Frames

See merge request STJr/SRB2Internal!593
 2019-12-04 17:15:51 -05:00
MascaraSnake
6b344b9ddf Merge branch 'freemipmapcolormap-momento-irmao' into 'master' 
Fix FreeMipmapColormap yet again

See merge request STJr/SRB2Internal!597
 2019-12-04 17:10:06 -05:00
MascaraSnake
a7884e479a Merge branch 'timeoverrings' into 'master' 
Time Over rings (resolves #446).

Closes #446

See merge request STJr/SRB2Internal!596
 2019-12-04 17:09:32 -05:00
MascaraSnake
6928763961 Merge branch 'nullplayerslopelaunch' into 'master' 
Fix slope launch with NULL player causing SIGSEGV.

See merge request STJr/SRB2Internal!595
 2019-12-04 17:07:04 -05:00
MascaraSnake
01da9f7f16 Merge branch 'tokenultimate' into 'master' 
Fix tokens not spawning in ultimate mode

See merge request STJr/SRB2Internal!594
 2019-12-04 17:06:43 -05:00
MascaraSnake
5662f8de00 Merge branch 'credits-update' into 'master' 
Credits update

See merge request STJr/SRB2Internal!484
 2019-12-04 16:59:46 -05:00
MascaraSnake
6a811515db Merge branch 'have_png-compile-fix' into 'master' 
NO_PNG_LUMPS compile fix

See merge request STJr/SRB2Internal!598
 2019-12-04 16:59:13 -05:00
MascaraSnake
77d446cc04 Merge branch 'spsmshgular' into 'master' 
sfx_spsmsh (hhz spikeball) is now singular

Closes #451

See merge request STJr/SRB2Internal!599
 2019-12-04 16:58:56 -05:00
toaster
fe0b92d01a sfx_spsmsh (hhz spikeball) is now singular 2019-12-04 20:32:46 +00:00
Jaime Passos
81cfca29d8 Fix FreeMipmapColormap yet again 2019-12-04 15:50:17 -03:00
Jaime Passos
b646922967 fix Ploadflat warning 2019-12-04 15:41:29 -03:00
Jaime Passos
839251633c fix ErrorIfPNG errors 2019-12-04 15:26:51 -03:00
toaster
e8ac1c391c Make rings 0 in competition winner selection if you gamed or timed over, and use the MAXSCORE macro instead of a hardcoded value. 2019-12-04 17:32:47 +00:00
Alam Ed Arias
c432f86624 change from shifting bits to multi for a OLD video function marco 2019-12-04 10:43:33 -05:00
Alam Ed Arias
0751f8987a Libs: move pngconf.h out of top level libpng source folder 2019-12-04 10:41:54 -05:00
toaster
7f82d7451d Fix slope launch with NULL player causing SIGSEGV. 2019-12-04 12:13:27 +00:00
Steel Titanium
41210708e2 Merge branch 'fade-timeout-fix' into 'master' 
Temporary fix for the fade timeout

See merge request STJr/SRB2Internal!592
 2019-12-03 20:19:33 -05:00
toaster
c843f22a24 Spawn tokens in ultimate mode now they no longer give you rings on successful special stage completion. 2019-12-03 23:21:36 +00:00
MascaraSnake
20c1a0158d Added Sev to the Art section of the credits 2019-12-04 00:07:56 +01:00
MascaraSnake
c2577b6eb3 Added more people to the credits and reorganized them slightly 2019-12-04 00:02:47 +01:00
MascaraSnake
602ba32ecc A few more credits additions/adjustments 2019-12-03 22:22:48 +01:00
toaster
e75490c99d Semi-hacky fix to R_AddSpriteDefs printing Added -1 frames in 0 sprites: if the start marker is equal to or beyond the end marker, none of r_things' for (l = startlump; l < endlump; l++) loops will run, so just assume no sprites. 
Simply put, `W_CheckNumForFolderStartPK3` and its `End` equivalent will never return INT16_MAX for nonexistence, and I don't want to break any assumptions elsewhere by modifying those functions directly, so this is the simplest possible fix.
 2019-12-03 21:05:05 +00:00
MascaraSnake
7a8d1b4d4b Merge branch 'creditsart' into 'master' 
New credits art + credits header support

See merge request STJr/SRB2Internal!591
 2019-12-03 14:28:51 -05:00
Louis-Antoine
84e7672cca Temporary fix for the fade timeout 2019-12-03 12:02:14 +01:00
MascaraSnake
0c048d2667 Merge branch 'tailsbotdetect' into 'master' 
Attempt to detect Tailsbot and Sonic spawning on top of each other

See merge request STJr/SRB2Internal!584
 2019-12-03 02:20:30 -05:00
MascaraSnake
f9460434f8 Merge branch 'savedatareorder' into 'master' 
Savedata load order of operations change

See merge request STJr/SRB2Internal!583
 2019-12-03 02:18:06 -05:00
MascaraSnake
c30886a47f Merge branch 'botregrab' into 'master' 
Allow re-grabbing Tails AI mid-flight (resolves #428)

Closes #428

See merge request STJr/SRB2Internal!590
 2019-12-03 02:17:37 -05:00
MascaraSnake
c1d5f411e0 Merge branch 'paperfixes' into 'master' 
Nail a likely culprit in papersprite rendering resolving #427 and #375.

Closes #427 and #375

See merge request STJr/SRB2Internal!589
 2019-12-03 02:16:26 -05:00
MascaraSnake
ab400e926a Merge branch 'emeraldfall' into 'master' 
Fix emerald coordinate overflow in failed SS tally (resolves #421).

Closes #421

See merge request STJr/SRB2Internal!586
 2019-12-03 02:15:47 -05:00
MascaraSnake
ba0dc5c884 Merge branch 'ideyagun' into 'master' 
Ideyagun (resolves #406).

Closes #406

See merge request STJr/SRB2Internal!582
 2019-12-03 02:15:26 -05:00
Alam Ed Arias
b5738620c1 Fixup compiling errors 2019-12-02 12:12:26 -05:00
lachwright
be3d7b7dcd - Remove y coordinate from struct for credits_pics 
- Update x coordinates for credits_pics entries
- Reorder credits_pics entries (what even was the previous order lol)
- Add zig zag graphics to credits roll
- Attempt to scale the y positions of credits graphics with the length of the credits roll
- New escape character for credits entries: \2, which centers the text and makes it yellow
- Add support for colored text to V_DrawStringAtFixed
 2019-12-02 22:24:05 +08:00
toaster
2bc67bf813 Allow re-grabbing Tails AI mid-flight (resolves #428) 2019-12-01 13:31:33 +00:00
toaster
f21ebaea0c Nail a likely culprit in papersprite rendering for #427 and #375. 2019-12-01 13:21:41 +00:00
MascaraSnake
ae2594e5ce Merge branch 'metalfix' into 'master' 
Boss Scream fix

See merge request STJr/SRB2Internal!581
 2019-12-01 02:26:24 -05:00
MascaraSnake
97fdc5aaf0 Merge branch 'introfix' into 'master' 
Fix intro's BRITEGG/DARKEGG scale

See merge request STJr/SRB2Internal!580
 2019-12-01 02:25:22 -05:00
sphere
ec3548c7f4 Merge remote-tracking branch 'origin/master' into credits-update 2019-12-01 00:32:01 +01:00
toaster
f662ef9454 Fix emerald coordinate overflow in failed SS tally (resolves #421). 2019-11-30 20:02:51 +00:00
sphere
d9a88ec10c Promote some programmers, add Blade & CoatRack to texture artists. 2019-11-30 18:23:57 +01:00
toaster
515600c4d0 Attempt to detect Tailsbot and Sonic spawning at the same coords and restrict some undesirable stuff happening, just in case we miss any situations (or for the sake of mods). 2019-11-30 16:54:51 +00:00
mazmazz
be44f0701e Clean up music error messages 2019-11-30 11:53:45 -05:00
toaster
6e278c1138 Change the order of operations such that savedata info is loaded before mapthings are spawned, so that if you have all the emeralds, the emerald objects won't spawn in BCZ2 if you use the SP savefile's level select to go to it directly. 2019-11-30 15:52:41 +00:00
toaster
3267a98fe9 Remove tracer nulling, likely a leftover from when P_LookForEnemies set tracer directly. 2019-11-30 15:28:50 +00:00
toaster
9d442ae6ea Wait, no, I'm an idiot. 2019-11-30 14:56:43 +00:00
toaster
2eb8e6be49 ...why is Metal overwriting his movecount to spawn explosions? 2019-11-30 14:37:21 +00:00
lachwright
6613286f1c Fix intro's BRITEGG/DARKEGG scale 2019-11-30 22:07:21 +08:00
MascaraSnake
e664e8b7f3 Merge branch 'jumphood' into 'master' 
Jumphood

See merge request STJr/SRB2Internal!573
 2019-11-30 06:53:15 -05:00
lachwright
d46f022837 Restore spindash sounds to DSSPNDSH 2019-11-30 19:30:58 +08:00
toaster
85e3180056 Make the fling always occur, and only have the horizontal momentum apply if not MTF_EXTRA. 2019-11-30 10:31:18 +00:00
toaster
0d4158bbd0 Fix the flung Brak not being removed on deathpits. 2019-11-30 10:29:51 +00:00
MascaraSnake
0d433b9e51 Merge branch 'brakyeet' into 'master' 
This Black Eggman? ***YEET*** (resolves #399)

Closes #399

See merge request STJr/SRB2Internal!575
 2019-11-30 05:21:55 -05:00
MascaraSnake
b22e8c809f Merge branch 'goldstatue' into 'master' 
Gold statue MTF_EXTRA

See merge request STJr/SRB2Internal!576
 2019-11-30 05:19:27 -05:00
toaster
c2bd91af50 Discovered this was wrong when working on the config for brakyeet, MS objected to the hack so he's updating the tutorial map accordingly. 2019-11-30 10:12:45 +00:00
MascaraSnake
23b0b03d4d Merge branch 'spd' into 'master' 
Deton alert sound

See merge request STJr/SRB2Internal!491
 2019-11-30 05:04:10 -05:00
MascaraSnake
c72f501042 Merge branch 'sandtnoflip' into 'master' 
S&T no flip

See merge request STJr/SRB2Internal!571
 2019-11-30 05:03:07 -05:00
MascaraSnake
6bbc412eac Merge branch 'finalcountdown' into 'master' 
The final countdown (resolves #400).

Closes #400

See merge request STJr/SRB2Internal!574
 2019-11-30 04:03:07 -05:00
MascaraSnake
8a3c7da1d2 Merge branch 'mapinter' into 'master' 
Intermission Buffer Clear On Map Command (no funny name today)

See merge request STJr/SRB2Internal!570
 2019-11-30 04:02:44 -05:00
MascaraSnake
3bddd4365a Merge branch 'newintro' into 'master' 
New intro graphics

See merge request STJr/SRB2Internal!524
 2019-11-30 04:01:51 -05:00
lachwright
916fec2c41 Make INTRO4 display at high res 2019-11-30 12:31:23 +08:00
lachwright
d88eef3e95 Merge branch 'master' into newintro 2019-11-30 12:30:12 +08: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
toaster
fdcc8c912a Actually, wait; this is way better and cleaner. 2019-11-29 20:41:13 +00:00
toaster
ed0529b9d5 Match final countdown timer to timer (resolves #400). 2019-11-29 20:35:59 +00:00
toaster
0db38d213b Make Cobalt-picked sound effect audible from far away, like the original. 2019-11-29 20:04:14 +00:00
toaster
de34298bbd Merge branch 'master' into spd 2019-11-29 19:19:55 +00:00
toaster
1fa87611f7 Give the Robo-Hood a cute jump sound whenever it's fleeing you. 2019-11-29 19:18:05 +00:00
toaster
92f8c002f3 Prevent exit sectors having any effect whatsoever outside of platform gametypes (resolve #396). 2019-11-29 19:11:17 +00:00
toaster
960ee7fe72 Don't flip P1 of a two-character save card, for aesthetique reasons. 2019-11-29 15:58:37 +00:00
toaster
cbc49882bc Fix screen buffer not being cleared if a map command is used during the intermission. 2019-11-29 15:25:55 +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
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
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
MascaraSnake
e48f4170fc Merge branch 'springroll' into 'master' 
Spring roll (Resolves #336).

Closes #336

See merge request STJr/SRB2Internal!543
 2019-11-25 13:20:16 -05:00
MascaraSnake
bdc0075ee0 Merge branch 'speclook' into 'master' 
Speclook (resolves #340).

Closes #340

See merge request STJr/SRB2Internal!529
 2019-11-25 13:20:00 -05:00
LJ Sonic
406ff44bae Merge branch 'speedingofftocorner' into 'master' 
Fix "Speeding off to..." placement in non-green resolutions

See merge request STJr/SRB2Internal!549
 2019-11-25 13:12:04 -05:00
LJ Sonic
0cc5d35308 Merge branch 'reversesmash' into 'master' 
Spikes and gravity (resolves #348).

Closes #348

See merge request STJr/SRB2Internal!541
 2019-11-25 13:11:48 -05:00
LJ Sonic
31af9107e3 Merge branch 'lavafall-firedamage' into 'master' 
Give RVZ lavafalls fire damage (resolves #352)

Closes #352

See merge request STJr/SRB2Internal!540
 2019-11-25 13:09:18 -05:00
LJ Sonic
66c46bb3ea Merge branch 'mapisnowZONE' into 'master' 
Map is now ZONE

See merge request STJr/SRB2Internal!548
 2019-11-25 13:08:01 -05:00
LJ Sonic
69c41c5013 Merge branch 'bashfix' into 'master' 
Fixed crash when BASH's target disappears during chasing

Closes #341

See merge request STJr/SRB2Internal!525
 2019-11-25 13:06:16 -05:00
LJ Sonic
1892ab0de5 Merge branch 'tutboxgl' into 'master' 
Tutorial Prompt in GL (resolves #349).

Closes #349

See merge request STJr/SRB2Internal!544
 2019-11-25 13:05:46 -05:00
LJ Sonic
9541137f5e Merge branch 'join-bug-fix' into 'master' 
Fix for the join bug

Closes #302, #338, and #347

See merge request STJr/SRB2Internal!545
 2019-11-25 12:58:48 -05:00
LJ Sonic
6c453ebf6e Merge branch 'mpspecialfixes' into 'join-bug-fix' 
MP Special Stage fixes (resolves #347).

See merge request STJr/SRB2Internal!546
 2019-11-25 12:56:22 -05:00
toaster
f86b46640d Skip character select entirely if only one character is available on the list. 2019-11-25 17:06:06 +00:00
toaster
fc407cf6ce Skip tagteam characters (ie, Sonic&Tails) for NiGHTS secret map character selection. 2019-11-25 16:55:18 +00:00
toaster
5cf803f7d0 Allow character select for NiGHTS stages on the Secret Level Select now that every character has NiGHTS sprites. 
(think of this as the collorary to 358, not a direct change)
 2019-11-25 16:46:26 +00:00
Louis-Antoine
404d09e35a Do not focus the camera on the end sign if exitmove is active 2019-11-25 17:23:35 +01:00
lachwright
f7ede3b313 Merge branch 'master' into unglue-metalsonic 2019-11-26 00:20:47 +08:00
lachwright
287e8133bb Add comment 2019-11-26 00:20:43 +08:00
lachwright
5719a93211 Fix 'Speeding off to...' placement in non-greeen resolutions 2019-11-26 00:16:46 +08:00
toaster
6398779983 Correct two instances where "Zone" is forced uppercase. 2019-11-25 16:04:03 +00:00
toaster
2110fa6bd1 Fix extra lives given to game-overed players not re-entering them into the action when cv_coopstarposts is 0. 2019-11-25 14:59:06 +00:00
toaster
71e74ca363 Fix a bunch of shit with MP special stages! 
* Prevent an infinite quantity of Emeralds being spawned when P_GiveEmerald is called while a MP Special Stage is in session (resolves #347).
* Fix FuriousFox's ridiculous timer on special stage spawn (mentioned in the comments of the previous issue) by correctly marking spectator players in special stages as finished, and preventing the underflow.
 2019-11-25 14:33:15 +00:00
MascaraSnake
10df92d232 Merge branch 'shhhhhfang' into 'master' 
Make DSWBREAK a singular sound

See merge request STJr/SRB2Internal!534
 2019-11-25 03:00:49 -05:00
MascaraSnake
9e598f583a Merge branch 'hwr-cache-fix' into 'master' 
Fix FreeMipmapColormap crash (resolves #287 and #351)

Closes #287 and #351

See merge request STJr/SRB2Internal!538
 2019-11-25 02:59:07 -05:00
Louis-Antoine
a187460865 Revert "Render title map on connecting to server screen too" 
This reverts commit b6e145f0c5.
 2019-11-25 01:09:00 +01:00
toaster
82843fc78e Fix Tutorial prompt being incorrect size in GL (resolves #349). 2019-11-25 00:08:38 +00:00
toaster
df5c8e792f Go from spindash into ordinary roll if player's speed is suddenly above the speed you're allowed to roll at. 2019-11-24 22:55:37 +00:00
Louis-Antoine
74ae5819c4 Account for exiting but non-finished players in G_EnoughPlayersFinished 2019-11-24 23:40:40 +01:00
toaster
c0bc46ca9c A bunch of spike tweaks. 
* Make it possible to break them in reverse gravity (resolves #348) by making the spikes break in a circle around the spike touched, rather than in a circle around the player.
* Fix the spike chunks spawned not being flipped in reverse gravity by using P_SpawnMobjFromMobj.
* Make their breaking sound singular (prevents eardrum destruction).
 2019-11-24 22:38:26 +00:00
MascaraSnake
7b80d509cc Give RVZ lavafalls fire damage 2019-11-24 23:01:17 +01:00
Steel Titanium
d4a8fd8e64
Fix time emblem overlapping best time on NiGHTS Mode menu (Resolves #353) 2019-11-24 16:37:13 -05:00
Jaime Passos
c9ff8ec26b Fix FreeMipmapColormap crash 2019-11-24 17:37:11 -03:00
toaster
3594623891 Courteousy of fickle, an adjustment to papersprite rendering that prevents the object's x1 and x2 being slightly off where they should be. Not perfect, but absolutely better than it was! 
Also, tweak the Minecart segment spawning position, since this was originally placed based on the awkward rendering.
 2019-11-24 16:42:13 +00:00
lachwright
6733a8c38f Shhhhh, Fang 2019-11-24 23:46:37 +08:00
lachwright
4e9e5a072f Have Minus spawn debris upon landing, as suggested 2019-11-24 23:42:27 +08:00
toaster
6773b39a40 Woops 2019-11-24 15:19:15 +00:00
lachwright
9a7979d841 Have Minus rotate in mid-air 2019-11-24 22:29:26 +08:00
toaster
508feaad9d Enable lowercase text for Statistics and Unlockable Checklist menus (resolves #339). 2019-11-24 13:51:53 +00:00
toaster
4dfae1a65b Make cv_exitmove only have effect if gametype is GT_COOP, otherwise immediately exit (resolves #342). 2019-11-24 13:35:37 +00:00
toaster
fcfbd403f0 Make mouselook follow the first-person option when a spectator, even when other variables assume you're in third person (resolves #340). 2019-11-24 13:30:49 +00:00
toaster
6cc2ca7542 * Resolve #345. 
* Prevent skincolours from being reset to the skin's prefcolour, but only for not-always-usable characters.
 2019-11-24 13:24:37 +00:00
lachwright
ccc41c7a8f Fix elemental stomp activating glide landing after emerging from goop; fix climbing boost-up not scaling properly with player scale 2019-11-24 19:30:20 +08:00
lachwright
3fa04cb091 Make Metal's vertical float speed technically negative 2019-11-24 18:46:59 +08:00
MascaraSnake
4be45a5e43 Fixed crash when BASH's target disappears during chasing 2019-11-24 10:22:00 +01:00
lachwright
23ab807d68 Complete new intro 2019-11-24 15:58:03 +08:00
lachwright
f2de738b09 Merge branch 'master' into newintro 2019-11-24 13:11:38 +08:00
MascaraSnake
d99e3f8337 Merge branch 'translucenthud-showfps-fix' into 'master' 
Title card showfps translucency fix

See merge request STJr/SRB2Internal!522
 2019-11-23 18:16:17 -05:00
MascaraSnake
5fe89e6e9b Merge branch 'ra-wipe-fix' into 'master' 
Fix RA fade (resolves #329)

Closes #329

See merge request STJr/SRB2Internal!521
 2019-11-23 18:16:09 -05:00
MascaraSnake
df50900ac5 Merge branch 'statusbar-stuff' into 'master' 
No longer allow showhud to toggle FPS counter or ping bar

See merge request STJr/SRB2Internal!523
 2019-11-23 18:09:59 -05:00
MascaraSnake
a24949cfa6 Merge branch 'menu-reordering' into 'master' 
Menu reordering (also renaming secrets to extras)

See merge request STJr/SRB2Internal!511
 2019-11-23 17:51:46 -05:00
MascaraSnake
33dc443b77 Merge branch 'nightsexitcam' into 'master' 
NiGHTS exit camera tweak

See merge request STJr/SRB2Internal!519
 2019-11-23 17:51:34 -05:00
MascaraSnake
01f02b142f Merge branch 'exitcam' into 'master' 
Exit camera fixes (Resolves #327).

Closes #327

See merge request STJr/SRB2Internal!518
 2019-11-23 17:51:29 -05:00
MascaraSnake
9b8b463791 Merge branch 'horizonclimb' into 'master' 
Horizonclimb (resolves #323)

Closes #323

See merge request STJr/SRB2Internal!516
 2019-11-23 17:51:17 -05:00
MascaraSnake
cd38173a7b Merge branch 'superrun' into 'master' 
Super runspd fix

See merge request STJr/SRB2Internal!515
 2019-11-23 17:51:12 -05:00
MascaraSnake
5715727724 Merge branch 'firefuck2' into 'master' 
Firefuck II

Closes #310

See merge request STJr/SRB2Internal!512
 2019-11-23 17:51:02 -05:00
Jaime Passos
2a9db29c58 fix showfps with st_translucency 2019-11-23 18:41:28 -03:00
Jaime Passos
e850d42bc2 fix RA fade 2019-11-23 18:15:09 -03:00
Steel Titanium
97a87574b2
No longer allow showhud to toggle FPS counter or ping bar 2019-11-23 16:09:02 -05:00
MascaraSnake
aabddd69f1 Fixed a missing space in the "Speeding off to..." text 2019-11-23 18:51:32 +01:00
toaster
90c13effc0 Since I was tired of seeing NiGHTS players bump their head into the ceiling, and since similar camera enhancements have been made for the papersprite sign exit, implement a camera lock when exiting while NiGHTS. 
https://cdn.discordapp.com/attachments/359091121789468672/647821662003396609/srb20088.gif
 2019-11-23 15:40:32 +00:00
toaster
ebead10dca Remove duplicate viewpointx/viewpointy set. 2019-11-23 15:23:42 +00:00
toaster
7956584797 Have the vertical aiming focus on the signpost's z rather than continue to focus on the player even while the camera is forced to be near the signpost. (resolves #327) 2019-11-23 15:11:24 +00:00
toaster
5a63e22f56 It's not safe to store a file-scope pointer to a mobj_t* without having any mechanism to clear it between map reloadings, so move the Tailsbot "press jump now to fly!" indicator into tails->target. 
Resolves #331, and likely also #330 and #309.
 2019-11-23 14:43:47 +00:00
toaster
95ed442d55 Prevent Knuckles latching onto horizon special linedefs. 
Also, update all references to the horizon special to use a #defined constant instead of a magic number.
 2019-11-23 14:20:41 +00:00
MascaraSnake
4ccb4f5c8a Merge branch 'crossfade-fix' into 'master' 
Fix crossfades

See merge request STJr/SRB2Internal!514
 2019-11-23 04:14:07 -05:00
lachwright
dea1ba6568 Merge branch 'master' into signpost-cleanup 2019-11-23 07:05:45 +08:00
toaster
0f164301e1 Do Cobalt's suggestion, because this branch wasn't gonna get merged in its original state anyways. 2019-11-22 16:27:22 -05:00
MascaraSnake
2c85aa9f69 Merge branch 'drtminus' into 'master' 
drt minus

See merge request STJr/SRB2Internal!495
 2019-11-22 16:09:58 -05:00
toaster
5611f8eff4 I was reading the Sonic 3 Unlocked blog by NeoHazard when I came across a very interesting post. 
https://s3unlocked.blogspot.com/2017/12/over-threshold.html

It turns out that in Sonic 3 & Knuckles, the threshold for crossing into the super animation is increased compared to normal gameplay. This makes a lot of sense - however, both Sonic Mania and the Taxman/Stealth mobile remakes missed this. I quickly tested and confirmed that SRB2 had the same issue, so here's the fix.
 2019-11-22 21:06:25 +00:00
Jaime Passos
b24c709206 clarify comment 2019-11-22 17:50:05 -03:00
Jaime Passos
faa305a2f2 Fix crossfades 
Fixes NoReload using the wrong wipestyle.
Also fixes non-titlemap title screen wipes using the wrong wipestyle.
 2019-11-22 17:44:42 -03:00
Jaime Passos
227f69f063 fix missing mmx check 2019-11-22 17:30:53 -03:00
MascaraSnake
6545284eaf Merge branch 'gfz-debris' into 'master' 
VAdaPEGA's GFZ debris

See merge request STJr/SRB2Internal!505
 2019-11-22 15:27:11 -05:00
MascaraSnake
e9ca39d3bc Merge branch 'infopoke' into 'master' 
MS Info packet tweaks (resolves #300)

Closes #300

See merge request STJr/SRB2Internal!499
 2019-11-22 15:21:41 -05:00
sphere
de2a26bf5d Swap statistics and tutorial options in the 1 Player menu. 2019-11-22 21:00:03 +01:00
toaster
c8c5237540 Resolve #310. 2019-11-22 19:51:27 +00:00
sphere
07221c50ce i'm a dumbass 2019-11-22 20:37:35 +01:00
MascaraSnake
ca74636a27 Merge branch 'dsz3target' into 'master' 
Sea Egg targeting systems online! (resolves #303)

Closes #303

See merge request STJr/SRB2Internal!501
 2019-11-22 14:26:40 -05:00
MascaraSnake
6f82e5197d Merge branch 'rollout-bumps' into 'master' 
Add fun™ to rollout rocks

See merge request STJr/SRB2Internal!504
 2019-11-22 14:25:39 -05:00
sphere
e3aca4b647 restore secrets = 0, not sure why i changed that 2019-11-22 20:24:57 +01:00
MascaraSnake
44fa076698 Merge branch 'radiomode3' into 'master' 
Fix conditionset-based unlocks on the Sound Test (resolves #312).

Closes #312

See merge request STJr/SRB2Internal!508
 2019-11-22 14:12:03 -05:00
MascaraSnake
f7c4ec1965 Merge branch 'mapvisitedupdate' into 'master' 
Intermission fixes/cleanup

See merge request STJr/SRB2Internal!509
 2019-11-22 14:11:31 -05:00
MascaraSnake
18babe3268 Merge branch 'followghost' into 'master' 
Followmobj Record Attack fix (resolves #322).

Closes #322

See merge request STJr/SRB2Internal!510
 2019-11-22 14:10:59 -05:00
MascaraSnake
e351d629bd Merge branch 'playersall' into 'master' 
Players All reliability fix (resolves #301 and #315)

Closes #301 and #315

See merge request STJr/SRB2Internal!500
 2019-11-22 14:10:39 -05:00
MascaraSnake
a3a7dc6bed Merge branch 'remove-unused-levelwipes' into 'master' 
(Cleanup) Remove unused levelwipes

See merge request STJr/SRB2Internal!507
 2019-11-22 09:21:17 -05:00
MascaraSnake
ae8f0b42aa Merge branch 'titlecard-event-fix' into 'master' 
Remove D_ProcessEvents call in G_PreLevelTitleCard (resolves #317)

Closes #317

See merge request STJr/SRB2Internal!506
 2019-11-22 09:12:02 -05:00
lachwright
3e1c3b04e7 WIP intro graphics update 2019-11-22 20:08:23 +08:00
sphere
514394a4f3 fuck autocomplete 2019-11-22 04:12:38 +01:00
toaster
143d4aa053 Move all the visitation/emblems/record attack update stuff into a single function, and call that function in two different places depending on whether the tally screen is visited or not. 2019-11-21 23:38:33 +00:00
toaster
3798e886ea Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into mapvisitedupdate 2019-11-21 23:16:06 +00:00
toaster
990d9ed40c Correct location of followmobj scale write to match read (resolves #322). 
Requires deleting all of RC1's Record Attack replays with followmobj characters, but I think you'll agree that's a reasonable price to pay.
 2019-11-21 22:50:04 +00:00
toaster
7ff616b26e Do a whole bunch of cleanup for mapvisited and intermission related things. 
* Move the visitation flags, Record Attack/NiGHTS Attack data, and emblem checking to outside of Y_StartIntermission.
* Y_CleanupScreenBuffer never got called for maps which skip the intermission, leading to a small memory leak; this is now fixed by moving it to G_AfterIntermission.
* Y_FollowIntermission was just G_AfterIntermission with modeattacking specific behaviour, but this is desired for all places where G_AfterIntermission is called, so just merge this into G_AfterIntermission.

Notably, these changes are necessary because there are now three maps in the main SP campaign which do not end with traditional intermissions. As a result, this fixes an issue where Black Core's tracks are not available in the Sound Test (due to MV_BEATEN never being applied).

Also, since I was here: Remove "gotperfect" from recorddata_t. This is a duplicate of `mapvisited[gamemap-1] & MV_PERFECT` which uses more memory. I have kept the new spacing in the gamedata for compatibility with RC1 savedatas, but moved it across to the original method everywhere else.
 2019-11-21 16:10:28 +00:00
sphere
5a7ebb3ba6 Re-reorganize sound options. 2019-11-21 16:53:37 +01:00
sphere
b37c3a414a Remove unneeded HAVE_MIXERX checks. 2019-11-21 16:35:27 +01:00
MascaraSnake
f13e67bf8f Merge branch 'gametype-out-of-range' into 'master' 
Prevent gametype changes being out of range

See merge request STJr/SRB2Internal!503
 2019-11-21 09:31:05 -05:00
MascaraSnake
9db5c5875c Merge branch 'hi-lj' into 'master' 
Fix issue with strcasestr that causes a map command crash

See merge request STJr/SRB2Internal!502
 2019-11-21 09:30:18 -05:00
MascaraSnake
f1ab6783c2 Merge branch 'subtitlesubterfuge' into 'master' 
Subtitle subterfuge (resolves #306)

Closes #306

See merge request STJr/SRB2Internal!498
 2019-11-21 09:29:13 -05:00
MascaraSnake
3b2b8ab80f Merge branch 'ptzcrash' into 'master' 
Fix crash in new fireflower (resolves #305).

Closes #305

See merge request STJr/SRB2Internal!497
 2019-11-21 09:28:35 -05:00
toaster
7c7eec4b9a Fix conditionset-based unlocks on the Sound Test. 2019-11-21 13:12:54 +00:00
Jaime Passos
248306ccb0 Remove D_ProcessEvents call in G_PreLevelTitleCard 2019-11-21 02:16:09 -03:00
sphere
f021d35e7e Move tutorial to the bottom of the 1 Player menu. 2019-11-21 02:43:07 +01:00
sphere
74987beb1f Reword some evaluation sentences. 2019-11-21 02:24:12 +01:00
sphere
48c454553f Move SP and MP down if extras aren't unlocked yet. 2019-11-21 02:19:31 +01:00
sphere
9608021824 Rename "secrets" to "extras". 2019-11-21 01:34:32 +01:00
sphere
f587069d0e Reorganize sound options. 2019-11-21 01:14:09 +01:00
sphere
2d509eff47 Move the main menu options around. 2019-11-21 00:34:58 +01:00
lachwright
35f2572e29 Correct sound for GFZ debris (copy-paste oversight) 2019-11-21 01:26:53 +08:00
lachwright
c5d085d333 Add missing GFZD spriteset 2019-11-21 01:14:24 +08:00
lachwright
ac3924c9c8 Add GFZ debris; reorganize wood debris index 2019-11-21 01:05:22 +08:00
lachwright
cdc7a88b04 Add bump sounds to rollout rock & add Newton's third law to jumping off them 2019-11-20 23:45:34 +08:00
toaster
abf0c5e632 resolve #315 2019-11-20 14:34:19 +00:00
lachwright
cde56dbe6c WIP fix signpost issues with exitmove 2019-11-20 21:02:34 +08:00
Jaime Passos
e0a9b3d695 Merge remote-tracking branch 'origin/subtitlesubterfuge' into remove-unused-levelwipes 2019-11-19 21:49:45 -03:00
Louis-Antoine
032f53ce07 Prevent drowning after completing the level 2019-11-19 22:44:33 +01:00
James R
6ffb18c4b1 Warn if gametype number is out of range to map command 2019-11-19 12:32:02 -08:00
James R
9b96964cbb Check for out of range gametype on map change 2019-11-19 12:25:50 -08:00
toaster
7645d0417a Further cleanup. 2019-11-19 20:24:44 +00:00
James R
c5d73e37bb Fix strcasestr SIGSEGV in the case of only upper case strchr returning NULL 2019-11-19 11:16:17 -08:00
Monster Iestyn
d1d1098f7c fix object type restrictions for popping monitors 
(MT_BOUNCERING to MT_GRENADERING are actually the ammo pickups, MT_THROWNBOUNCE to MT_THROWNGRENADE are what actually want here)
 2019-11-19 12:31:20 -05:00
toaster
2bba25c1e1 As selected by Nev3r, implement option 2: Proximity Bastard for the Sea Egg to resolve #303. 2019-11-19 15:59:24 +00:00
toaster
86f343b84b Make the All Players linedef exectutor activator sector type more reliable for FOFs that span multiple sectors (resolves #301). 2019-11-19 14:09:24 +00:00
toaster
f5885f84f0 lmao how did i forget a null terminator 2019-11-19 13:40:07 +00:00
toaster
ef1aeb2ff6 MS Info packet tweaks. 
* Report a completely uppercase map title in SERVERINFO, as per the MS previously expected (resolves #300).
* Ignore colour codes in map titles in SERVERINFO, since those now function like with console font.
* Modulo the skin number provided in PLAYERINFO by 3 in DEVELOP builds, so it's safe to test with certain characters on the MS (AS LONG AS IT'S NOT A RELEASE BUILD).
 2019-11-19 13:36:33 +00:00
toaster
3add9a9bd2 Make the SPEEDING OFF TO ZONE text that appears while loading: 
* Use a mixed case "Zone" to match the mixed case level titles.
* Have V_TRANSLUCENT to not stick out too much against pure black/white backgrounds. (Can revert this aspect if necessary, but I think you'll agree it's a good balance between readable and aesthetic.)
 2019-11-19 13:00:37 +00:00
toaster
2ac44240db Fix the coords of the subtitle. 2019-11-19 12:59:01 +00:00
toaster
340e2e48f9 Fix crash in new fireflower. (resolves #305) 
Also, correct indentation on bounce ring fuse since I was here.
 2019-11-19 11:53:45 +00:00
Jaime Passos
99d4db956c change vertical alignment 2019-11-18 21:45:30 -03:00
Jaime Passos
8de7ff0c86 fix subttl 2019-11-18 21:44:02 -03:00
James R
1db9e312a6 P_MobjFlip does not return boolean 2019-11-18 15:55:21 -08:00
James R
f3e66f7b58 dist is unused 2019-11-18 15:53:30 -08:00
James R
1febf8cb4b Mixed code... 2019-11-18 15:52:14 -08:00
James R
eefc285b5c locvars not needed 2019-11-18 15:48:29 -08:00