Commit graph

9287 commits

Author SHA1 Message Date
FuriousFox
b231719eed Missed a semicolon 2019-11-24 16:09:18 -05:00
FuriousFox
ba69a39802 Updated the list of which skies are associated with which maps, rearranged the list of character to match the character select in-game, and added myself to the file's credits.
(Re-did all of this because I think I messed up the branches and stuff last time.
2019-11-24 15:43:49 -05:00
Jaime Passos
c9ff8ec26b Fix FreeMipmapColormap crash 2019-11-24 17:37:11 -03:00
MascaraSnake
23643e05c0 Merge branch 'racexitmove' into 'master'
Racexitmove (resolves #342).

Closes #342

See merge request STJr/SRB2Internal!530
2019-11-24 13:15:08 -05:00
MascaraSnake
d4ca1fb6e7 Merge branch 'patch-1' into 'master'
ZoneBuilder Config Updates

See merge request STJr/SRB2Internal!520
2019-11-24 13:14:45 -05: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
toaster
fd657d2ff4 Fix bugs discovered in testing. 2019-11-24 15:06:37 +00:00
toaster
f602e5bfb7 "showconditionset" option for Unlockables and Extra Emblems. See merge request (coming shortly) for full description/prompt. 2019-11-24 14:35:31 +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
FuriousFox
9b36cc32c9 Added Dragonbomber 2019-11-23 16:37:33 -05: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
FuriousFox
869764be7d Added Blue Gargoyle and Green Flame 2019-11-23 15:04:59 -05:00
FuriousFox
bfae969ca6 Updated sprite for Minus 2019-11-23 14:21:48 -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
MascaraSnake
fa4c520ce0 Merge branch 'tailsupbruhtonium' into 'master'
Tails Flight Indicator Bruh Moment

Closes #331, #330, and #309

See merge request STJr/SRB2Internal!517
2019-11-23 10:15:16 -05: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
MascaraSnake
7400db00b7 Merge branch 'planes-mmx-fix' into 'master'
Fix missing MMX check

See merge request STJr/SRB2Internal!513
2019-11-22 16:09:03 -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