Commit graph

298 commits

Author SHA1 Message Date
Steel Titanium 58ef85d591
Make nametag SPR2 frame be the last frame of SPR_XTRA 2019-10-15 23:41:01 -04:00
Steel Titanium 9c33f160a6
Lots of changes
* Show emblem requirement on record attack menu
* Use bigger emblems on the menu.
* Display your best number of collected rings in yellow if reached perfect bonus.
* Adjusted XTRA frames (again)
2019-10-15 22:54:21 -04:00
lachwright 9cad882626 Merge branch 'master' into knuxstuff 2019-10-15 02:49:44 +08:00
Steel Titanium 9e9a40cadb
Merge branch 'master' into newmenus 2019-10-13 20:12:48 -04:00
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
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
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
MascaraSnake 0fceb66e71 Make the Pyrefly glowing and damaging in its fire-spawning state 2019-10-07 22:23:52 +02:00
toaster 0235d9e7ec Fix Saloon doors.
* Make the center be the object stuff collides with, so that if the door is open people can't slip through.
* Add an MF_AMBUSH enhancement to allow non-minecart players to travel through.
* Make A_SaloonDoorSpawn more customisable. (var1 = object type, var2 = distance sides should be placed apart)
2019-10-05 13:21:35 +01:00
MascaraSnake cabc4e0294 Implemented lava splish. Feel free to suggest a different "splish" sound. 2019-10-05 10:00:59 +02:00
Steel Titanium 6b10ffb88f
Merge branch 'master' into newmenus 2019-10-01 16:52:31 -04: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
lachwright 906a2b1f59 Merge branch 'master' into knuxstuff
Update to master (necessary for climbing changes)
2019-09-30 09:56:04 +08:00
lachwright 71603006dc Resolve merge conflicts 2019-09-29 20:29:49 +08:00
lachwright 8abb6129c1 Hardcode pumice ball
Current known issues: players detached from the ball via any means other than jumping or pain do not have their ball reset properly
2019-09-29 20:18:40 +08:00
MascaraSnake 598047ae8b Hardcoded the Pterabyte (without the grabbing mechanic) 2019-09-29 10:39:09 +02:00
Jaime Passos 5118f8589d Merge remote-tracking branch 'origin/master' into rotsprite_i 2019-09-28 12:14:55 -03: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 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
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
lachwright de294d84e7 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
sphere 4c7a7a7e0b Small DSZ coral tweaks. 2019-09-20 00:51:44 +02:00
sphere c81452211d Updated ACZ cacti. 2019-09-18 21:40:33 +02:00
sphere 81d1453dc4 New animated DSZ kelp. 2019-09-18 02:05:19 +02:00
toaster e179e1f9c4 Merge branch 'morecactis' into 'master'
More harmful cactus

See merge request STJr/SRB2Internal!329
2019-09-16 16:36:06 -04:00
Steel Titanium 3ebb9c2c49
More harmful cactus 2019-09-12 21:36:13 -04:00
Jaime Passos 9b0e2b8991 Make nametags compatible with current player.dta
(again)
2019-09-11 22:18:03 -03:00
Jaime Passos f2915817a7 Merge remote-tracking branch 'origin/master' into newmenus 2019-09-11 22:17:42 -03: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 e5d9d3499f DON'T PUSH ALONE - first dregs of continue screen 2019-09-09 15:25:36 +01:00
Jaime Passos abfa5e10b6 Make nametags compatible with current player.dta 2019-09-07 23:40:00 -03:00
Jaime Passos 1fca5a749e Merge remote-tracking branch 'origin/master' into rotsprite_i 2019-09-02 23:36:30 -03: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 806b106905 Hardcoded the Pyre Fly 2019-08-30 08:17:25 +02:00
MascaraSnake 2933ec3e9c Simplified the lavafall rock states with FF_RANDOMANIM, fixed Var1 for the FF_ANIMATE states 2019-08-27 19:33:54 +02:00
Jaime Passos 93f1450b8a Merge remote-tracking branch 'origin/master' into newmenus 2019-08-26 19:32:44 -03: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
Jaime Passos 85499040d3 did The Thing 2019-08-19 14:23:03 -03:00
Jaime Passos f68652aa66 I 2019-08-18 14:16:48 -03:00
toaster 324c584e5d 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 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 c7bbefb3f8 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 00c3329ba9
Ring sparkle mirroring 2019-08-03 18:28:53 -04:00
Steel Titanium 26689e168e
Merge branch 'master' of git.magicalgirl.moe:STJr/SRB2Internal into ringsparkle 2019-08-03 17:33:28 -04:00
toaster 8a0f1e7ed4 Merge branch 'ending' into 'master'
ENDINGS

See merge request STJr/SRB2Internal!264
2019-08-03 16:23:51 -04:00
Steel Titanium 3177b27a11
Changes
Kill off the hack
2019-07-31 20:51:55 -04:00
Steel Titanium 58b56b2867
New ring sparkles 2019-07-31 00:47:42 -04:00
toaster 063e350c63 A good and bad ending cutscene now exist.
Also:
* SPR2_XTRA - instead of defining lumpnames in S_SKIN, those kinds of assets can just be bundled into the spriteset. Required for ending cutscene stuff, I guess, but also done for HUD life icon and character select image (aside from Sonic&Tails, still SOC'd in).
* Minor oversights in SPR2 support corrected.
* Better evaluation, featuring ending assets.
* Intro has warping-in blackrock, reusing ending assets.
* Cutscene text now supports lowercase (intro and custom).
* Disable the asset-fucking "gamma correction" I put in over two years ago when implementing colour cube. (This is the only thing I could move into another branch if you MUST, but it's basically invisble in the diff so w/e.)
* Don't blank the screen if the top left pixel of a screen-covering patch is transparent. (Checked via nonzero topdelta for first column)

Bugs:
* OPENGL ONLY: The first ~20 frames of both endings are fucked. A little help here? Might be HWR_DrawFadeFill's fault, which I just created. OR it could be in f_finale, but I doubt it, since it doesn't appear in Software.
2019-07-28 00:32:57 +01:00
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
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
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
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
Steel Titanium d2adb5e829 Update info.h
Also add a case for MT_BRICKDEBRIS to P_MobjThinker
2019-07-06 18:11:49 -04:00
Steel Titanium ec8f64100e Hardcode brick debris 2019-07-06 00:36:02 -04: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
toaster 4ad1703ae3 Revert "Revert "Merge branch 'metalfixes' into 'toast_cleanup'""
This reverts commit c04b560e92.
2019-07-03 00:58:02 +01:00
MascaraSnake c04b560e92 Revert "Merge branch 'metalfixes' into 'toast_cleanup'"
This reverts merge request !239
2019-07-02 23:49:10 +00:00
toaster f9f92abc44 ha ha ha ha ha ha ha ha
Sea Egg is majorly changed according to Mystic's ancient instructions (excepting the flying FOF rock, I cared not for fucking around with FOFs).

Specifically:
* Faster paced fight.
* Instantly travels horizontal distance.
* Fakes no longer hurt papa, and spin out like a deflating balloon when he dies.
* New attack: When surfacing, produces an electric shockwave. Replaces underwater shock. Designed for new, shallow arena.
* Support for multiple bosses in the same map distinguished by parameter.

Will upload map to fight the new battle in on the MR.
2019-06-30 15:37:33 +01:00
toaster faebe0f9af Metal Sonic fixes!
* Add more context clues to his fight, including an indicator for which laser attack is being used after chargeup.
* Make missiles able to vectorise him.
* Add another laser orb attack - vertical slice - and change the laser orb sequence to accurately reflect that horizontal is the hardest of the ones in 2.1.
* Optimise TC_BLINK, and fix an issue with TC_ALLWHITE that somehow avoided coming up in testing.
* Fix colorized bosses losing their colorization when flashing, by forcing TC_ALLWHITE.
2019-06-28 20:48:14 +01:00
toaster d5988c4f8c Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into toast_cleanup
# Conflicts:
#	src/p_mobj.c
2019-06-26 20:43:37 +01:00
toaster 2e6898f29e PITY IN PINK!
* Smoothen Pity Shield animation to go with sphere's updates to Nev3r's sprites.
* Added LHRT object, designed to be summoned with CA2_MELEE.
    * Gives a pink Pity Shield (SH_PINK) on same-team player contact.
    * Deals damage to non-player enemies.
    * Harmlessly fades into nothing when touching an enemy player, players with SH_PINK already, and players capable of applying SH_PINK to others (through non-Lua methods).
* Basically, you-know-who is the Healer of the party whenever they're around. Fun consequences for the Co-op and CTF metas.
2019-06-19 23:20:24 +01:00
MascaraSnake 95a0b3fc86 Merge branch 'master' into new-acz-minecarts 2019-06-17 20:43:21 +02:00
MascaraSnake b6790c7f35 Snapper head/legs and minecart segments flash when they're destroyed 2019-06-16 15:35:32 +02:00
MascaraSnake ba9c7d9310 More incomplete minecart hardcoding 2019-06-13 21:45:30 +02:00
MascaraSnake fafabaae2b Hardcoded the saloon door 2019-06-12 21:20:14 +02:00
MascaraSnake 068e07974d Hardcoded the new Snapper behavior 2019-06-10 20:32:50 +02:00
MascaraSnake 0e80d2ec5d Hardcoded the new Minus behavior 2019-06-10 17:42:37 +02:00
MascaraSnake b98de5d362 Hardcoded the new BASH behavior (there's still a bug lurking somewhere) 2019-06-10 16:09:15 +02:00
MascaraSnake 98ea229680 Hardcoded the Canarivore 2019-06-10 13:58:16 +02:00
Monster Iestyn e7e3b0ef38 Merge branch 'public_next'
# Conflicts:
#	src/doomdef.h
#	src/hardware/hw_draw.c
#	src/m_misc.c
#	src/sdl12/macosx/Srb2mac.xcodeproj/project.pbxproj
2019-06-09 20:04:08 +01:00
MascaraSnake 3a16a7d7d4 Hardcoded train dust and steam spawner 2019-06-09 17:16:07 +02:00
MascaraSnake 6df14492a5 Hardcoded train cameo 2019-06-09 13:48:07 +02:00
MascaraSnake ca4ab06abf Hardcoded wood debris 2019-06-09 12:27:09 +02:00
MascaraSnake 7b603f4ac8 Hardcoded the TNT barrels and proximity shell (using mazmazz's A_TNTExplode implementation from the minecart branch) 2019-06-09 10:51:33 +02:00
MascaraSnake 546af19c82 Hardcoded oil lamp 2019-06-08 15:50:01 +02:00
MascaraSnake 1aaccfcd5c Hardcoded dust devil 2019-06-08 09:51:46 +02:00
Steel Titanium d4dac52766 Upped freeslots limit 2019-06-03 15:23:48 -04:00
Monster Iestyn 677801f5ff Hardcode the bomb's explosion states, the dust object type and states, and the sprite prefixes for both 2019-05-23 21:51:58 +01:00
Monster Iestyn 7d0509f1cb Merge branch 'master' into acz-boss-hardcode 2019-05-23 20:38:25 +01:00
Monster Iestyn 742b11c0ff Hardcoded ACZ3.wad's version of A_TNTExplode under the name of A_Boss5BombExplode. After a lot of confusion and silly misunderstandings on my part (as well as a lot of mess cleaning), I've finally got there!
The states for the actual bomb explosion effect itself are yet to be hardcoded, but that I'll do tomorrow afternoon probably.
2019-05-21 21:51:19 +01:00
Steel Titanium b34aa86403 Hardcode some ACZ things 2019-05-11 22:56:23 -04:00
Monster Iestyn 691ae982e7 S_FANG_SLIDE wasn't defined in the Lua script, despite being declared :|
Also Fang seems to turn invisible after his first jump for some reason, and I can't figure out why???
2019-05-04 21:31:46 +01:00
Monster Iestyn df99e93288 Hardcoded A_Boss5FindWaypoint
...that took a while x_x
2019-05-03 22:58:54 +01:00
Monster Iestyn 0d7cd34882 Hardcoded A_Boss5MakeItRain 2019-05-03 20:52:56 +01:00
Monster Iestyn b03bfbabe4 Hardcode A_DoNPCSkid 2019-05-03 20:00:31 +01:00
Monster Iestyn b4d8c2fa29 Hardcoded A_Boss5PinchShot 2019-05-03 19:46:41 +01:00
Monster Iestyn 6cd2b73273 Hardcoded A_LookForBetter 2019-05-03 19:14:17 +01:00
Monster Iestyn a0220454fd Hardcoded A_PrepareRepeat and A_Boss5Calm, added missing prototype for A_Boss5ExtraRepeat (and also fixed its description) 2019-05-03 18:51:17 +01:00
Monster Iestyn 61eb05eab2 Hardcoded A_Boss5CheckFalling 2019-05-02 21:32:28 +01:00
Monster Iestyn 953a0c2967 Hardcoded A_Boss5ExtraRepeat 2019-05-02 21:21:15 +01:00
Monster Iestyn fb17c1ac5a Hardcoded A_Boss5CheckOnGround 2019-05-02 19:09:40 +01:00
Monster Iestyn 3bbc5d0b08 hardcoded A_DoNPCPain 2019-05-02 18:32:43 +01:00
Monster Iestyn 75701294ea Hardcode Fang waypoint object type (turns out no state is needed) 2019-05-02 18:11:44 +01:00
Monster Iestyn d92ccf6823 Hardcoded all the main Fang-specific object types, states and sprites.
This cannot be compiled as-is right now for the following reasons:
* Numerous actions still need to be hardcoded.
* MT_FBOMB uses the TNT barrel explosion (and by extention A_TNTExplode) for its death state. This is a pickle, I'll deal with it when I get to it.

Also missing:
* Fang waypoint object type+states.
* Fang's good looks (to be put in the resource files obviously).
* Fang's brain.
2019-05-02 18:01:18 +01:00