Commit graph

203 commits

Author SHA1 Message Date
Jaime Passos
402012e973 I 2019-08-18 14:16:48 -03: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
Steel Titanium
3ef2aa20be Changes
Kill off the hack
2019-07-31 20:51:55 -04:00
Steel Titanium
5bfd3c8738 New ring sparkles 2019-07-31 00:47:42 -04:00
toaster
74c32c1b2b 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
76d6a96c69 Add a blue variant of the pole banner & change some doomednums. 2019-07-14 17:30:33 +02:00
sphere
aabf7ed113 Add a blue variant of the waving flags. 2019-07-14 16:50:45 +02:00
Monster Iestyn
8151360ca7 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
7a8843a295 Merge branch 'seaegg_tweaks' into 'master'
Sea Egg

See merge request STJr/SRB2Internal!244
2019-07-09 16:25:07 -04:00
toaster
3c5cbd5980 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
dcbe0f7f46 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
0124e248ee 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
5dc55712e1 Update info.h
Also add a case for MT_BRICKDEBRIS to P_MobjThinker
2019-07-06 18:11:49 -04:00
Steel Titanium
0374101ca1 Hardcode brick debris 2019-07-06 00:36:02 -04:00
toaster
c0f7cfaa8e 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
168a7f4768 Revert "Revert "Merge branch 'metalfixes' into 'toast_cleanup'""
This reverts commit c17ec4a77e.
2019-07-03 00:58:02 +01:00
MascaraSnake
c17ec4a77e Revert "Merge branch 'metalfixes' into 'toast_cleanup'"
This reverts merge request !239
2019-07-02 23:49:10 +00:00
toaster
6036b67f3d 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
dbec3c7e54 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
e5918d629b 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
6bcad784a9 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
faa43ea92d Merge branch 'master' into new-acz-minecarts 2019-06-17 20:43:21 +02:00
MascaraSnake
3dc4e1d950 Snapper head/legs and minecart segments flash when they're destroyed 2019-06-16 15:35:32 +02:00
MascaraSnake
720d84f87f More incomplete minecart hardcoding 2019-06-13 21:45:30 +02:00
MascaraSnake
01adbfc495 Hardcoded the saloon door 2019-06-12 21:20:14 +02:00
MascaraSnake
67c3d87190 Hardcoded the new Snapper behavior 2019-06-10 20:32:50 +02:00
MascaraSnake
db6b94e7a7 Hardcoded the new Minus behavior 2019-06-10 17:42:37 +02:00
MascaraSnake
a2c61983e5 Hardcoded the new BASH behavior (there's still a bug lurking somewhere) 2019-06-10 16:09:15 +02:00
MascaraSnake
b8aac236f2 Hardcoded the Canarivore 2019-06-10 13:58:16 +02:00
Monster Iestyn
67392baae0 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
91ecf9c380 Hardcoded train dust and steam spawner 2019-06-09 17:16:07 +02:00
MascaraSnake
6f7b77f650 Hardcoded train cameo 2019-06-09 13:48:07 +02:00
MascaraSnake
4910c213b2 Hardcoded wood debris 2019-06-09 12:27:09 +02:00
MascaraSnake
3653d5b46e 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
65d804e77d Hardcoded oil lamp 2019-06-08 15:50:01 +02:00
MascaraSnake
80f09c35bb Hardcoded dust devil 2019-06-08 09:51:46 +02:00
Steel Titanium
8f19878781 Upped freeslots limit 2019-06-03 15:23:48 -04:00
Monster Iestyn
36415b0050 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
3cb336bdbc Merge branch 'master' into acz-boss-hardcode 2019-05-23 20:38:25 +01:00
Monster Iestyn
10430628e6 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
ed6bd64014 Hardcode some ACZ things 2019-05-11 22:56:23 -04:00
Monster Iestyn
ccf78f3660 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
faf353b546 Hardcoded A_Boss5FindWaypoint
...that took a while x_x
2019-05-03 22:58:54 +01:00
Monster Iestyn
59c345d68f Hardcoded A_Boss5MakeItRain 2019-05-03 20:52:56 +01:00
Monster Iestyn
fd2c5a31a6 Hardcode A_DoNPCSkid 2019-05-03 20:00:31 +01:00
Monster Iestyn
1c8ec85019 Hardcoded A_Boss5PinchShot 2019-05-03 19:46:41 +01:00
Monster Iestyn
e1482e1f6b Hardcoded A_LookForBetter 2019-05-03 19:14:17 +01:00
Monster Iestyn
2dd9c81259 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