Commit graph

2374 commits

Author SHA1 Message Date
Monster Iestyn e1baf02b7a Lua now errors if negative scales are used with v.drawScaled 2016-10-18 22:07:20 +01:00
toasterbabe 6f1ce5c1ca Merge branch 'next' of http://git.magicalgirl.moe/STJr/SRB2.git into slopes_n_objects 2016-10-18 21:56:40 +01:00
toasterbabe 9b4c81ed0b Thundercoin shield complete. 2016-10-17 23:22:04 +01:00
toasterbabe 0e73924ebb Changed the pity shield sound to one with a higher volume. 2016-10-17 21:24:10 +01:00
toasterbabe 51ffa6d5ea Kill an overlay if the target is removed between P_AddOverlay and P_RunOverlays. 2016-10-17 21:23:58 +01:00
toasterbabe beecd72a22 BUBBLE BOUNCE ANIMATION 2016-10-17 20:39:22 +01:00
toasterbabe e107fe498b Adding new sounds for SRB2 shields. 2016-10-17 18:01:43 +01:00
toasterbabe 366e282495 Cleaned up the shield-ability stuff to be cleaner (and reduce MT_OVERLAY thinking). 2016-10-17 14:39:32 +01:00
toasterbabe c693af96b1 * Bubble bounce completed (minus graphics).
* Flame burst fixed with respect to scale.
2016-10-17 14:03:32 +01:00
toasterbabe 76b30df528 * Slower Bubblewrap animation.
* Corrected bounce height for Elemental underwater.
* Using Elemental ability in goo is cancelled.
* Different Attract failure sound.
2016-10-17 00:27:29 +01:00
toasterbabe 76700241f6 Leaky Mario mode bug fixed. 2016-10-16 22:59:25 +01:00
toasterbabe 5ff507213b * Some shield constants renamed.
* Some shield sounds swapped (can be reverted later).
* Partial implementation of S3K shield abilities.
* The ability to elemental-groundpound onto gold monitors without going straight through them.
* Force shield ability removed because nobody could agree on it, we'll keep it blank until another idea can get through the disagreement juggernaut.
2016-10-16 22:28:50 +01:00
toasterbabe 2acfc72d86 Made P_SwitchShield take into account the force shield, then made A_ForceShield take the number of bonus hitpoints as its var1. (Also, drowning timer is properly reset by ALL protectwater shields, not just elemental.) 2016-10-16 12:45:31 +01:00
toasterbabe ace44df8b4 Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into shield-actions 2016-10-16 01:32:05 +01:00
toasterbabe aa8a454ea9 Turning some shield attributes into flags means that environmental protection and ring-pulling can be more elegantly handled. As a consequence, the S3 shields now have all their passives, and are just waiting on me to give them actives (two of which don't have the necessary sprites for...) 2016-10-16 01:23:00 +01:00
toasterbabe 3aa9d2a1b1 Sonic 3 shields implemented at a basic visual/functional level - no abilities yet. 2016-10-15 23:39:54 +01:00
Monster Iestyn 8931a6f0fb Merge branch 'public_next' 2016-10-15 22:31:56 +01:00
Monster Iestyn 491a381f4b Merge branch 'next' into public_next 2016-10-15 22:30:50 +01:00
toasterbabe 6e47a07a04 Fixed monitors not making sounds if you had that monitor already and it wasn't mariomode. 2016-10-15 17:58:08 +01:00
toasterbabe 05aefc3ede Removed bit of code that'd never run. 2016-10-14 18:11:31 +01:00
toasterbabe 2d85b146ea Messed up the force shield stuff when implementing SH_MUSHROOM. 2016-10-14 14:44:49 +01:00
toasterbabe 91f9770caf Fixed up the coin-looping. 2016-10-14 11:23:13 +01:00
toasterbabe 2903180dee Treat the loss of the mushroom as a weapon-ring-spilling event in Mario-themed ringslinger, based on comments MI made on IRC about how different mariomode ringslinger would be. 2016-10-14 11:09:46 +01:00
toasterbabe 5e92ca1a4a Okay, made the Mushroom a seperate shield instead of a hacked pity shield. This is a lot nicer in general. 2016-10-14 10:43:46 +01:00
toasterbabe 8f1493e135 Start big. (He's been on the same powerpoint slide for 30 minutes now.) 2016-10-13 15:49:35 +01:00
toasterbabe a119db3a85 Coins are no defense now! (This lecture is boring.) 2016-10-13 15:36:37 +01:00
toasterbabe 80300ac476 Fireflower is now on same level as all other shields, as opposed to being an additional stack layer. (MID LECTURE COMMIT STRATS YO) 2016-10-13 15:14:13 +01:00
toasterbabe 4997564d30 I like this timing more. 2016-10-12 23:55:16 +01:00
toasterbabe a36912baef In Mario mode...
* shields give you 1000 points
* redundant shields don't make you puase
* checkpoints give you 2000 points
* falling down a deathpit is just falling, not bouncing
2016-10-12 23:47:18 +01:00
toasterbabe dff9209bd2 A fix for the thing where you can get stuck inside a Mario block that has a monitor in it. 2016-10-12 22:06:40 +01:00
toasterbabe 71b7db4e0d Refinements to flashing. 2016-10-12 22:06:12 +01:00
toasterbabe d4f0afa0d1 A Heckloada Mario Stuff
https://gfycat.com/MasculineSatisfiedAfricanwilddog and https://gfycat.com/PastCompetentGypsymoth describe this all in varying states of completion
2016-10-12 17:55:07 +01:00
toasterbabe a842d96a48 Forgot to commit this change when moving everything over to shortmarioshifts. 2016-10-11 23:38:34 +01:00
toasterbabe 64a1fa5421 Players are half height in Mario mode when they don't have any shields, the Mario mode pity shield is invisible, and Mario mode players immediately get a pity shield when they lose any other type of shield. So basically that's a Red Mushroom, right?
https://gfycat.com/ThoughtfulAcademicChrysalis
2016-10-11 23:35:48 +01:00
Monster Iestyn ff0b1d1dfa Split polyobj plane drawnode-creating code from ds->maskedtexturecol code, and add plane bounds checking 2016-10-11 22:35:46 +01:00
toasterbabe d25e908b80 Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into shield-actions
# Conflicts:
#	src/p_map.c
2016-10-11 16:25:24 +01:00
Monster Iestyn b66925e467 R_FindPlane now has a polyobj argument, R_DrawPlanes now skips polyobj planes, like it does with FOF planes 2016-10-09 21:48:25 +01:00
Monster Iestyn 1c23a84aa5 set floorcenterz/ceilingcenterz for all of R_Subsector to use, not just FOF planes 2016-10-09 20:55:04 +01:00
Monster Iestyn 405237d364 Merge branch 'SLADE_textures' into 'next'
Treating " as whitespace in TEXTURES (and animdefs too i guess)

SLADE adds this character in its TEXTURES editor and makes SRB2 cry unless the lump is manually edited; this just treats it as whitespace so we don't have to think too hard about it.

Also, two I_Errors now refer to the correct lump name.

See merge request !122
2016-10-09 11:23:01 -04:00
Monster Iestyn b51d69e1ec Merge branch 'master' into lua-additions 2016-10-08 17:12:45 +01:00
Monster Iestyn 719220da4a Merge branch 'master' into damage-control 2016-10-08 17:12:13 +01:00
Monster Iestyn f3efebe889 Merge branch 'vertical-sky-distort2' into 'master'
Proper barrel sky distortion

Skies now use proper barrel distortion in both axes, rather than just the x-axis (i.e. just horizontally) as in all previous SRB2 versions. Credit goes to Nev3r for the original change and idea.

Was going to make an option for a non-barrel distorted sky, assuming barrel distortion is the default, but I just can't quite get it to work in a way that is pleasing to the eyes. So I've not bothered with it here for now, unless someone objects to barrel distorted skies for any reason?

See merge request !35
2016-10-07 17:30:15 -04:00
Monster Iestyn f43d615607 Merge branch 'fof-slope-skew' into 'master'
FOF wall slope skewing

FOF walls now can optionally skew with respect to slopes (software mode only currently):

* Upper Unpegged on the CONTROL linedef enables wall skewing
* Lower Unpegged on the IN-LEVEL linedefs ^1 determine which slope to skew with respect to (off = top slope, on = bottom slope)
* If Transfer Line is used however, Lower Unpegged on the control sector's linedefs does the above's job instead

^1 (this is because they already control pegging of individual FOF walls as it is, so this is for convenience and my sanity that they also deal with skewing)

See merge request !39
2016-10-07 17:29:21 -04:00
Monster Iestyn 303648bf3b Merge branch 'horizontal_fix' into 'master'
Fixes to horizontal spring collision

Fixed various issues arising from collision with exclusively horizontal springs. Thamks to @Inuyasha for the heads up! Of note:

* If you hold down your jump button whilst jumping into it, you no longer immediately use your ability.
* Characters with (CA_DOUBLEJUMP && CA2_MULTIABILITY) or CA_FLOAT or CA_HOVER no longer lose track of their jump count.

Also:

* Upped the strength of info.c's red and yellow horizontal springs.

See merge request !41
2016-10-07 17:28:54 -04:00
Monster Iestyn c5f51ded32 Merge branch 'horizon_lines' into 'master'
Horizon lines

Horizon lines for software mode! Place a Linedef type 41 somewhere on a one-sided linedef and it'll do fancy rendering hacks to draw the adjacent floor/ceiling to the "horizon". One small thing to sort out when I remember to do so, but this is good enough for merge already.

See merge request !44
2016-10-07 17:28:25 -04:00
Monster Iestyn 9160c8aeb4 Merge branch 'animate_global' into 'master'
FF_ANIMATE additions: globally synced animations

FF_GLOBALANIM = makes the animation synced to the level's timer, so all objects will display the same frame at the same time

![](https://dl.dropboxusercontent.com/u/3518218/22/srb22-0008.gif)

I mean, doesn't that look so much prettier?

There's also some changes to FF_MIDDLESTARTCHANCE (FF_ANIMATE behavior was split due to not acting consistent between that and SPR2 behavior).

See merge request !46
2016-10-07 17:27:53 -04:00
Nevur c558900c61 Deleted the Add_WallScroller function entirely from code.
Removed commented out instance using the function.
2016-10-07 18:56:10 +02:00
Inuyasha ff4b39bab4 Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal into nix-srb1
# Conflicts:
#	src/info.c
2016-10-05 18:47:32 -07:00
Inuyasha 482f60e5bc warning: suggest parentheses around arithmetic in operand of '|' 2016-10-03 00:51:18 -07:00
Inuyasha 0fdfb1a472 Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal into animate_global
# Conflicts:
#	src/p_pspr.h
2016-10-03 00:27:49 -07:00