Steel Titanium
3ebb9c2c49
More harmful cactus
2019-09-12 21:36:13 -04:00
toaster
440b63ef13
Merge branch 'musicplus-resetmusic-followup' into 'master'
...
Follow-up fixes for reset-upon-dying music
See merge request STJr/SRB2Internal!284
2019-09-11 14:14:09 -04:00
toaster
9041a399c6
Merge branch 'nightsattackfixes' into 'master'
...
NiGHTS attack fixes
Closes #205
See merge request STJr/SRB2Internal!319
2019-09-08 16:42:45 -04:00
toaster
0ed589449a
Merge branch 'newegg' into 'master'
...
Newegg dot blag
See merge request STJr/SRB2Internal!305
2019-09-08 16:11:50 -04:00
toaster
5d85e82fa6
Fix detection of GRADE_ constants in SOC.
2019-09-07 20:08:05 +01: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
James R
89c4989987
Show a negative number to indicate ammo penalty
2019-08-26 16:07:17 -07: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
mazmazz
46993268ae
* Added FORCERESETMUSIC level header
...
* cv_resetmusicbyheader toggle to disable said override
* Never reset music during time attack
* Change cv_resetmusic default back to off
2019-08-04 20:02:38 -04:00
toaster
b06af59907
Merge branch 'revert_revert_musicplus' into 'master'
...
Revert "Revert MusicPlus"
See merge request STJr/SRB2Internal!282
2019-08-04 13:58:01 -04:00
toaster
384dc0674e
Revert "Revert "Merge branch 'musicplus-aug2019-b' into 'master'""
...
This reverts commit 603d5805f7
.
2019-08-04 12:03:57 +01:00
toaster
603d5805f7
Revert "Merge branch 'musicplus-aug2019-b' into 'master'"
...
This reverts commit 56bfdb7113
, reversing
changes made to c29cfbef9b
.
2019-08-04 11:32:55 +01:00
mazmazz
cdb7250da4
Merge branch 'musicplus-feature-postboss' into musicplus-aug2019-b
2019-08-04 03:22:36 -04:00
mazmazz
dd9efebab5
Merge remote-tracking branch 'origin/master' into internal-musicplus-jingle
2019-08-03 23:38:49 -04: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
d6dacaaab2
ALL CAPS
...
Woops forgot to do this
2019-07-31 00:49:14 -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
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
MascaraSnake
574cf2609f
Merge branch 'remove-character-flags' into 'master'
...
Remove character flags
Closes #27
See merge request STJr/SRB2Internal!246
2019-07-09 14:18:27 -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
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
ec8f64100e
Hardcode brick debris
2019-07-06 00:36:02 -04: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
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
MascaraSnake
5cec737985
Remove character-specific flags, replace them with net-only/no-net flags
2019-07-03 00:10:22 +02:00
MascaraSnake
e9978b2955
Merge branch 'master' into thinkerlists
...
# Conflicts:
# src/f_finale.c
# src/p_enemy.c
2019-07-02 23:08:37 +02: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
mazmazz
923dc34215
Merge branch 'public-notpublic-musicplus-jingle' into internal-musicplus-jingle
2019-06-29 18:33:45 -04: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
Steel Titanium
251494c3c8
Fix console back color not being correct.
...
This also adds support for using such colors in a text prompt
2019-06-26 22:08:17 -04: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
Monster Iestyn
ac669d77c4
Merge branch 'levelheader-startrings' into 'master'
...
Startrings level header option
Closes #155
See merge request STJr/SRB2Internal!237
2019-06-25 16:43:16 -04:00
Monster Iestyn
8aeee22529
Merge branch 'bossfixes' into 'master'
...
Boss fixes
See merge request STJr/SRB2Internal!235
2019-06-25 16:36:23 -04:00
Steel Titanium
7a23b19be8
Add startrings level header option
2019-06-23 18:15:40 -04:00
toaster
3021116797
Some preliminary work to make multiple bosses in the same map work nicely together, by allowing parameter to alter the linedef executor tag to call in increments of 100.
...
Also: Making sure every single reserved tag is recorded as an LE_ constant.
2019-06-22 17:03:39 +01:00