lifning/SRB2
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
8335 commits 1 branch 29 tags 122 MiB
Commit graph

7220 commits

Author SHA1 Message Date
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
Jaime Passos 8de06a93f9 remove UINT8 wipecolorfill 2019-11-18 20:07:37 -03:00
MascaraSnake 2418e33a00 Merge branch 'cobalt-ai' into 'master' 
CobaltBW's Tails AI

See merge request STJr/SRB2Internal!358
 2019-11-18 17:26:28 -05:00
Jaime Passos 1e4060af8c remove unused levelwipes 2019-11-18 19:22:46 -03:00
MascaraSnake 3df0afb7db Merge branch 'f_wipes' into 'master' 
Colormapped fades

See merge request STJr/SRB2Internal!469
 2019-11-18 17:21:09 -05:00
MascaraSnake 7dc3484e5d Merge branch 'dragonbomber' into 'master' 
Dragonbomber

See merge request STJr/SRB2Internal!489
 2019-11-18 17:10:30 -05:00
Jaime Passos 1698e2d986 adjust duration 2019-11-18 19:08:04 -03:00
toaster 5eaa3fc3f8 Left this in by mistake. 2019-11-18 22:07:29 +00:00
toaster ab70512253 As requested by MotorRoach and doublechecked with MascaraSnake, DrT's Minus resprite. 2019-11-18 22:05:05 +00:00
Jaime Passos 8a05afa1aa Merge remote-tracking branch 'origin/master' into f_wipes 2019-11-18 18:48:19 -03:00
toaster 1fdcc270d8 Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into cobalt-ai 
# Conflicts:
#	src/p_map.c
 2019-11-18 21:33:51 +00:00
MascaraSnake 8adc5bd876 Merge branch 'titlecards' into 'master' 
Titlecards

See merge request STJr/SRB2Internal!492
 2019-11-18 16:22:32 -05:00
MascaraSnake 1365ef49b3 Merge branch 'jester-fireball' into 'master' 
Mario fireball by Jester (resolves #296)

Closes #296

See merge request STJr/SRB2Internal!487
 2019-11-18 15:56:33 -05:00
Jaime Passos aa659836ee Merge remote-tracking branch 'origin/master' into titlecards 2019-11-18 17:55:47 -03:00
Steel Titanium 8d9ef84970
Merge branch 'master' of git.magicalgirl.moe:STJr/SRB2Internal 2019-11-18 15:41:57 -05:00
MascaraSnake baaec6f191 Merge branch 'nightstail' into 'master' 
NiGHTS tail

See merge request STJr/SRB2Internal!482
 2019-11-18 15:41:52 -05:00
Steel Titanium efac76f833
Merge branch 'public_next' into 'master' 2019-11-18 15:39:41 -05:00
MascaraSnake 2001cad144 Merge branch 'capsuletweaks' into 'master' 
Egg Capsule tweaks

See merge request STJr/SRB2Internal!474
 2019-11-18 15:24:13 -05:00
MascaraSnake 1210545a8e Merge branch 'fhzenemytweaks' into 'master' 
Hardcode DrT's FHZ improvements (resolves #295).

Closes #295

See merge request STJr/SRB2Internal!483
 2019-11-18 15:21:59 -05:00
MascaraSnake 7a48a8d72d Merge branch 'poledance' into 'master' 
Make ACZ3's slapstick signpost taller (resolves #267).

Closes #267

See merge request STJr/SRB2Internal!473
 2019-11-18 15:14:48 -05:00
MascaraSnake 233ff8bd27 Merge branch 'exit-move-lj' into 'master' 
Post-exit movement

See merge request STJr/SRB2Internal!486
 2019-11-18 15:10:15 -05:00
MascaraSnake 5649365c19 Merge branch 'titlecard-lowercase-support' into 'master' 
Lowercase support in titlecards

See merge request STJr/SRB2Internal!481
 2019-11-18 15:05:02 -05:00
MascaraSnake 98f2ee598d Merge branch 'endingmus' into 'master' 
Ending music and associated

See merge request STJr/SRB2Internal!475
 2019-11-18 14:33:22 -05:00
toaster 508fdb493b compilation fixes (no review yet, currently just about to have dinner) 2019-11-18 19:22:51 +00:00
MascaraSnake 3e7e749327 Merge branch 'reset-rollangle' into 'master' 
Reset rollangle

See merge request STJr/SRB2Internal!494
 2019-11-18 14:11:32 -05:00
MascaraSnake 881524a2d7 Merge branch 'signpost-cleanup' into 'master' 
Signpost camera cleanup

See merge request STJr/SRB2Internal!490
 2019-11-18 14:00:05 -05:00
MascaraSnake 778543af08 Merge branch 'pingimprovements' into 'master' 
Better ping implementation.

See merge request STJr/SRB2Internal!488
 2019-11-18 13:58:41 -05:00
MascaraSnake dbdbc116c7 Merge branch 'metalbwarp' into 'master' 
Fix Metal Sonic not correctly flipping with gravity (Resolve #289).

Closes #289

See merge request STJr/SRB2Internal!472
 2019-11-18 13:39:22 -05:00
Jaime Passos dc70a24b30 restore zigzags 2019-11-18 15:32:48 -03:00
Jaime Passos b7f2b74d9a V_PERPLAYER did exactly what I did not want it to do so I'll disable these elements 2019-11-18 15:18:27 -03:00
Jaime Passos 29792c7a2b missing prototype 2019-11-18 15:13:31 -03:00
Jaime Passos cf24b57d8f perplayer 2019-11-18 15:12:55 -03:00
Jaime Passos 5c55c86dd2 invert conditional 2019-11-18 15:06:07 -03:00
MascaraSnake 9da5932d88 Merge branch 'damnnothere' into 'master' 
Disable the GL sprite shadows behind a #define.

See merge request STJr/SRB2Internal!485
 2019-11-18 13:05:43 -05:00
MascaraSnake 535aa79418 Merge branch 'firefuck' into 'master' 
Firefuck (resolves #291).

Closes #291

See merge request STJr/SRB2Internal!476
 2019-11-18 13:05:00 -05:00
Jaime Passos 85f1b847e9 LF_WARNINGTITLE 2019-11-18 15:04:40 -03:00
MascaraSnake 3e7242af3c Merge branch 'papersign3' into 'master' 
I fucked up papersigns (Resolve #288).

Closes #288

See merge request STJr/SRB2Internal!471
 2019-11-18 13:03:46 -05:00
Jaime Passos 444953d0bb oh sh 2019-11-18 14:32:34 -03:00
Jaime Passos 6920d20a0f map header option 2019-11-18 14:08:47 -03:00
Jaime Passos e40bf85a6f lua 2019-11-18 13:50:44 -03:00
Jaime Passos 4ea3513076 Organize 2019-11-18 12:56:41 -03:00
lachwright f786a8dbf6 Important fixes & mine lob speed reduction 2019-11-18 22:57:26 +08:00
Jaime Passos 9d17614c55 arg 2019-11-18 11:42:45 -03:00
Jaime Passos 6c98dde736 stuff 2019-11-18 11:39:54 -03:00
lachwright 280d151d76 Allow positive momentum retention when jumping off rollout rocks 2019-11-18 22:36:25 +08:00
toaster 0e71edeb50 In the absence of a proper revamp of the badnik, give the Deton the SPB sound from Kart when it sees the player, as a teaching shorthand and/or easter egg. 2019-11-18 13:27:02 +00:00
lachwright 27fcaf0f93 Whoops, deleted a little too much by accident 2019-11-18 16:26:15 +08:00
lachwright 4c432c376e Make camera use signpost's ground z coordinate instead of the player's z coordinate 2019-11-18 16:22:12 +08:00
lachwright f682de3f1b Fix controllable flight ending when player hits the ground while being carried by Tailsbot 2019-11-18 15:55:55 +08:00
lachwright bb67b24143 Add flight indicator 2019-11-18 15:17:27 +08:00
Steel Titanium 5ad00ccd2e
Add Azeonus/SwitchKaze's name 2019-11-18 01:16:44 -05:00
lachwright 70051bd794 Don't let the bot decide to fly if it doesn't have the ability to fly 2019-11-18 13:37:09 +08:00
lachwright 52a24e0bc4 Allow AI Tails to carry the player 2019-11-18 13:30:07 +08:00
lachwright bf4dbead74 Update to latest script version 2019-11-18 11:22:27 +08:00
Jaime Passos 8a7b3d7022 Merge remote-tracking branch 'origin/master' into titlecards 2019-11-17 23:57:18 -03:00
James R 4439d29ed7 Shift showping display up a bit 2019-11-17 18:54:23 -08:00
James R b05dec5294 Shift ping display in scores HUD up, so it aligns with the bottom of player name 2019-11-17 18:53:17 -08:00
James R 22421b1031 Snapping for showping, so it doesn't jump way up on non-green 2019-11-17 18:52:05 -08:00
lachwright ac7d07c9da Prevent mines from sliding upon touching the ground 2019-11-18 10:35:56 +08:00
Louis-Antoine b4987636fe Add missing checks for PF_FINISHED in HUD code 2019-11-18 03:27:39 +01:00
lachwright 76831595ce Merge branch 'master' into cobalt-ai 2019-11-18 10:13:16 +08:00
Steel Titanium 2584241a44
Better ping implementation. 2019-11-17 20:22:47 -05:00
Jaime Passos 635e121bfc Restore old sound effect 2019-11-17 21:33:59 -03:00
Jaime Passos 64939816fb Fireball 2019-11-17 21:25:17 -03:00
Louis-Antoine 24744d07e4 Disable exitmove by default 2019-11-17 23:52:51 +01:00
Louis-Antoine 688bf0158d Disable Tails carrying for players who completed the level 
To avoid trolls...
 2019-11-17 23:46:34 +01:00
Louis-Antoine 6c98a150be Show the exit icon for finished players 2019-11-17 23:44:48 +01:00
toaster 4cc1b2b327 Disable the GL sprite shadows behind a #define. 
Reasoning:
* They're horribly broken (they completely ignore slopes).
* A similar final demo GL-only feature (coronas) has been completely disabled.
* Nobody's going to bugfix them before release because not even the devteam's resident GL users use them.
* They look ugly.
 2019-11-17 22:18:46 +00:00
lachwright cf53e255eb Remove tester console prints 2019-11-18 05:31:26 +08:00
lachwright 5cafed5c72 Make rollout rocks more friendly 2019-11-18 05:30:14 +08:00
lachwright b721c035f8 Add Dragonbomber enemy 2019-11-18 05:23:59 +08:00
sphere 440515e3af whoops 2019-11-17 22:13:38 +01:00
toaster ef5558af97 Hardcode DrT's FHZ improvements. Puttin' the FREEZE in feature freeze amirite haha 2019-11-17 20:34:25 +00:00
toaster 0c98fb746c Add some NiGHTS animations which default to normal player sprite2s to the existing player->panim set list, which makes Tails' tails appear due to how P_DoTailsOverlay is coded (assuming the skin is Tails, requiring them to have SPR2_NFLY available). 2019-11-17 18:04:02 +00:00
toaster 8ce054a7c8 Align to base rather than top. 2019-11-17 15:55:22 +00:00
toaster 5909b85627 Fix overlapping on You Can Now Become Super Sonic screen. 2019-11-17 15:20:20 +00:00
toaster 76897b560f Update end tally and sound test to accomodate new title font. 2019-11-17 14:56:05 +00:00
toaster fdd681ab72 Since I had to tweak this branch to do the scrapped changing-to-title-music-at-a-different-time thing (since it was too late, and too late is WAY worse than too early): Have the credits music fade out over a shorter time when going to the title screen (vs going to evaluation), as opposed to stopping entirely. 2019-11-17 14:14:38 +00:00
Nev3r 5dc494da16
Mapname lowercase support (#146) 
*  Moved levelname parsing to before where uppercase conversion occurs.
*  Extended titlecard font range.
*  Replaced misc. "ZONE" strings with "Zone" for titlecard purposes.
*  Don't convert to uppercase when rendering the titlecard name.


Signed-off-by: Nev3r <apophycens@gmail.com>
 2019-11-16 20:36:25 -05:00
MascaraSnake 144502729a Merge branch 'sprinfo-bruh-moment' into 'master' 
Freed before read, oops!

See merge request STJr/SRB2Internal!470
 2019-11-16 12:54:21 -05:00
MascaraSnake 8adf564c41 Merge branch 'clearer-nodes-command' into 'master' 
Make the "nodes" command clearer

See merge request STJr/SRB2Internal!477
 2019-11-16 12:53:31 -05:00
MascaraSnake d3fe116298 Merge branch 'fix-default-snac' into 'master' 
defaultname, defaultskin and defaultcolor changes

See merge request STJr/SRB2Internal!479
 2019-11-16 12:52:48 -05:00
James R 82ad6685a6 Remove defaultname, since players are probably sure on their name change 2019-11-15 17:32:43 -08:00
James R 6595d20709 Move setting from defaults to M_FirstLoadConfig, so it triggers even when the title screen doesn't start 2019-11-15 17:31:53 -08:00
Louis-Antoine 8b3e4d122b Show player number instead of node when someone joins 2019-11-16 01:42:02 +01:00
James R 53f5d7ffc3 Don't confuse node with player in commands 
(cherry picked from commit 17bdf39dc8372ed9c6c31fa8d00eba03396a55bf)
 2019-11-15 16:07:15 -08:00
Jaime Passos 12e8c11382 Update hw_main.c 2019-11-15 19:40:58 -03:00
Jaime Passos 55c42d9cb7 Small mistake 2019-11-15 19:36:25 -03:00
Jaime Passos 5b0730839b Move scope of wipelumpname 2019-11-15 19:09:02 -03:00
Jaime Passos 41835e07ea I don't get it 2019-11-15 19:04:40 -03:00
Jaime Passos 7ba7620059 Shadowed declaration and unused parameters 2019-11-15 18:58:45 -03:00
Steel Titanium aff55ee27b
Fix crash when using the -connect startup paramater (Resolves #292) 2019-11-15 16:57:47 -05:00
Jaime Passos f55b0f52ca Accidental missing (void) 2019-11-15 18:53:32 -03:00
Jaime Passos c15ee65015 LEVELWIPES 2019-11-15 18:21:12 -03:00
Louis-Antoine 29501a992b Merge branch 'master' into exit-move-lj 2019-11-15 19:35:47 +01:00
Louis-Antoine d95a1e2ff3 Make the "nodes" command clearer 
Because literally anyone who isn't a dev has
no idea what those fucking numbers even mean...

Before:
$nodes
00 - Sonic - 01 - 666.66.420.42:5029
01 - Tales - 00 - self
02 - Nukes - 255
03 - Ammie - 255
04 - Fangs - 255
05 - Metal - 255

After:
$nodes
00 - Sonic - node 01 - 666.66.420.42:5029
01 - Tales - node 00 - self
02 - Nukes
03 - Ammie
04 - Fangs
05 - Metal
 2019-11-15 17:50:40 +01:00
toaster 98712ad703 Resolve #291. 2019-11-15 16:39:30 +00:00
toaster efa609d366 Ending music and associated. 
* Play the good or bad ending track, instead of perfect silence.
* Fade out the credits music over 5 seconds when the credits go to the evaluation (timed to have finished just before the "you unlocked this!" jingle).
 2019-11-15 15:58:25 +00:00
toaster 52bd4b05e1 * Make the Egg Capsule only explode for one second, but have the number of explosions (and flickies) multiplied 1.5 times. 
* If the player is spindashing when the level is exited, they will un-spindash. (Currently you get stuck in charging)
 2019-11-15 15:20:36 +00:00
toaster 892f6eca27 Make ACZ3's slapstick signpost taller (resolves #267). 2019-11-15 14:52:34 +00:00
Louis-Antoine ff62a0732a Let players move after completing the level 
This only takes effect in co-op,
and can be disabled with "exitmove off"
 2019-11-15 15:35:28 +01:00
toaster d91d07da5b Fix Metal Sonic not correctly flipping with gravity. (Doesn't require a new Metal recording.) 2019-11-15 13:10:41 +00:00
toaster 66001cc73c Resolve #288. 
* Fix off-by-one error I caused in the skin randomisation selection.
* Clean up signcolour set to never go outside of valid entry range.
* Fix the preventing-console-spam mechanism for invalid sprites viewed in-game by only setting the state's sprite/frame to S_UNKNOWN's if the object's sprite/frame is currenly equal to the state's.
 2019-11-15 12:47:21 +00:00
James R 56e5e3a01e Deobfuscate the R_ParseSpriteInfo call 2019-11-14 19:56:26 -08:00
James R aa158cccd9 Freed before read, oops! 2019-11-14 19:28:33 -08:00
Jaime Passos 88fb22d688 Yeah, yeah... 2019-11-14 22:14:40 -03:00
Jaime Passos 76488d835f F_WipeColorFill 2019-11-14 21:31:20 -03:00
Jaime Passos cc5c70ce7b Merge remote-tracking branch 'origin/master' into f_wipes 2019-11-14 20:50:09 -03:00
toaster d0fac1988a Merge branch 'rotsprite_toast' into 'master' 
Fix incorrect offsets of cached rotsprites

See merge request STJr/SRB2Internal!468
 2019-11-14 18:49:12 -05:00
Steel Titanium b287cc90a7 Merge branch 'master' into next 2019-11-14 18:41:57 -05:00
Jaime Passos 6be45ec241 Merge remote-tracking branch 'origin/master' into f_wipes 2019-11-14 20:24:42 -03:00
toaster 46e8bf2f30 Fix incorrect offsets of cached rotsprites 2019-11-14 23:22:18 +00:00
Steel Titanium a5ac342c5f Merge branch 'ferror-you-were-lied-to' into 'master' 
Fix false file error reporting

See merge request STJr/SRB2!514
 2019-11-14 18:20:34 -05:00
James R d36086ba33 Clang warning 2019-11-14 15:12:50 -08:00
MascaraSnake 80fd112009 Merge branch 'papersign2' into 'master' 
Paper sign tweaks

See merge request STJr/SRB2Internal!460
 2019-11-14 18:07:34 -05:00
MascaraSnake 6c6d89ca57 Merge branch 'flickies_not_in_walls' into 'master' 
Flickies not in walls

See merge request STJr/SRB2Internal!461
 2019-11-14 18:07:19 -05:00
MascaraSnake 031a352f72 Merge branch 'titleflash' into 'master' 
Improved title screen flashes

See merge request STJr/SRB2Internal!462
 2019-11-14 18:07:05 -05:00
MascaraSnake 3d8043ff64 Merge branch 'map-by-name' into 'master' 
LJ saved me from self destruction by bad code

See merge request STJr/SRB2Internal!463
 2019-11-14 18:06:52 -05:00
MascaraSnake b0786f12de Merge branch 'coop-item-respawn' into 'master' 
Allow item respawn in co-op again

See merge request STJr/SRB2Internal!466
 2019-11-14 18:06:32 -05:00
Jaime Passos d95a93b537 Merge remote-tracking branch 'origin/master' into f_wipes 2019-11-14 19:57:51 -03:00
MascaraSnake 07ea748d96 Merge branch 'soundsystemfix' into 'master' 
Sound system startup fix

Closes #281

See merge request STJr/SRB2Internal!465
 2019-11-14 17:50:41 -05:00
MascaraSnake 8f6890025c Merge branch 'secretstuff' into 'master' 
The letter

See merge request STJr/SRB2Internal!438
 2019-11-14 17:49:23 -05:00
Louis-Antoine f4beb4a56f Disable monitor respawning in co-op 2019-11-14 22:27:02 +01:00
Louis-Antoine 18dc6013ed Disable item respawn in NiGHTs levels 2019-11-14 21:21:42 +01:00
MascaraSnake 3352f914d7 Merge branch 'rotsprite_i' into 'master' 
Sprite rotation (resolves #183)

Closes #183

See merge request STJr/SRB2Internal!430
 2019-11-14 14:58:13 -05:00
toaster 15da6c153a Woops, condition was accidentially inverted... but also I decided this looks nicer instead. 2019-11-14 19:09:17 +00:00
Louis-Antoine cccf1c8a7b Disable perfect bonus in multiplayer 2019-11-14 19:25:19 +01:00
toaster 278ddcf770 Merge branch 'rotsprite_i' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into rotsprite_toast 2019-11-14 17:15:34 +00:00
Jaime Passos 8506d420a6 Optimise 2019-11-14 14:12:36 -03:00
toaster afe28b0a0a * Remove the 22(!!) NiGHTS sprite2s that no longer get used in ROTSPRITE builds (which should be our main builds going forward). 
* Rename `SPR2_NGT0` to `SPR2_NFLY`, and `SPR2_DRL0` to `SPR2_NDRL` to account for this. (requires modifying player.dta)
 2019-11-14 17:03:02 +00:00
Jaime Passos 10d1b63ff2 Merge remote-tracking branch 'origin/master' into rotsprite_i 2019-11-14 12:49:03 -03:00
Jaime Passos cb4820c505 Oh. Sorry. 2019-11-14 12:42:45 -03:00
Louis-Antoine ffd9cfebe6 Allow item respawn in co-op again 
Why was it even disabled anyway.
 2019-11-14 16:37:09 +01:00
Jaime Passos 4292c5fc0b Other things I missed. Also added SF_NONIGHTSROTATION. Do I even have to keep the old behaviour? I have no idea. 2019-11-14 12:27:22 -03:00
toaster 261041dc69 Resolve #281. (Might have problems with non-SDL interfaces, but definitely good for what we're shipping with.) 2019-11-14 14:19:13 +00:00
toaster da1b4f2277 Disable menu input on the title screen for the first second (ie, before the flash), to guarantee people won't start the menu the very first tic after the fade and ruin the animation. (Console and gif/screenshot recording still works, for the impatient.) 2019-11-14 12:52:34 +00:00
James R b38a1ec313 Save bans when cleared too 
(Why doesn't it work for I_Quit?)
 2019-11-13 17:37:53 -08:00
toaster 761bd41eb5 I'm a dumbass who makes extremely consequential typoes (and since the typo is no longer in effect, the supergold can be brightened some more) 
https://cdn.discordapp.com/attachments/244035368595357697/644316971738857483/srb20060.gif
 2019-11-13 23:27:01 +00:00
James R 7776c59cdd Warn if the gametype is not valid at all! 2019-11-13 14:31:44 -08:00
James R 359d8a2c25 Optimizations from LJ and generic functions 2019-11-13 14:26:28 -08:00
toaster 3afe152a86 Sev wanted no darkness during the initial animation... I think this is an acceptible compromise! 
https://cdn.discordapp.com/attachments/428262628893261828/644295409283497995/srb20058.gif
 2019-11-13 22:02:06 +00:00
toaster 39d80e1cba https://cdn.discordapp.com/attachments/244035368595357697/644293089049182218/srb20057.gif 
* Make the white flash a little easier on the eyes by putting the full-screen fade behind the title wing/ring, then drawing multiple overlaid colormapped versions of them on top of each other.
* Darken the pre-flash screen.
 2019-11-13 21:52:35 +00:00
toaster a3de6d21c4 * Add a "moveforward" param to P_InternalFlickySpawn, which controls whether to spawn the flicky a little in front or behind of the object making it. 
* Expose this via additional upper-16-bits flags of A_FlickySpawn.
* Use this to make Snailers not spawn their flicky inside the wall they're attached to.
* Make the behaviour of Egg Capsules more consistent mechanically regarding the flicky spawning, using the above as one relevant element.
 2019-11-13 20:14:08 +00:00
MascaraSnake 14477748be Merge branch 'stopclock' into 'master' 
Stop the clock!

See merge request STJr/SRB2Internal!450
 2019-11-13 14:39:59 -05:00
MascaraSnake 7cfc7b38c5 Merge branch 'forceskin_bs' into 'master' 
MP Charsel menu fixes

See merge request STJr/SRB2Internal!457
 2019-11-13 14:00:11 -05:00
MascaraSnake 750e826310 Merge branch 'skinusablua' into 'master' 
Skin UsabLua

See merge request STJr/SRB2Internal!458
 2019-11-13 13:59:36 -05:00
MascaraSnake 1d7ce8d955 Merge branch 'radiomode2' into 'master' 
Radio Mode fixes

See merge request STJr/SRB2Internal!459
 2019-11-13 13:58:26 -05:00
MascaraSnake 510f36fbdf Merge branch 'map-by-name' into 'master' 
New map command

See merge request STJr/SRB2Internal!424
 2019-11-13 13:45:36 -05:00
toaster ec44b24f72 Ok, I'm really paying for my hubris. Corrected a faulty optimisation in my fix. 2019-11-13 17:06:54 +00:00
toaster 527195c214 I should be more careful when commiting, lmao. (Just a little bit of tying off loose ends for peace of mind.) 2019-11-13 16:59:29 +00:00
toaster fc8392dac4 Typo (my fault). 2019-11-13 16:54:51 +00:00
toaster b4da50b7fb When you have the skin to set to in A_SignPlayer be "next skin", it's possible the initial skin to pick is a not-available character. This commit prevents that. 2019-11-13 16:51:50 +00:00
toaster 471ae8ecb4 Paper sign tweaks. 
* Add "twinkling" and "landing sounds to paper signpost.
* Fix whitespace on definitions.
* It says locvar2 is unused in the comment for A_SignSpin, but it's used for the "doesn't have a spawnpoint" thing. Make it deathstate instead, so the object doesn't disappear.
 2019-11-13 16:33:53 +00:00
Jaime Passos 9caf98aa0b nevermind 2019-11-13 13:20:55 -03:00
Jaime Passos 69fe096140 reset rollangle 2019-11-13 13:03:02 -03:00
Jaime Passos c51e116c7d actually, 2019-11-13 13:00:57 -03:00
Jaime Passos fc3edc3558 make S_PLAY_NIGHTS_PULL use A_RollAngle 2019-11-13 12:57:22 -03:00
Jaime Passos a9183b474b rename rollaxis to rotaxis 2019-11-13 12:47:30 -03:00
Jaime Passos b54f6181c3 Rotation axis (will rename internally later) 2019-11-13 12:36:44 -03:00
toaster a7f2931b47 Update SFX definition to credit VAdaPEGA specifically, given we've made most credits more specific now too. 2019-11-13 15:02:06 +00:00
toaster 7b640bc81e * Prevent (extremely unlikely) wraparound of patch frame calculation for the epynomous Radio (sigsegv prevention). 
* Use thinstring for Authors field on the screen.
 2019-11-13 13:44:00 +00:00
MascaraSnake d591554a5d Merge branch 'radiomode' into 'master' 
Radio mode

See merge request STJr/SRB2Internal!443
 2019-11-13 04:16:38 -05:00
James R c9aad2d186 Warn if the first argument is an option 2019-11-12 18:29:42 -08:00
James R 46fbed8b71 Get map name from multiple arguments 
(This means you don't need quoting.)
 2019-11-12 17:42:54 -08:00
Jaime Passos 245881ec55 Merge remote-tracking branch 'origin/master' into rotsprite_i 2019-11-12 21:38:02 -03:00
James R 5fd6561d46 So you don't like macros? 2019-11-12 16:10:00 -08:00
Jaime Passos 3354169769 Merge remote-tracking branch 'origin/master' into f_wipes 2019-11-12 20:36:06 -03:00
MascaraSnake c87297e3df Merge branch 'a_skullattack-hang' into 'master' 
GFZ3's boss hangs when dodging

See merge request STJr/SRB2Internal!403
 2019-11-12 18:25:58 -05:00
MascaraSnake d9558fb724 Merge branch 'atz-hazards' into 'master' 
Azure Temple Zone hazards, round 2

See merge request STJr/SRB2Internal!437
 2019-11-12 18:05:44 -05:00
toaster 5729ba3cd2 Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into metalrecording 
# Conflicts:
#	src/p_user.c
 2019-11-12 21:56:46 +00:00
MascaraSnake 66123b8165 Merge branch 'internal-md3-vanilla-c' into 'master' 
Internal MD3 merge 2 good riddance glBegin

See merge request STJr/SRB2Internal!362
 2019-11-12 15:44:20 -05:00
MascaraSnake 17c302e4a3 Merge branch 'texture-flats-optimization' into 'master' 
Texture flat optimization

Closes #257

See merge request STJr/SRB2Internal!405
 2019-11-12 15:42:04 -05:00
MascaraSnake 17013bf1b7 Merge branch 'jingle-fixes' into 'master' 
Fix some jingle resuming behavior when also changing base level music

See merge request STJr/SRB2Internal!415
 2019-11-12 15:41:53 -05:00
MascaraSnake bffa281d91 Merge branch 'titlemap-on-connect' into 'master' 
Render title map on connecting to server screen too (closes #166)

Closes #166

See merge request STJr/SRB2Internal!416
 2019-11-12 15:41:07 -05:00
MascaraSnake b04452f7de Merge branch 'nonightsbot2' into 'master' 
Properly fix bot showing up in NiGHTS stages (resolves #261 for real).

Closes #261

See merge request STJr/SRB2Internal!417
 2019-11-12 15:41:01 -05:00
MascaraSnake 6b567bfb5c Merge branch 'dashmodecut' into 'master' 
Dashmode polish

Closes #266

See merge request STJr/SRB2Internal!418
 2019-11-12 15:40:46 -05:00
MascaraSnake 857dbd8488 Merge branch 'knuxstuff' into 'master' 
Knuckles changes: the fixes

See merge request STJr/SRB2Internal!428
 2019-11-12 15:40:15 -05:00
Jaime Passos 91a01be891 Merge remote-tracking branch 'origin/master' into rotsprite_i 2019-11-11 14:41:55 -03:00
Jaime Passos 4e6513b583 Merge remote-tracking branch 'origin/master' into texture-flats-optimization 2019-11-11 14:05:03 -03:00
MascaraSnake 3580977eb3 Merge branch 'elementalgoop' into 'master' 
THZ goop and Elemental (Resolve #260, I hope?)

Closes #260

See merge request STJr/SRB2Internal!419
 2019-11-11 11:42:19 -05:00
MascaraSnake 049e599f2e Merge branch 'spinny-sign' into 'master' 
Papersprite end signpost

See merge request STJr/SRB2Internal!442
 2019-11-11 11:39:56 -05:00
MascaraSnake 4cdabb2aaf Merge branch 'fuck-globals' into 'master' 
I_Error if memory allocation size overflows

See merge request STJr/SRB2Internal!426
 2019-11-11 11:38:07 -05:00
MascaraSnake aa5a3a46e8 Merge branch 'gamedata-param' into 'master' 
Custom gamedata parameter

See merge request STJr/SRB2Internal!423
 2019-11-11 11:36:53 -05:00
MascaraSnake 41b95437da Merge branch 'rvz-cleanup' into 'master' 
RVZ1 lag reduction

See merge request STJr/SRB2Internal!445
 2019-11-11 11:29:53 -05:00
MascaraSnake d1e800e1a8 Merge branch 'inflivesfix' into 'master' 
Prevent infinite lives rollover to extremely negative numbers.

See merge request STJr/SRB2Internal!446
 2019-11-11 11:25:20 -05:00
MascaraSnake 2edb852f2c Merge branch 'pmomztweak' into 'master' 
Fix pmomz (resolves #64!?)

Closes #64

See merge request STJr/SRB2Internal!447
 2019-11-11 11:24:01 -05:00
MascaraSnake c85f471911 Merge branch 'kill-these-please' into 'master' 
Kill the new compiler errors (since GCC 9?)

See merge request STJr/SRB2Internal!448
 2019-11-11 11:23:16 -05:00
MascaraSnake afd461a860 Merge branch 'skin-wads-again' into 'master' 
So I don't know what a skin wad is... (closes #282)

Closes #282

See merge request STJr/SRB2Internal!449
 2019-11-11 11:22:30 -05:00
MascaraSnake 7c7fc35ec5 Merge branch 'deathlaunch' into 'master' 
Fix players being launched by slopes and pmomz when dying.

See merge request STJr/SRB2Internal!452
 2019-11-11 11:22:12 -05:00
MascaraSnake 2e1e9b13d9 Merge branch 'magicalmovingfire' into 'master' 
Magical moving fire

Closes #278

See merge request STJr/SRB2Internal!453
 2019-11-11 11:18:20 -05:00
MascaraSnake f79da2fb3f Merge branch 'walltransfermovev2' into 'master' 
Let players roll AND move after spinning off a wall transfer

Closes #274

See merge request STJr/SRB2Internal!456
 2019-11-11 11:17:32 -05:00
Digiku c2d09ac4e4 Merge branch 'new-title-multi-res' into 'master' 
2.2 Title Screen

See merge request STJr/SRB2Internal!439
 2019-11-11 08:46:36 -05:00
toaster acc13c1a4a * Add R_SkinUsable to Lua. 
* Make R_SetPlayerSkin check for usability of skin before setting, and error otherwise.
 2019-11-10 16:10:34 +00:00
toaster e388b34abe * Correctly grey out skin on MP charsel menu if skinchange is restricted. 
* Also grey out colour if team gametype.
 2019-11-10 15:21:14 +00:00
toaster 8e2cb88576 Lach wanted to do this, but we might have a release candidate before he gets back, so did it myself. 
Make the wall transfer while spinning PF_SPINNING|PF_THOKKED. This:
* Prevents PF_MULTIABILITY players from using their ability after a wall transfer.
* Has a more specialised case which allows players to roll after having wall-transferred while spinning.
* (side effect) allows modders to apply PF_THOKKED any time for more controllable spinning.
 2019-11-09 17:49:26 +00:00
toaster 98b08580f5 Fix broken dehacked table. 2019-11-09 17:17:05 +00:00
toaster aaddfada50 Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into spinny-sign 2019-11-09 16:44:06 +00:00
toaster 26e534304d Signed/unsigned comparison error 2019-11-09 16:43:44 +00:00
toaster 2f22547889 Merge branch 'fix-players-typos' into 'master' 
Fix silly typo :P

See merge request STJr/SRB2Internal!454
 2019-11-09 11:29:18 -05:00
Louis-Antoine 068c712824 Shut up 2019-11-09 17:24:10 +01:00
Louis-Antoine aa20e304cf Fix silly typo :P 2019-11-09 15:46:34 +01:00
Jaime Passos 773f2efdd9 minor fixes 2019-11-09 01:45:00 -03:00
Jaime Passos b88a37949e Use REDFLR for missing flats 2019-11-09 00:08:22 -03:00
Jaime Passos 249cf5c8ad fix invisible planes, fix flat animation 2019-11-08 23:42:15 -03:00
Jaime Passos ae838d4879 Merge remote-tracking branch 'origin/master' into texture-flats-optimization 2019-11-08 23:01:29 -03:00
Jaime Passos 809f79c951 make hwrender compile 2019-11-08 22:58:41 -03:00
Jaime Passos 5f4d6c4545 Avoid running setter metamethods when not appropriate to do so 2019-11-08 22:13:50 -03:00
toaster d8b14e54c9 Resolve #278. 2019-11-08 21:43:39 +00:00
toaster 24e5ccec0b Fix players being launched by slopes and pmomz when dying. 2019-11-08 19:40:40 +00:00
lachwright 3734eab7b6 Add signpost camera (and fix a typo whoops) 2019-11-09 00:47:51 +08:00
toaster a82902a378 Minor addition: Get in the way less when doing Record Attack stuff in DEVELOP builds. (Can revert before this branch is merged, but was necessary to test...) 2019-11-08 15:48:11 +00:00
toaster d8ad0b4eaa STOP THE CLOCK linedef exectutor! 
* When activated, stops the timer in SP/MP.
* Applies to the mapheader countdowntimer as well.
* If you're playing Record Attack, also exits the level immediately.
* It has no special modes, no linedef flags, no parameters, nothing.
* Only not an innate property of A_BossDeath because people may want it to NOT happen sometimes, or make it happen with non-boss events too.

Also, skip over calling P_DoPlayerExit if the player isn't in game.
 2019-11-08 15:47:12 +00:00
toaster bb182b9ec7 Resolve #283. 2019-11-08 13:58:53 +00:00
toaster 292791ffaf Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into metalrecording 2019-11-08 13:02:32 +00:00
lachwright 8203c6ae90 Add support for custom sign color with var2 (shortcut for requests I sometimes got from character spriters in 2.1, e.g. neon green Pointy Sonic using a purple sign) 2019-11-08 20:09:12 +08:00
lachwright bd9878eb48 Merge branch 'master' into spinny-sign 2019-11-08 19:59:08 +08:00
Jaime Passos c4d7fe7c5a finish lua spriteinfo :] 2019-11-07 23:42:14 -03:00
James R 6ac613b2ca Move this "skin wads" check so that PK3 can work with it 2019-11-07 18:27:06 -08:00
James R 99cd5161be Also allocate mipmap for MD2 2019-11-07 18:04:53 -08:00
James R d2a7a87c7f Fix nonpacked to packed cast for OpenGL 2019-11-07 16:30:29 -08:00
James R ceb8d298c2 Fix misaligned pointers 2019-11-07 16:29:58 -08:00
James R 7a770fa63c Lol it's the wrong union! 2019-11-07 16:22:25 -08:00
James R b157c21a35 There's some whitespace... 2019-11-07 14:56:42 -08:00
James R d9a54a6b61 Merge branch 'intermission-buffer' into 'master' 
Restore the last gameplay frame while on the intermission screen

See merge request STJr/SRB2Internal!444
 2019-11-07 17:53:36 -05:00
James R e5f3863708 Merge branch 'recordattack-menu-draw-fix' into 'master' 
Record attack fixes

See merge request STJr/SRB2Internal!441
 2019-11-07 17:53:03 -05:00
James R 184a754c2e Merge branch 'fix-nopng-warnings' into 'master' 
Fix warnings when NOPNG=1

See merge request STJr/SRB2Internal!432
 2019-11-07 17:52:31 -05:00
James R ad4c55c10b Merge branch 'fix-uppercase-in-intro-fades' into 'master' 
Fix some intro fades displaying text in all-caps

See merge request STJr/SRB2Internal!429
 2019-11-07 17:52:17 -05:00
James R dcfd088aef Merge branch 'lotsacontinues' into 'master' 
Lotsa Continues (resolves #264)

Closes #264

See merge request STJr/SRB2Internal!422
 2019-11-07 17:52:01 -05:00
James R 546f313616 Merge branch 'secrets-charsel-music-fix' into 'master' 
Fix char select music not playing in secrets menu

Closes #272

See merge request STJr/SRB2Internal!421
 2019-11-07 17:51:38 -05:00
James R 9f24ef25bf Better account for the uninitialised signcolor 2019-11-07 14:44:42 -08:00
James R ed94549a37 Whitespace 2019-11-07 14:15:57 -08:00
James R 872e662618 That's a lot of whitespace 2019-11-07 13:42:54 -08:00
James R fff38da832 var2 unused, so remove it; signcolor can be unset 2019-11-07 13:05:50 -08:00
James R be7dcccb71 Declarations after Lua calls 2019-11-07 13:02:33 -08:00
Jaime Passos 23d89bec1d fix accessing spriteinfo[] with a string as a key 2019-11-07 14:27:45 -03:00
toaster f11fc92fd7 Fix pmomz being set to 0 in the wrong place. (P_PlayerAfterThink is after every moving sector has changed its height, while P_MovePlayer is before it...) 2019-11-07 17:10:59 +00:00
toaster d2c6d6ad73 Prevent infinite lives rollover to extremely negative numbers. (Discovered while messing around with pandora's box recently.) 2019-11-07 14:06:27 +00:00
lachwright c43551384d Reduce RVZ particle spawns when no players are in proximity 2019-11-07 16:00:44 +08:00
Jaime Passos f739956e89 spriteinfo lua support 2019-11-07 03:11:16 -03:00
Jaime Passos e78999549b Hopefully the last time this week I'll ever touch these files 2019-11-06 20:41:55 -03:00
lachwright 800052a746 WIP update to latest version of Lua script, halted because script inconsistencies still exist 2019-11-06 13:59:53 +08:00
lachwright 00361d30d8 Merge branch 'master' into cobalt-ai 2019-11-06 13:41:18 +08:00
Jaime Passos 6d024b7124 I guess I'll have to do at least SOMETHING about OpenGL 2019-11-05 17:35:16 -03:00
Jaime Passos ed967f077c Restore the last gameplay frame while on the intermission screen 2019-11-05 17:04:57 -03:00
toaster 0a4d0ecc5c Better comments for musicdef struct 2019-11-05 19:50:49 +00:00
toaster 5f8671b100 Sound test is cool now! 
https://cdn.discordapp.com/attachments/405336003239477249/641295998395613224/srb20042.gif

* Port MUSICDEFs from Kart.
    * Safe to modify without modifying game, so we can put it in music.dta eventually.
    * "Title", "AltTitle", "Authors" fields are self-evident.
    * "Soundtestpage" and "Soundtestcond" are used to determine which sound test unlockable can play them (set with Unlockable's variable, just like Level Select).
    * "Stoppingtime" and "BPM" both accept floats, and are used for presentation stuff on the sound test.
    * Ironically, we don't share a single field name with them. Such is the case of differing foci, though, and I expect they'll change their implementation to match (since this is necessary for a sound test).
* Change how S_AddSoundFx works to avoid iterating through all of them, and to allow cv_soundtest to only scroll through defined slots (instead of the infinite wall of thok sounds when scrolling to the left).
* Change V_DrawFixedPatch to allow scaling on two seperate axes.
    * Now called "V_DrawStretchyFixedPatch".
    * "V_DrawFixedPatch" is a macro to V_DrawStretchyFixedPatch now (same scale on both axes).
    * Available to Lua under v.drawStretched!
    * Even works in GL!
* Bugfix: Add SR_PLAYER to SOC's menutypes_list.

Stay tuned for the merge request, where I put the onus on the Music Team to finish this off...
 2019-11-05 16:23:46 +00:00
Jaime Passos 044d3fd325 Update hw_main.c 2019-11-05 12:31:50 -03:00
Jaime Passos 5ebb90cdd6 tweak fade colormaps just a little bit 2019-11-05 12:28:01 -03:00
Jaime Passos 00d76bd9ef fix fades for real 2019-11-05 12:10:42 -03:00
Jaime Passos 4ff769704a function renaming 2019-11-05 10:28:19 -03:00
Jaime Passos 55c6c4f5fe Attempt to fix sky dome 2019-11-04 14:36:12 -03:00
lachwright cf39e181bb Display Eggman more frequently during skin roulette 2019-11-05 01:33:09 +08:00
Jaime Passos d45ed97e50 Update m_menu.c 2019-11-04 12:30:28 -03:00
Jaime Passos 8ac49d8855 add gr_modelinterpolation 2019-11-04 12:21:53 -03:00
lachwright eb6d3b3dbe Improve A_SignSpin 2019-11-04 23:10:13 +08:00
toaster ef886e4b80 Fix TC_DASHMODE and associated not being applied in GL. (Won't conflict with md3 branch because these lines weren't modified there!) 2019-11-04 13:11:04 +00:00
lachwright 5e03d40b33 New end-of-level signpost logic 2019-11-04 16:28:44 +08:00
mazmazz 43fff92c82 Alacroix: Fix our heroes' arms disappearing due to dropped frames 2019-11-04 02:43:48 -05:00
Steel Titanium 16c107e2ac
Fix garbage string being drawn on record attack menu 
Pretty silly of me to assume it would be NUL-terminated by default.
 2019-11-03 21:43:09 -05:00
mazmazz d268582315 Frame 4 typos 2019-11-03 19:53:05 -05:00
mazmazz cb6bc67944 Alacroix title: Give Tails his back tails 2019-11-03 18:38:09 -05:00
mazmazz 05ac1a1a21 Alacroix gfx optimization; dynamic loading/unloading of title gfx resolutions 2019-11-03 16:21:21 -05:00
mazmazz 82b65c87b8 Alacroix title screen character frames 2019-11-03 10:34:12 -05:00
mazmazz 42835905ef Load Alacroix character frames 2019-11-03 06:30:27 -05:00
toaster e7e3c6ccbb Slightly unrelated to the express purpose of the branch, but since I was here, and I noticed it was a problem when ~~playing~~ testing with md3s in ACZ: Don't draw the midtextures for horizon lines. 2019-11-03 10:23:21 +00:00
mazmazz 96a80c51d3 TTMODE_USER logic 2019-11-02 21:51:45 -04:00
mazmazz 6db58bc2bf Alacroix title animation adjustments 2019-11-02 21:05:01 -04:00
Jaime Passos 751d398321 Fix sky dome 2019-11-02 17:33:36 -03:00
toaster 915e50a1e4 Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into internal-md3-vanilla-c 
Merge seems fine, but won't compile for some reason.
 2019-11-02 18:34:12 +00:00
toaster 8909598baf Instead of checking for mod being nonzero, pretend it's 1 - after all, there's no good behaviour in that circumstance otherwise. 2019-11-02 18:25:56 +00:00
toaster 417f17ebdd Do a bunch of stuff to the MD2/3 sprite2 support to get it back to feature parity with before, without going back to being hacky as fuck. 
* Store the number of frames per sprite2 run in the spr2frames struct.
* Reintroduce P_GetModelSprite2, to allow for the sprite2 defaulting system to be used to full advantage even in GL.
* Instead of splitting the SUPER and normal SPR2 stuff within the same cell of the struct, have them exist in different cells just like in the "normal" sprite2 structs.
* Allow for just providing spr2 frames in order without specifying which "normal" sprite2 frame it's supposed to replace.

Also:
* Fix FF_VERTICALFLIP-ignoring regression.
* Fix whitespace adjustment in win_dll.c
* Remove bracket in P_GetSkinSprite2 because I realised it was extraneous while making sure P_GetModelSprite2 worked with it.
 2019-11-02 17:52:54 +00:00
mazmazz 067ef42e37 SNTX -> SONT 2019-11-02 13:30:03 -04:00
mazmazz fc02b73534 Remove TTCOUNTERSET to simplify custom title SOC 2019-11-02 12:40:12 -04:00
mazmazz 1ebcdb5344 Multi-res title screen gfx 2019-11-02 12:12:36 -04:00
toaster fc22d1adc3 * Restart Metal recording from beginning if retry is used. 
* Disable lives when Metal recording (and have a big flashing REC instead, because I'm a riot).
* Correct some minor directionchar issues (some introduced in this branch, some not).
 2019-11-02 11:56:51 +00:00
mazmazz 0c1b5f07f0 Merge remote-tracking branch 'origin/master' into new-title 2019-11-01 21:06:46 -04:00
toaster 7cd7f9fdb7 Forgot to stage this. 2019-11-01 16:33:46 +00:00
toaster e3fe542f31 Prevent desync with modeattacking. 2019-11-01 16:25:28 +00:00
toaster 67f5b2245f Secret stuff. (I intend to keep candid discussion of this outside of any commits; you'll see me write up a comment describing what's going on here soon.) 2019-11-01 15:48:50 +00:00
lachwright f3e9dd0cad Add static ATZ Gargoyles 2019-10-31 19:38:28 +08:00
lachwright 95a3546988 Finish Glaregoyle states 2019-10-31 19:18:44 +08:00
toaster 126fc44d6e Change sounds, after discussing with Lach. 2019-10-30 17:37:42 +00:00
toaster 67a99f6334 ACTUALLY applied colorized flashing for dashmode to non-SF_MACHINE players, which wasn't happening for non-transparent players because :VVV 2019-10-30 17:16:44 +00:00
lachwright 7c08cd69fa WIP new states for Glaregoyle 2019-10-31 00:32:19 +08:00
toaster 04f400e048 Give the clone fighter's vectorisation colour, rather than forcing greyscale. 2019-10-29 23:24:00 +00:00
toaster 4d55a9f4a9 Metal Sonic battle improvements. 
* Tweaked to use new sprites.
* Jet fume behaves much closer to Lach's wonderful work.
* Instead of clobbering tracer to spawn powerup overlay, use hprev.
* Change timings. One second less to charge up, but two seconds less to spin them out.
* Remove terrible pinch overlay in favour of new dashmode-mimic flashing.
 2019-10-29 23:11:12 +00:00
toaster 56d095e39f Finish the Metal demo if the Metal playback object is dead. 2019-10-29 18:17:04 +00:00
toaster 2d1a574e09 * Add a death animation for killing the Metal object, in case somebody wants to Lua up a Sonic CD style race finish for the Metal object, or in case of the following... 
* Add an alternate DEMOMARKER for ending the Metal Recording on death, which kills the Metal object as well.
* Add some more relevant exceptions to the "most objects are removed when touching a deathpit" thing, primarily for the sake of ghosts and Metal playback.
 2019-10-29 17:38:14 +00:00
toaster d7ea986d7b I was right on the money - SendWeaponPref seems to have been delayed compared to earlier in development. Doesn't matter a lick for regular gameplay (net or otherwise), but absolutely mandatory to get it sorted ASAP in Record Attack. 2019-10-29 15:59:59 +00:00
toaster f0f8b544de * Add thok auras to Metal playback. 
* Add height changes to demos and Metal playback (to properly place thok aura relative to object).
* Fix followmobj recordings in reverse gravity (done via more strenuous flag setting + info height serialisation).
* Make RA ghosts fade in from start tic, and go colorized on their final one.
* Fix thok auras potentially doing bad things if they're set to MT_NULL.
* Add sprite change support to Metal playback.
* Re-enable some stuff I previously disabled for Metal recording/playback.
* Make ALL objects spawned with skins properly acknowledge that their spawnstate's frame is a sprite2, rather than just specific objects.
* Fix placement of Metal Sonic fume in reverse gravity.
* Since not backwards compatible with the previous test build, increment DEMOVERSION again. (Don't worry, we've got like 65524 more versions allowed before we run out of possible DEMOVERSIONs...)
 2019-10-29 15:32:22 +00:00
lachwright 9436993a3e Implement new states for Buggle, the new Aquabuzz 2019-10-29 15:32:03 +08:00
Jaime Passos 417aa778aa Use doomtype.h types instead of libpng types 2019-10-29 00:20:21 -03:00
Jaime Passos 5464b6ab28 Use doomtype.h types instead of libpng types 2019-10-29 00:15:33 -03:00
Jaime Passos 0a49340ae1 Fix warnings when NOPNG=1 2019-10-28 23:46:33 -03:00
Jaime Passos 94ab276508 Merge remote-tracking branch 'origin/master' into f_wipes 2019-10-28 23:14:00 -03:00
toaster 1906709cf2 * Improve the Metal Sonic recording/playback system. 
* Make the skin to record with Metal rather than Flesh Sonic. (Allowed even if not unlocked!)
    * Make the object that plays back the recording actually use the Metal skin, rather than just a seperate spriteset. (The boss will still need the spriteset, though.)
    * Actively record the player's sprite2, frame, and followmobj, just like regular ghosts do.
    * Disable dashmode while recording, for a fairer race.
    * Fix a probably long-standing bug where, while recording, being "hurt" would get Metal stuck in pain frames until they physically left the area of hurt.
    * Always start Metal recording in wait frames for bonus taunting.

Other relevant changes:
* Increment DEMOVERSION *again*.
* Improve the Record Attack ghost followmobj recording to accomodate Metal's jet.
* Increase the datatype width of spritenum_t read/write for Record Attack ghosts because SUGOI 4: Back With A Revengance will probably also use more than 255 sprites alone.
* Return to standing frames (or prolong them if you're in them, rather than going to wait frames) if the player rotates on the spot with enough force.
    * This was specifically done *for* Metal recording, but I decided it looked good enough to enable all the time.
 2019-10-28 22:12:47 +00:00
Jaime Passos f6e8226c4e Update p_user.c 2019-10-28 15:37:26 -03:00
Jaime Passos a22af36305 add r_patch.c 2019-10-28 15:28:42 -03:00
Jaime Passos 1a44159ce9 Update r_data.c 2019-10-28 14:36:19 -03:00
Jaime Passos 79e99dc471 Merge remote-tracking branch 'origin/master' into rotsprite_i 2019-10-28 14:29:10 -03:00
Louis-Antoine e91bf1a32e Fix some intro fades displaying text in all-caps 2019-10-28 16:10:22 +01:00
lachwright 8824cd64fd Merge branch 'master' into knuxstuff 2019-10-28 22:25:32 +08:00
lachwright 46ba988541 Slow climbing down underwater 2019-10-28 22:21:20 +08:00
toaster ce91bdaaab Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into dashmodecut 2019-10-28 14:19:25 +00:00
toaster 9a160823aa Replace the s3k sound used when starting dashmode with the Sonic CD equivalent, which among other things is more appropriate AND isn't used for anything unrelated so can have a more appropriate caption 2019-10-28 14:19:07 +00:00
lachwright b93c2467e7 Don't let Knuckles play the landing animation unless in fall state 2019-10-28 22:13:34 +08:00
lachwright 1306b2bbc5 Slow glide down underwater 2019-10-28 21:30:36 +08:00
toaster d9196485f6 Oh, this is why. pw_pushing was decremented twice each tic, because I copypasted it and then forgot to adjust it to say pw_noautobrake... 2019-10-28 13:01:15 +00:00
toaster 17dde0d91c Forgot to make pw_noautobrake count down........ 2019-10-28 12:54:55 +00:00
toaster 22649f698e Fix map_cons_t[] not having a null terminator, which should hopefully allow Lach to actually start their builds up on Mac again. 2019-10-28 11:34:20 +00:00
James R 33816e49ca Add overflow checks so we I_Error instead of death crash into oblivion 
You'd love to know how we even reached (size_t)-1.
 2019-10-28 00:40:25 -07:00
James R fb9421893e :oh: 2019-10-27 14:29:13 -07:00
James R a00dfcf420 Oh right, the keywords... 2019-10-27 14:26:29 -07:00
James R f0e19d1597 Fix minor unnecessary call 2019-10-27 14:25:20 -07:00
James R 56ee233b08 Fix compiler warnings 2019-10-27 14:23:53 -07:00
James R 7bf819f5af Use a superior strcasestr 2019-10-27 14:23:13 -07:00
James R 70df5242a3 Extend map name text matching code into a function 2019-10-27 14:23:03 -07:00
James R bb65e8d72f Add support for custom keywords 
For now, 32 characters separated by spaces.

Also fixed a SIGSEGV from an empty level title.
 2019-10-27 14:10:26 -07:00
James R 6358d839ee Overhaul the map command 
Added support for map names, matched by substring and keywords too!
Added support for two digit MAP codes without the MAP part.
Added support for decimal map number. (But who cares.)

Gave a better description of command.
Supported abbreviated optional parameters.

And now REALLY detects incorrect parameters.
 2019-10-27 14:02:36 -07:00
James R 2078b47952 Move gamedata param to cover -resetdata 2019-10-27 10:33:40 -07:00
James R 4ac136f626 Custom gamedata parameter 2019-10-27 10:31:17 -07:00
toaster df785e1651 * Add alternate numerical drawer for continues on Intermission screen if there's > 5. 
* Tweak offsets on Continue screen numerical continue drawer to match.
 2019-10-27 17:20:43 +00:00
mazmazz 23c6011348 Fix char select music not playing in secrets menu 2019-10-27 13:12:36 -04:00
toaster 2439b2cb32 More consistent momentum handling for "groundpounding" shield abilities (elemental, bubble) in THZ goop. 2019-10-27 13:37:14 +00:00
toaster 9e8733be42 Make player flash colorized when dashmode if not SF_MACHINE, per Sonic Advance 2. 2019-10-27 13:07:06 +00:00
toaster fa187a66e2 * Disable dashmode if pw_carry is set or the player is exiting, in addition to getting the flag. 
* Add a dashmode downpower sound.
 2019-10-27 13:02:07 +00:00
toaster 0c52de7a29 Fix bot showing up in NiGHTS stages with a two-pronged approach. 
* Sometimes, D_MapChange is passed a mapnum of -1, to complete an existing mapchange. Don't handle botingame checks when that happens.
* Disable charsel on secret level platter when selected map is a NiGHTS stage, since gameplay will be identical across characters (consistent with NiGHTS Attack).

Also:

* Replace IT_DYBIGSPACE hack in M_SetupChoosePlayer, and replace with a more direct workaround system for not being able to select characters before warping.
 2019-10-27 12:20:17 +00:00
toaster c221a89c67 Fix unsigned/signed comparisons. 2019-10-27 11:18:37 +00:00
Nev3r a58c794691 Missing ; 2019-10-27 12:03:52 +01:00
James R b6e145f0c5 Render title map on connecting to server screen too 2019-10-26 12:50:49 -07:00
MascaraSnake 801e83aef6 Merge branch 'use-zones-pk3' into 'master' 
Use zones.pk3 instead of zones.dta.

See merge request STJr/SRB2Internal!352
 2019-10-26 15:33:13 -04:00
mazmazz 91eb380412 Fix some jingle resuming behavior with boss music switching 2019-10-26 15:02:45 -04:00
MascaraSnake 9e9e6a8f8f Merge branch 'metalstuff' into 'master' 
Metal Sonic's jet fume

See merge request STJr/SRB2Internal!413
 2019-10-26 14:52:04 -04:00
mazmazz 26cb75e961 Fix MIDI not being disabled when non-native 2019-10-26 12:09:27 -04:00
lachwright e89948ce71 Merge branch 'master' into metalstuff 2019-10-26 16:07:59 +08:00
MascaraSnake 92be187731 Merge branch 'master' into knuxstuff 2019-10-26 08:09:13 +02:00
James R 634292a5fc Differing signedness comparison 2019-10-25 21:44:34 -07:00
James R 64e7708832 I say damn you massive initializer! 2019-10-25 21:36:10 -07:00
mazmazz c7c72a4892 Merge branch 'master' into new-title 2019-10-25 22:29:29 -04:00
lachwright 6c9ad67c84 Fix pointer typo (whoops) 2019-10-26 08:34:38 +08:00
lachwright aa34f74f75 Remove imtermediary state transitions 2019-10-26 08:32:36 +08:00
lachwright ca768b044d Merge branch 'master' into metalstuff 2019-10-26 08:30:37 +08:00
lachwright 63d24d529a Merge branch 'master' into knuxstuff 2019-10-26 05:53:49 +08:00
MascaraSnake 03c5b70fc5 Merge branch 'newmenus' into 'master' 
Better looking menus, nametags and much more. (Resolves #245 and #244 and #252)

Closes #245, #244, and #252

See merge request STJr/SRB2Internal!389
 2019-10-25 17:46:16 -04:00
MascaraSnake 4d022046fa Merge branch 'object_tweaks' into 'master' 
Object tweaks (object_tweaks division 3)

See merge request STJr/SRB2Internal!394
 2019-10-25 17:45:48 -04:00
MascaraSnake 1c1fefe25f Merge branch 'linedef-153' into 'master' 
Dynamic Sinking Platform (for Red Volcano Zone)

See merge request STJr/SRB2Internal!401
 2019-10-25 16:56:19 -04:00
MascaraSnake 46d105dd53 Some basic code hygiene: Remove references to the air bob code being "old" or "outdated" 2019-10-25 22:55:10 +02:00
MascaraSnake 2118b0e613 Merge branch 'hammer-landing' into 'master' 
Twinspin landing option

See merge request STJr/SRB2Internal!402
 2019-10-25 16:39:02 -04:00
MascaraSnake faf61912a6 Merge branch 'lua-allow-player' into 'master' 
Allow access to players userdata outside levels.

See merge request STJr/SRB2Internal!386
 2019-10-25 15:40:31 -04:00
MascaraSnake 7d69409cf7 Merge branch 'set-name-on-join' into 'master' 
Set the player's name as soon as they enter the game

See merge request STJr/SRB2Internal!397
 2019-10-25 15:38:21 -04:00