Commit graph

1184 commits

Author SHA1 Message Date
TehRealSalt
22796b7633 Merge master 2019-09-27 03:44:37 -04:00
toaster
85f50ef54b * 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
f9cf4746b2 Lowered shockwave speed 2019-09-26 17:12:03 +08:00
lachwright
4d31ebf47a Hardcoded DSZ3 shockwave 2019-09-26 05:27:51 +08:00
toaster
de82d338bd 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
lachwright
bd1809f742 Fixed Brak's flames not animating 2019-09-25 20:32:56 +08:00
lachwright
f8dba1c3de Lots of CA_GLIDEANDCLIMB changes:
Glide speed now starts at whatever speed you were traveling at prior.
If glide speed is below actionspd, the glide accelerates towards it.
When landing from a glide, player now enters a landing animation (SPR2_LAND); they cannot move in this state, but they can jump or start a spindash.
Ground-sliding after a glide can now be cancelled into the landing animation by releasing jump, where the same rules apply.
Climb speed increased x1.33.
2019-09-24 02:17:20 +08:00
TehRealSalt
bc7673f2da Update Spring Shells, add color modulo check 2019-09-23 06:29:30 -04:00
TehRealSalt
9d8cb5247a Special effects!
Tire grease waves, colored stars
2019-09-23 03:15:08 -04:00
sphere
42d1fa6e88 Increase emblem and token hitbox sizes. 2019-09-22 04:19:09 +02:00
toaster
4d62bb4620 Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into new_algae 2019-09-20 16:45:06 +01:00
sphere
a1df108f28 Small DSZ coral tweaks. 2019-09-20 00:51:44 +02:00
toaster
0662774a76 * Remove sounds from swimming.
* Lower default swim animation speed.
* Make speed of flight/swim animation increase whenever mashing jump.
2019-09-19 12:30:30 +01:00
TehRealSalt
b8a752e40a Merge master 2019-09-18 21:47:11 -04:00
sphere
d6c09e3867 Updated ACZ cacti. 2019-09-18 21:40:33 +02:00
sphere
8ed395b5b5 Merge branch 'master' into new_algae 2019-09-18 20:17:36 +02:00
toaster
68116b914c * Fix native MF_PAIN sound extension being limited to UINT8 range, which only became evident when the new s1/2/cd/3db/kc sfx were added.
* Make the pain-causing cactodes have DMG_SPIKE.
2019-09-18 17:48:41 +01:00
toaster
f5240ae43a Correct location of MT_CACTI10 and MT_CACTI11 in relation to their positions given in info.h and dehacked.c (fixes several ACZ-related crashes) 2019-09-18 17:24:22 +01:00
TehRealSalt
5023abd279 Blue springs are Chaotix strong, grey springs are stronger & have diagonal/horizontal types, spring doomednums are reorganized 2019-09-18 02:26:14 -04:00
sphere
124be760b1 New animated DSZ kelp. 2019-09-18 02:05:19 +02:00
toaster
e7465699ad Merge branch 'morecactis' into 'master'
More harmful cactus

See merge request STJr/SRB2Internal!329
2019-09-16 16:36:06 -04:00
TehRealSalt
cd65381abc Add another file to handle Kart item collision functions, now items can damage anything with MF_SHOOTABLE
Now this code won't make me pull out my hair. Could possibly be enhanced by using a function or define to handle the big copy-pasted tmthing/thing switch blocks in p_map, but for now I'm way happier.

As a result, Battle capsules are now destructible.
2019-09-15 17:25:33 -04:00
TehRealSalt
b39482d721 Lua port of the capsule visual
No item collision or gameplay at all yet
2019-09-15 04:51:45 -04:00
Steel Titanium
a333f20d13 More harmful cactus 2019-09-12 21:36:13 -04:00
TehRealSalt
40c8081a1b Grease part 3 2019-09-12 19:26:00 -04:00
TehRealSalt
97b09ba9c1 Grease part 2 2019-09-12 14:23:45 -04:00
TehRealSalt
56c9641488 Back to old thrusts 2019-09-12 02:18:07 -04:00
TehRealSalt
d3f1b4f82c Greased horizontals 2019-09-12 02:01:30 -04:00
TehRealSalt
abfc1915c5 Fixed horizontal springs having gravity 2019-09-12 00:10:06 -04:00
TehRealSalt
e0a177e612 Horizontal springs, bigger hitboxes, springs use the meatier Sonic 3 sound effect 2019-09-11 23:33:33 -04:00
toaster
038340ff46 Update SPR2 defaulting for SPR2_CNT1. 2019-09-10 14:44:04 +01:00
toaster
41727318ff Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into deathstuff 2019-09-09 15:25:48 +01:00
toaster
7eaf43810a DON'T PUSH ALONE - first dregs of continue screen 2019-09-09 15:25:36 +01:00
Jaime Passos
412e368ef4 Merge remote-tracking branch 'origin/master' into rotsprite_i 2019-09-02 23:36:30 -03:00
toaster
b2d57e6045 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
0ed20a2a39 Hardcoded the Pyre Fly 2019-08-30 08:17:25 +02:00
MascaraSnake
9e132e0fc1 Simplified the lavafall rock states with FF_RANDOMANIM, fixed Var1 for the FF_ANIMATE states 2019-08-27 19:33:54 +02:00
MascaraSnake
b50da9e3e6 Hardcoded the lavafall 2019-08-25 23:05:38 +02:00
MascaraSnake
696911e63e Rejig the thing type numbers 2019-08-25 20:01:08 +02:00
MascaraSnake
b78ef0f666 Hardcoded the RVZ scenery 2019-08-25 12:40:32 +02:00
Jaime Passos
402012e973 I 2019-08-18 14:16:48 -03:00
toaster
3b8f176720 Tweak the Metal Sonic death explosion sequence. It's longer than all the others before the egg capsule comes up, but so is Mecha Sonic in s3k, so it fits.
(Not uploading an exe for this miniscule change. If you want to play with this, get it in Master. :P )
2019-08-14 10:22:14 +01:00
toaster
cf94cce073 Use the softer explosion sound from s3k to go with the increased quantity of explosions. 2019-08-13 20:24:46 +01:00
toaster
9aaee61dce Tweak the ACZ3 fight a little, animationwise, since every other non-Brak boss got an upgrade to its death anim in this branch.
Also make its bomb throw anim use all the new sprites.
2019-08-13 19:41:04 +01:00
toaster
1d17cd4566 Tweak the animation speed of the fleeing eggmobiles' sweatdrops. 2019-08-12 18:50:23 +01:00
toaster
69eb202110 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
37ee6833d6 Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into gfz_boss_rework 2019-08-11 21:17:13 +01:00
Steel Titanium
37c50467f3 Ring sparkle mirroring 2019-08-03 18:28:53 -04:00
Steel Titanium
ea32155715 Merge branch 'master' of git.magicalgirl.moe:STJr/SRB2Internal into ringsparkle 2019-08-03 17:33:28 -04:00
toaster
dec517f224 Merge branch 'ending' into 'master'
ENDINGS

See merge request STJr/SRB2Internal!264
2019-08-03 16:23:51 -04:00