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

6877 commits

Author SHA1 Message Date
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
Jaime Passos e0a9b3d695 Merge remote-tracking branch 'origin/subtitlesubterfuge' into remove-unused-levelwipes 2019-11-19 21:49:45 -03: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
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
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