lifning
/
SRB2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
7,866 Commits 1 Branch 29 Tags 122 MiB
Commit Graph

777 Commits

Author SHA1 Message Date
MascaraSnake d735e1b9c2 Merge branch 'rvz-hardcode' into 'master' 
RVZ hardcode

Closes #178

See merge request STJr/SRB2Internal!357
 2019-10-12 09:37:23 -04:00
MascaraSnake 68a82c3849 Merge branch 'amycameo' into 'master' 
Amy for Frozen Hillside (full pitch in description)

See merge request STJr/SRB2Internal!356
 2019-10-12 07:16:26 -04:00
MascaraSnake 0f562d27d7 Merge branch 'fastgoop' into 'master' 
Increased THZ goop speed by 25%

Closes #229

See merge request STJr/SRB2Internal!367
 2019-10-12 03:10:26 -04:00
toaster 1560453797 Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into rvz-hardcode 
# Conflicts:
#	src/p_map.c
 2019-10-10 17:51:29 +01:00
MascaraSnake 7fedde9811 Merge branch 'promiscuousplanes' into 'master' 
Headbumps and associated

Closes #242

See merge request STJr/SRB2Internal!360
 2019-10-10 02:36:10 -04:00
toaster 1155a7c3a0 Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into rvz-hardcode 
# Conflicts:
#	src/p_mobj.c
 2019-10-08 19:43:43 +01:00
toaster 4870107974 Increased THZ goop speed by 25%, per Cobalt's script. (Hardcoding it was way more difficult than it looked, I'm rusty at my maths :V ) 2019-10-08 16:38:53 +01:00
MascaraSnake 0fceb66e71 Make the Pyrefly glowing and damaging in its fire-spawning state 2019-10-07 22:23:52 +02:00
MascaraSnake 8062422f13 Fixed wrong sound being played by Pyreflies with Ambush 2019-10-07 19:11:36 +02:00
toaster 5bbc31c18f Merge branch 'acz-fixes' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into acz_touchups 
# Conflicts:
#	src/p_enemy.c
 2019-10-06 15:18:59 +01:00
toaster a5704238c7 Resolve #242 by adding SF_TRIGGERSPECIAL_HEADBUMP, enabled by ML_EFFECT2. 
Also, readd SF_INVERTPRECIP, which was done in a random branch last year and then lost because it was never merged. Enabled by ML_EFFECT1.
 2019-10-06 14:34:25 +01:00
MascaraSnake defffd667e Fixed and simplified the big fern leaf spawning code 2019-10-06 14:18:27 +02:00
MascaraSnake 17a2d1071c Spawn big fern leaves relative to angle 2019-10-06 10:30:22 +02:00
MascaraSnake 357baeaa60 Added gravflip support to lavafall, Pyre Fly and Pterabyte 2019-10-05 22:20:48 +02:00
MascaraSnake 16d077fde3 Coins don't melt in lava and lavafalls have displayoffset 1 2019-10-05 20:00:54 +02:00
MascaraSnake 99220ae48b Fixed a typo 2019-10-05 10:45:24 +02:00
MascaraSnake cabc4e0294 Implemented lava splish. Feel free to suggest a different "splish" sound. 2019-10-05 10:00:59 +02:00
MascaraSnake 5c1fabfaae Lava is now either completely solid or completely intangible. No more half-assing 2019-10-01 21:58:18 +02:00
toaster f224e03e1d Amy cameo for Frozen Hillside. Wait for the MR, I'll make a fuller pitch there... 2019-10-01 18:19:37 +01:00
MascaraSnake 5460e0e1f9 Merge branch 'master' into acz-fixes 2019-09-30 20:50:33 +02:00
MascaraSnake d301d2bba4 Fixed a bug with the ring lava melting 2019-09-29 23:22:38 +02:00
MascaraSnake 4375ea8089 Lava now melts rings! 2019-09-29 23:11:21 +02:00
MascaraSnake c00144a4f8 Pterabyte: Don't target players who are invincible after being hurt 2019-09-29 19:29:34 +02:00
MascaraSnake 26ecab14d7 Implemented the Pterabyte grabbing mechanic 2019-09-29 18:42:17 +02:00
MascaraSnake 598047ae8b Hardcoded the Pterabyte (without the grabbing mechanic) 2019-09-29 10:39:09 +02:00
toaster 55a2f1ee1f Merge branch 'bossprovements' into 'master' 
ACZ3 intro

Closes #217

See merge request STJr/SRB2Internal!346
 2019-09-27 08:55:19 -04:00
toaster 40a7b67a86 Merge branch 'dsz3shockwave' into 'master' 
Deep Sea Zone 3 hardcoding

Closes #185

See merge request STJr/SRB2Internal!349
 2019-09-27 08:54:57 -04:00
sphere bc128dffdc Fix compiling errors, thanks to toaster. 2019-09-26 23:15:52 +02:00
lachwright 264c60fb70 P_SetTarget fixes, added SPR_SHCK to hw_light.c 2019-09-27 02:13:02 +08:00
toaster ec1712064c * Add vwre vwre intro for Fang Clone Fighter battle. (Still skipped with presence of MTF_AMBUSH) 
* https://cdn.discordapp.com/attachments/428262628893261828/626792815451701259/srb20006.gif
* Add fadeout instead of slapstick for Fang Clone Fighter death.
* Allow placed Fang and Metal Sonic objects to be marked as Clone Fighters always through presence of MTF_EXTRA.
 2019-09-26 17:06:29 +01:00
lachwright 0cd3e4fd62 Hardcoded DSZ3 shockwave 2019-09-26 05:27:51 +08:00
lachwright fb9248793a Fix errormode compilation error 2019-09-25 23:09:05 +08:00
lachwright c1750d9359 Fixes shield ability usage when pressing spin on ACZ ropes (and also changes flame shield angling) 2019-09-25 22:36:48 +08:00
toaster 2a452ddcf5 Remember when Lach recorded their live reaction to 2.2 so far? Do you recall what the reaction to ACZ3 was? 
If you don't, the reaction was "WHAT?? Why is he here? This is GREAT but, what??" And while the reaction is on the positive end of things, it's stll clearly not advisable for our defining Big Reveal of the already huge update.

To this end: Here is a mini cutscene! https://cdn.discordapp.com/attachments/428262628893261828/626207624043429898/srb20005.gif
* He's digging through Eggman's trash.
* Clearly doesn't expect to see you!
* Ready for a fight all the same.
* You can attack him during the mini cutscene if you're impatient.
* Skipped if you give him MTF_AMBUSH.
* Requires new assets (including map) to test, but I'm not ready to make a MR yet because I have other thoughts first.

Also, since I was poking around in p_enemy.c, I fixed A_Boss1Laser's issues (not working with direct 2.1 port states and having the weird secondary attack).
 2019-09-25 14:36:20 +01:00
toaster 7da89e3bc9 Merge branch 'camerafix' into 'master' 
Camera fixes

Closes #105

See merge request STJr/SRB2Internal!303
 2019-09-20 11:51:30 -04:00
toaster f8475eef26 Disable some code which sometimes makes the player enter walking frames when jumping up to a platform, such as the CEZ3 buttons, despite still being in jumping mode. 
If this causes more problems than it solves it can be reverted, but doing a bunch of playthroughs of DSZ1/2, GFZ1, and CEZ3 didn't seem to uncover anything, so I'm tentatively putting it in this branch.
 2019-09-19 13:20:52 +01:00
toaster 3285cc9a0d Properly scrub the player struct clean between level transitions. (Good chance this fixes our new bug where the player gets stuck in their standing pose when the map begins..?) 2019-09-18 16:06:13 +01:00
toaster e993b8981e Fix solidity of lava in reverse gravity. (Resolves #216) 2019-09-18 13:55:20 +01:00
Nev3r 777e7f8760 Merge branch 'deathstuff' into 'master' 
Lots of death stuff

Closes #207

See merge request STJr/SRB2Internal!306
 2019-09-16 16:32:45 -04:00
Nev3r 21b5ebf6fa Merge branch 'abilityclean' into 'master' 
Clean up an ungodly amount of shit relating to abilities.

Closes #195, #167, and #177

See merge request STJr/SRB2Internal!307
 2019-09-16 16:09:20 -04:00
James 737690c8b8 Added cam_adjust, de-ghettoified the camera in general 2019-09-11 10:45:59 -04:00
toaster 2b0344a22f Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into deathstuff 2019-09-09 15:25:48 +01:00
toaster 6815748a3e Merge branch 'flippost' into 'master' 
Flippost

Closes #206 and #191

See merge request STJr/SRB2Internal!320
 2019-09-08 16:24:58 -04:00
toaster 11e3f5ec96 Change flipped starpostz to define the top of the player object, for cases where scale on contact with starpost is different to spawn scale. 2019-09-08 21:21:36 +01:00
toaster d26ff197dc * Store gravflip (resolves #206) and destscale in starposts. (Using the same field, taking advantage of the fact that object scale will always be positive!) 
* Update the function signature of P_MixUp to accomodate both it and drawangle instead of doing it outside of the function.
* If the player is spawning from the start of the stage and it's from the ceiling, be in fall frames as requested (resolves #191).
 2019-09-07 22:12:47 +01:00
toaster bb2012a8d0 Clean up an ungodly amount of shit relating to abilities. 
* Put everything in P_DoJumpStuff, instead of half in that function and half spread across the player thinker.
* Have a proper if else cascade that first tries shield abilities, then super transformation, then random abilities like CA_TELEKINESIS.
* Use this new arrangement to allow CA_TWINSPIN users to use their ability on spin if their secondary ability is CA2_MELEE (resolves #195).
* Random bugfixing. Didn't keep track of what I'd caused while working on this and what was already there, but there was a lot of it.

The only two abilities which have spin-button properties outside of the else block is CA_AIRDRILL and CA_FLY/CA_SWIM (which now also prevents you from swimming down in goowater).
 2019-09-06 19:01:46 +01:00
toaster 0986195d21 Bunch of fixes for dying in MP special stages. 
* Don't allow the stage to be reloaded in G_DoReborn.
* If you do ANY spawn after the very beginning moment, you're forced to be a spectator.
* Have the "%d player%s remaining" Co-op exiting count visible at the same time as spectator controls.
 2019-09-04 15:51:14 +01:00
toaster f07309707d Lots of death stuff. 
* Genesis-style love and attention to the death event.
	* Only visibly decrement lives/rings when you're respawning (or game over, see below).
	* Faster no-button-press respawn.
* Game Over specific love.
	* Animation of Level Title font coming in from the sides.
	* https://cdn.discordapp.com/attachments/428262628893261828/617692325438554132/srb20067.gif
	* Change gameovertics to 10 seconds instead of 15.
	* Make the minimum time before you can force going to the Continue screen longer.
* Accomodate death in MP special stages as a form of exit.
	* Don't have your rings or spheres reset when you die in a special stage, so that the stage isn't softlocked with the new harder limits.
* Fix a bug with CoopLives_OnChange where changing to infinite lives didn't force a game-overed player to respawn.

Also, two not-quite death things which nonetheless were relevant to change:

* Fix quitting a special stage having some of the shared spheres/rings disappear into the aether.
* Fix a warning during compilation for the Ring Penalty print.
 2019-09-01 15:55:23 +01:00
toaster fe99c64511 Give the Spectator Eggrobos the ability to move left and right relative to their angle, with initial direction depending on MTF_OBJECTSPECIAL/MTF_AMBUSH flag presence. (May need more tweaking before putting in CEZ3) 2019-09-01 11:43:30 +01:00
MascaraSnake a5ae8abdb2 Pyre Fly: Use MF2_BOSSNOTRAP instead of MF2_AMBUSH 2019-08-31 12:53:55 +02:00
toaster 6a9da63d7f Motor's new Eggman sprites, along with some other sweet bits of boss polish. What else can I say? Just play it. 2019-08-30 19:19:54 +01:00
MascaraSnake 8ddcced6f0 Pyre Fly: Don't spawn smoke and flames if no player is in range 2019-08-30 09:05:49 +02:00
MascaraSnake 4cece9fe36 Pyre Fly: Don't run the fuse code when dead 2019-08-30 08:55:29 +02:00
MascaraSnake 806b106905 Hardcoded the Pyre Fly 2019-08-30 08:17:25 +02:00
MascaraSnake 50e51c137e Hardcoded the lavafall 2019-08-25 23:05:38 +02:00
MascaraSnake 2a5c576c1c Hardcoded the RVZ scenery 2019-08-25 12:40:32 +02:00
toaster 35f90e3322 Use the softer explosion sound from s3k to go with the increased quantity of explosions. 2019-08-13 20:24:46 +01:00
toaster 8605d77af6 Fix an issue with painstate-exiting detection in the boss1 thinker. 2019-08-12 18:49:58 +01:00
toaster 9ae750d09c Since I had to do a clean build to get this up to date (the state list was updated), I decided to redo all the boss explosion animations to be way more aesthetically pleasing. 
Basically, think "Sonic 3". https://cdn.discordapp.com/attachments/371082353990303745/610233312765673493/srb20047.gif
 2019-08-12 00:34:42 +01:00
toaster 1fbd3eff40 * Fix the thing where you "roll" in run/walk frames if you hold spin after jumping. 
* Fix the thing where you don't go through super transformation frames when starting NiGHTS.
 2019-08-04 15:25:13 +01:00
toaster a87e1b8aa6 Fix inadvertent fallthrough and associated whitespace. 2019-08-04 10:27:36 +01:00
mazmazz 5b284c8170 gcc7 compile fixes (Fall through; spr2 var comparison) 2019-08-03 23:01:10 -04:00
toaster 8a0f1e7ed4 Merge branch 'ending' into 'master' 
ENDINGS

See merge request STJr/SRB2Internal!264
 2019-08-03 16:23:51 -04:00
toaster 9f34a7aa82 Merge branch 'bossenable' into 'master' 
Boss enable linedef (type 449)

See merge request STJr/SRB2Internal!272
 2019-08-03 16:23:22 -04:00
Monster Iestyn af38c0e227 Merge branch 'bustables_misc' into 'master' 
Bustables and landing events

Closes #157 and #162

See merge request STJr/SRB2Internal!262
 2019-08-02 13:16:53 -04:00
Monster Iestyn ee64d98e39 Merge branch 'spring-things' into 'master' 
Additional spring flags

See merge request STJr/SRB2Internal!256
 2019-08-02 13:06:38 -04:00
sphere d2c3b88020 Merge remote-tracking branch 'origin/master' into spring-things 2019-08-02 15:11:13 +02:00
toaster 8fa0641e99 Instead of checking whether mobj->spawnpoint->extrainfo is in the correct range every tic, have a lua error for trying to set it outside (since there'll no doubt be other consequences to being outside the range too) 2019-08-01 18:12:26 +01:00
toaster f0fd9f7656 Ok, now the MobjThinker Lua hook is neutralised properly as well. 2019-08-01 11:35:04 +01:00
toaster 7cb02985f4 * Added boss enable linedef (type 449). 
- Frontside x offset = boss ID (determined via parameter for all bosses)
	- Noclimb flag = disable mode
	- Bosses don't do a fuckin' THING - no state updates, no player searches, no sounds, no lua, no nothin' - and it's all totally netsynced.
	- The only thing they WILL do is flash infinitely if you hurt them, but this is designed for stuff where you're not meant to be in the same room as the boss til it's activated.
	- All bosses of all IDs are automatically enabled on mapload, then if an enable mode version of this linedef is present in the map for a specific boss id, that boss id is automatically disabled.
* Add multi-boss support via parameter for:
	- All bosses' MT_BOSSFLYPOINT search
	- Boss 5's waypoint search
	- Oldbrak's waypoint search (this one's for you, jood)
 2019-07-31 23:17:17 +01:00
toaster 2ae07bdf3b Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into bustables_misc 
# Conflicts:
#	src/p_user.c
 2019-07-30 18:14:52 +01:00
toaster a6a3048c8f * Fix diagonal spring ring assortments being forced up/down with slopes. 2019-07-29 21:03:28 +01:00
toaster 47554b57e4 * Made the evaluation screen even more attractive. 
* Fixed an unused variable warning in lua_skinlib.c.
- fixed post-level cutscenes playing when you get game over in MP (still kinda on-topic)
Also with apologies to MI:
- golden egg statue mode for tutorial, since the grey doesn't contrast enough with the blue and lime green
- fixed closed captions for replaced player sounds being incorrect
- fixed closed captions overlapping tutorial text
 2019-07-29 14:55:36 +01:00
Monster Iestyn 18e2c2461f Merge branch 'wavingflag' into 'master' 
New CEZ scenery

See merge request STJr/SRB2Internal!257
 2019-07-28 15:44:00 -04: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
sphere 79cf8eb08d Add a blue variant of the pole banner & change some doomednums. 2019-07-14 17:30:33 +02: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
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
Jonas Sauer 166f1fac66 Fixed the thinkerlist issues by removing THINK_LIMBO. Delay-removed thinkers now stay in their list. 
Also includes toaster's assorted fixes and improvements from target_painted_on_your_ass.
 2019-07-13 01:42:03 +02:00
MascaraSnake 77476d27e5 Merge branch 'master' into acz-fixes 2019-07-10 08:47:22 +02:00
Monster Iestyn 35adf2ce4a fix leftshift of negative value MascaraSnake also gets 2019-07-09 21:48:18 +01:00
Monster Iestyn 63d337211e Merge branch 'eggcolosseum' into 'master' 
Egg Colosseum (CEZ3 remaster)

See merge request STJr/SRB2Internal!248
 2019-07-09 16:32:24 -04:00
Monster Iestyn 11a24b88ee Merge branch 'seaegg_tweaks' into 'master' 
Sea Egg

See merge request STJr/SRB2Internal!244
 2019-07-09 16:25:07 -04:00
Monster Iestyn dc71e297bb Fixed mixed-code-and-declaration, shadowed variables, etc ...and the compiler doesn't like P_AddEachTimeThinker being inline anymore for some reason, oh well 2019-07-09 21:15:12 +01:00
toaster 2df90888bb Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into eggcolosseum 
# Conflicts:
#	src/p_mobj.c
#	src/sounds.c
#	src/sounds.h
 2019-07-09 19:52:52 +01:00
Monster Iestyn 3e305c0993 Merge branch 'toast_cleanup' into 'master' 
PITY IN PINK and everything associated (formerly toast_fixes)

See merge request STJr/SRB2Internal!232
 2019-07-09 14:31:25 -04:00
Monster Iestyn ef984eb336 Merge branch 'metalfixes' into 'toast_cleanup' 
Metal Sonic Boss fixes (again)

See merge request STJr/SRB2Internal!245
 2019-07-09 14:29:42 -04:00
Monster Iestyn c1bea02f03 Merge branch 'rainfixesmkII' into 'master' 
Accidentially broke rain in the rainfixes branch (oh, the irony!)

See merge request STJr/SRB2Internal!249
 2019-07-09 14:24:14 -04:00
toaster 98b6280d03 Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into toast_cleanup 
# Conflicts:
#	src/p_mobj.c
 2019-07-08 13:53:31 +01:00
toaster 1f15209eb5 Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into seaegg_tweaks 
# Conflicts:
#	src/p_enemy.c
#	src/p_mobj.c
 2019-07-08 13:52:11 +01:00
toaster a65925aeca Realised I accidentially broke rain in the rainfixes branch (oh, the irony!), realised it needed a few additional P_RecalcPrecipInSector calls to properly work with the new arena, and increased its speed. 
If you must, I can cherrypick this into another branch - but it's required for this one, at least.
 2019-07-08 13:39:21 +01:00
toaster 867f7ecfca ha ha ha how can i possibly describe this commit 
Just wait for the MR, it won't be far behind.
 2019-07-08 13:26:40 +01:00
MascaraSnake c1f51094bf TNT barrels are no longer enemies, but still aimable for Fang 2019-07-07 12:06:45 +02:00
Steel Titanium d2adb5e829 Update info.h 
Also add a case for MT_BRICKDEBRIS to P_MobjThinker
 2019-07-06 18:11:49 -04:00
toaster 5baaba1d9e Realised I accidentially broke rain in the rainfixes branch (oh, the irony!), realised it needed a few additional P_RecalcPrecipInSector calls to properly work with the new arena, and increased its speed. 
If you must, I can cherrypick this into another branch - but it's required for this one, at least.
 2019-07-04 14:44:09 +01:00
toaster b78fac66c4 Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into eggcolosseum 2019-07-04 14:09:56 +01:00
toaster 3efb49487e Pre-pinch behaviour complete - heavily reliant on a new map, which I won't be sharing until everything is ready. 
Just making this commit now so I can merge in master...
 2019-07-04 14:09:38 +01:00