Commit Graph

6926 Commits

Author SHA1 Message Date
toaster 384533165c * Fix crash error in GL.
* Re-enable the perplayer stuff in V_DrawFadeFill - not worth having it disabled when it'll just have to be re-enabled later.
* Remove some "consistency with software" stuff in hw_draw.c that already has equivalents
2019-07-28 17:47:57 +01:00
toaster f47c3f40d1 Smoothen emerald rotation a tad. (Not gonna upload a new test exe, it's basically identical...) 2019-07-28 14:59:42 +01:00
toaster bebaf6f984 * Add comments for maintenence.
* Fix not-guaranteed-to-be-set-to-zero-ness of sparklloop
* Add blackrock sparkles to good ending.
* Don't have emerald sparkles be randomised.
* Adjust credits to include Sal (credits sprites + four merged internal MRs and a bunch of public ones) and a few other known contributors, plus remove oni's name (he requested i do it a whiiile ago)
2019-07-28 11:40:19 +01:00
toaster 7569e0b184 Good morning, fix three little things.
* Made the black rock animate backwards through its anim again, to match the 2.1 and earlier intro.
* Rid branch of mixed code declaration warnings.
* Other cleanup.
2019-07-28 10:41:00 +01:00
toaster 063e350c63 A good and bad ending cutscene now exist.
Also:
* SPR2_XTRA - instead of defining lumpnames in S_SKIN, those kinds of assets can just be bundled into the spriteset. Required for ending cutscene stuff, I guess, but also done for HUD life icon and character select image (aside from Sonic&Tails, still SOC'd in).
* Minor oversights in SPR2 support corrected.
* Better evaluation, featuring ending assets.
* Intro has warping-in blackrock, reusing ending assets.
* Cutscene text now supports lowercase (intro and custom).
* Disable the asset-fucking "gamma correction" I put in over two years ago when implementing colour cube. (This is the only thing I could move into another branch if you MUST, but it's basically invisble in the diff so w/e.)
* Don't blank the screen if the top left pixel of a screen-covering patch is transparent. (Checked via nonzero topdelta for first column)

Bugs:
* OPENGL ONLY: The first ~20 frames of both endings are fucked. A little help here? Might be HWR_DrawFadeFill's fault, which I just created. OR it could be in f_finale, but I doubt it, since it doesn't appear in Software.
2019-07-28 00:32:57 +01:00
Steel Titanium 9813cbc857 More icon stuff 2019-07-27 01:13:54 -04:00
Steel Titanium 64bb70bef4 Fix crash with GME sounds when being freed 2019-07-27 01:13:54 -04:00
Jaime Passos 3fb113e786
Merge pull request #18 from STJr/flats-png
Merge upstream's master into flats-png
2019-07-25 16:39:00 -03:00
Steel Titanium 39f348f853 Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal into linedef-award-rings 2019-07-24 21:18:45 -04:00
Steel Titanium 60ffef9830 More simplified code
Also delay is in tics, per MS' request.
2019-07-24 21:18:07 -04:00
Alam Ed Arias f67f9405bc Merge remote-tracking branch 'origin/master' into flats-png 2019-07-24 19:07:36 -04:00
Alam Ed Arias 0eb6b24415 Merge commit '45922f80d1e35aadc9da6e20fa32fa78c1044dfd' into flats-png 2019-07-24 18:17:01 -04:00
Steel Titanium 2075b525a9 Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal into musicplus-sdlmixerx 2019-07-22 22:22:12 -04:00
Steel Titanium c35afa2c96 Merge branch 'master' into musicplus-sdlmixerx 2019-07-22 22:20:08 -04:00
Steel Titanium af959ee309 Some fixup 2019-07-22 22:01:05 -04:00
Monster Iestyn cb278388f0 Merge branch 'recordattack-bg-fixes' into 'master'
Record Attack bg fixes

See merge request STJr/SRB2Internal!259
2019-07-20 11:33:06 -04:00
Monster Iestyn 0f8c046c6f On second thoughts I'll go back to 8 for length in these variables, since as far as I can tell the code doesn't need it to be longer anyway 2019-07-20 16:30:30 +01:00
Steel Titanium 6c2ef839c1 New award rings linedef executor 2019-07-18 22:42:46 -04:00
toaster 64517a1362 Fix !150, too 2019-07-18 00:16:01 +01:00
toaster 1d5e8e249e Successfully cause landing events when the ground moves up to hit you, as opposed to just when you move down to the ground. 2019-07-17 23:25:49 +01:00
toaster 82acf2de6b Fix Knuckles-in-quicksand messup. 2019-07-17 23:24:44 +01:00
toasterbabe 385d34e67e * Make busting a FOF through any in-game means (or not providing a target sector to EV_CrumbleChain) bust all FOFs with the same control sector.
* Make CA2_GUNSLINGER not get overridden by being in quicksand.
2019-07-17 21:34:04 +01:00
toaster 438c4d1d51 Fix spindash being broken in quicksand
# Conflicts:
#	src/p_mobj.c
#	src/p_user.c
2019-07-17 21:33:18 +01:00
Steel Titanium 181ecee202 Let's not use this 2019-07-16 19:26:16 -04:00
Steel Titanium 3ffb7b6192 New icons
Also update IMG_xpm.c
2019-07-16 19:20:00 -04:00
Monster Iestyn c8cfc3110f Merge branch 'public_next' 2019-07-16 18:28:49 +01:00
Monster Iestyn 6eaf7625a9 Merge branch 'master' into next 2019-07-16 18:26:46 +01:00
Monster Iestyn 3e708e62e8 Merge branch 'fix-gme-free' into 'master'
Fix crash with GME sounds when being freed

See merge request STJr/SRB2!504
2019-07-16 13:25:51 -04:00
Monster Iestyn e50147f7f0 Merge branch 'master' into recordattack-bg-fixes 2019-07-16 17:04:42 +01:00
James R 91502f1499 Don't send login final hashes to everyone
Someone thought it was a good fucking idea to make logins NetXCmds. NetXCmds
are sent to everyone however. Thankfully logins are two passes. And the second
pass uses a salt based on the playernum. Therefore, in order to actually make
use of the final hash, you'd have to be the same playernum as who originally
sent it. Still a stupid exploit.

P.S. The netcode is LOL XD by VincyTM -Telos
2019-07-15 16:14:00 -07:00
Monster Iestyn 5ef4dda9b9 Instead of ignoring blank menutypes in M_IterateMenuTree, ignore them in the MIT_ functions instead.
(I'm doing this because MIT_GetMenuAtLevel appears to actually care about whether menutype is zero or not unlike the others; I don't want to break the code designed around that)
2019-07-15 20:25:57 +01:00
Monster Iestyn 049789025f Merge branch 'titlesky-fixes' into 'master'
Titlemap fixes

See merge request STJr/SRB2Internal!258
2019-07-14 19:38:07 -04:00
Monster Iestyn d44a8ab78e Slightly unrelated tweak: bghide && titlemapinaction clearly takes precedence over bgname if both are present, so reorder these if statement blocks 2019-07-14 22:36:14 +01:00
Monster Iestyn a1e6f5bdb3 remove some of the GS_TIMEATTACK hacks I added because I now realise I can just turn titlemapinaction off when entering the menus \o/ 2019-07-14 22:28:19 +01:00
Monster Iestyn f6842a80b4 Fixes for menus:
* add gamestate != GS_TIMEATTACK checks to prevent Record Attack or NiGHTS Mode losing their backgrounds
* increase bgname to 9 to include the extra NULL byte? (is this a good idea actually)
* make M_IterateMenuTree ignore menu levels without a menutype value
2019-07-14 21:58:48 +01:00
Steel Titanium 4e839596a1
Fix crash with GME sounds when being freed 2019-07-14 14:55:04 -04:00
Monster Iestyn fac6de9c2e The titlemap glitches turned out to be linked to deathmatchstarts, which wasn't actually properly cleared out each level load ...let's actually fix that, lol.
(Neither were the CTF starts but those didn't directly cause any problems luckily)
2019-07-14 18:10:03 +01:00
sphere 79cf8eb08d Add a blue variant of the pole banner & change some doomednums. 2019-07-14 17:30:33 +02:00
Monster Iestyn 5c54022a89 Add static keyword to these variables for correctness 2019-07-14 16:23:01 +01:00
Monster Iestyn 794235a848 Fix mixed code-and-declaration error 2019-07-14 16:19:48 +01:00
Monster Iestyn 6cf82fbb43 Merge branch 'libopenmpt-fixes' into 'master'
Improved libopenmpt loading

See merge request STJr/SRB2Internal!251
2019-07-14 11:03:14 -04:00
MascaraSnake ca7de207d4 Merge branch 'wallspike-fix' into 'master'
Fix wall spikes that start retracted

See merge request STJr/SRB2Internal!255
2019-07-14 10:55:10 -04:00
Monster Iestyn d30af084d7 Merge branch 'thinkerlists-fix' into 'master'
Thinkerlists fix

Closes #161

See merge request STJr/SRB2Internal!253
2019-07-14 10:52:56 -04:00
sphere ee937c4df0 Add a blue variant of the waving flags. 2019-07-14 16:50:45 +02:00
sphere cfc56c9541 Don't upscale the waving flags, make them twice as large instead 2019-07-14 15:30:00 +02:00
toaster b3e953c8c3 Correct some extant fuckups. 2019-07-14 14:21:32 +01:00
MascaraSnake 441ef4b01b Merge branch 'wood-debris-unmute' into 'master'
Unmute wood debris

See merge request STJr/SRB2Internal!254
2019-07-14 04:07:38 -04:00
sphere 911b0262ee Whoops, forgot to revert this. 2019-07-14 02:31:33 +02:00
sphere 9c73424b4b Add spring flags: float for horizontal & no gravity for diagonal. 2019-07-14 02:17:44 +02:00
sphere 106f6498e2 Add meleestate to MT_WALLSPIKE. 2019-07-14 01:29:36 +02:00