thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
18485 commits 1 branch 12 tags 205 MiB
Commit graph

957 commits

Author SHA1 Message Date
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
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
be14e062e8 Make MANIASPHERES' #define'd away stuff also recreatable with SOC, since I want to release it publically if the team don't want it. 2019-07-29 21:06:17 +01:00
Monster Iestyn
1f30c27c79 Merge branch 'wavingflag' into 'master' 
New CEZ scenery

See merge request STJr/SRB2Internal!257
 2019-07-28 15:44:00 -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
sphere
3f2f037456 Don't upscale the waving flags, make them twice as large instead 2019-07-14 15:30:00 +02:00
sphere
af3089cda5 Add meleestate to MT_WALLSPIKE. 2019-07-14 01:29:36 +02:00
sphere
d244f7d18e Assign sound to the wood debris object. 2019-07-13 23:15:56 +02:00
MascaraSnake
d1554b531f Merge branch 'master' into acz-fixes 2019-07-10 08:47:22 +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
Monster Iestyn
d9048f2c39 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
11bf294a74 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
e5cdfe998b 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
83ca8e065d 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
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
MascaraSnake
5bc8424419 TNT barrels are no longer enemies, but still aimable for Fang 2019-07-07 12:06:45 +02:00
Steel Titanium
c7527ad58b Change this, not that it really matters but 2019-07-06 00:39:36 -04:00
Steel Titanium
0374101ca1 Hardcode brick debris 2019-07-06 00:36:02 -04:00
toaster
63889422a6 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
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