Commit graph

1988 commits

Author SHA1 Message Date
toasterbabe
5a798bddbd Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into shield-actions 2016-10-29 17:14:45 +01:00
Monster Iestyn
cd3895f676 Merge branch 'public_next' 2016-10-29 17:03:38 +01:00
Monster Iestyn
93b6550186 Merge branch 'next' into public_next 2016-10-29 17:03:20 +01:00
Monster Iestyn
158db5d380 Merge branch 'hereicome_rougherthanleather' into 'next'
P_IsPointInSubsector fix! (Most importantly: Knuckles No Longer In Space)

Now works in GL by not relying on stuff which GL mutates! Thanks for the guidance, @MonsterIestyn! Tested in Steel_Titanium's Nightlight Ruins (in SUGOI), which had the perfect testbed for plenty of Knuckles issues AND is one of the first maps out to the public which eschews thok barriers altogether in some sections.

* Knuckles climbing on one sided lines is now super great and doesn't allow any space-climbing at all, OGL-exclusive OR renderer-independent. I was able to restore my earlier perfect-in-Software fix because now it also works fine in GL, too!
* The devmode TELEPORT command now actually prevents you from going outside maps which don't have thok barriers near where you were. (It only prevented you from going outside maps with thok barriers because the thok barriers bled outwards and failed some other conditions.)
* Camera now behaves identically between Software and GL. (Look closely at p_user.c - I didn't modify any code in that section, but the chasecam DOES call P_IsPointInSubsector...)
* Here's a biggun - OpenGL precipitation is ALSO fixed! Yup. That's right. It used P_IsPointInSubsector too, and THAT'S why it was broken for all this time. (I did have to do a few other changes beyond just flipping the ifdef, but HOLY SHIT.) Tested this in Mystic Realm's second zone, which kept rain all the way through in OGL!!

(And yes, I AM compiling with OGL on for this branch.)

See merge request !128
2016-10-29 12:00:17 -04:00
toasterbabe
1c1af15b4f Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into shield-actions 2016-10-29 16:56:50 +01:00
toasterbabe
ab6fd676b5 YUP, I just fixed OGL Precipitation with this branch too. What the fuck? Squashing ancient bugs, woo. 2016-10-29 11:54:51 -04:00
toasterbabe
ff443251b1 P_IsPointInSubsector now works in both Software and GL, which means it can be used as the main driver behind support for Knuckles climbing on one-sided walls.
Also, the "teleport" devmode command can now gracefully handle coordinates specified outside maps with no/few thok barriers, which previously prevented teleport via the thok barrier bleed's sector floor and ceiling being equal.
2016-10-29 11:54:47 -04:00
Monster Iestyn
b1a53f6623 Merge branch 'public_next' 2016-10-29 16:52:43 +01:00
Monster Iestyn
5b6310c1c6 Merge branch 'next' into public_next 2016-10-29 16:52:22 +01:00
Monster Iestyn
8b5abd957c Merge branch 'slopes_n_objects' into 'next'
Fixing various problems with MF_SOLID collision

(I, toast, wrote the original merge request, but Alam made this merge request because I made a mistake. Twice. In a row.)

* Solid objects are now no longer intangible when your z is less than the other object's.
    * I originally thought the bug was limited to just solid objects on slopes (hence the branch name), and was wondering about undesired side effects - but looking at this gfy, this was a major bug that slopes made easier to expose.
    * Unfixed = http://gfycat.com/BareLimitedCavy
    * Fixed = http://gfycat.com/JubilantOffensiveGar
* You now properly lose your momentum when jumping at a solid object.
    * The way I fixed this was a hack, but it was originally a much worse hack which resulted in very bizzare physics issues, so...
    * Unfixed = http://gfycat.com/ShockingAbsoluteArthropods (also demonstrates the first bug)
    * Fixed = http://gfycat.com/EmbellishedCourageousGordonsetter

See merge request !119
2016-10-29 11:19:37 -04:00
Monster Iestyn
2ef1aaf15c Merge branch 'shield_issues' into 'next'
Fixed players disappearing when spindashing whilst wearing multi-layer shields

* Before: http://i.imgur.com/gxUFElo.png
* After: http://i.imgur.com/NxsOg94.png

The problem was that MT_OVERLAY's default radius and height were never getting changed from 1*FRACUNIT, and that meant that when you spindashed, the game considered it completely below the surface of the flat you were standing on. Since you're not usually clipped on flats that don't belong to FOFs, we didn't notice this aspect of the issue sooner.

(SORRY FOR THE MULTIPLE MR'S AGAIN I TOTALLY SUCK AT REMEMBERING TO MAKE SURE IT GOES TO NEXT INSTEAD OF MASTER)

See merge request !124
2016-10-29 11:19:09 -04:00
toasterbabe
8025ef2f79 At MI's suggestion (shields don't NEED to be tweaked, just overlays) 2016-10-29 16:08:19 +01:00
toasterbabe
fe67c6fbea Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2.git into shield_issues 2016-10-29 16:06:41 +01:00
toasterbabe
b9e7abe7ff Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into shield-actions 2016-10-29 15:59:45 +01:00
Monster Iestyn
f4ddaf51ab Merge branch 'public_next' 2016-10-29 15:37:53 +01:00
Monster Iestyn
d80987a44d Merge branch 'next' into public_next 2016-10-29 15:37:19 +01:00
Alam Arias
dfc83a5483 Merge pull request #128 from Yukitty/fix-animdefs
Fix ANIMDEFS process order
2016-10-28 22:45:37 -04:00
toasterbabe
bfdaf5ee90 Fixed the Force stop's scaling properly. Woo! Branch is basically done now. 2016-10-24 20:51:23 +01:00
toasterbabe
a533701d85 You know what, let's make this less hacky. 2016-10-24 18:53:22 +01:00
toasterbabe
cc4d780371 Making things more scale-friendly (but it's not perfect...) 2016-10-24 18:40:48 +01:00
Monster Iestyn
c42e7ee4b4 Merge branch 'next' into slopes_n_objects 2016-10-24 16:50:06 +01:00
toasterbabe
bf873f8a9b Fixed a heinous modding bug with not properly updating dehacked.c, and added pf_SHieldability to debug. 2016-10-24 16:30:40 +01:00
toasterbabe
ea30450180 Minor correction to force-hud conditional. 2016-10-24 14:45:26 +01:00
toasterbabe
0ee2937392 Adding ShieldSpecial hook. (Activates under different circumstances to the JumpSpinSpecial hook, and can be used to cancel existing shield actions.) 2016-10-24 13:52:52 +01:00
toasterbabe
162c04c370 Bubblewrap shield now bounces on enemies and monitors instead of piercing through them. 2016-10-24 13:33:10 +01:00
toasterbabe
0ccf6fe6a9 I commented out this line a while ago because it didn't seem to be important, and flashingtics seems to be thoroughly set elsewhere. Here's an actual removal so it stands out on the git diff. 2016-10-24 12:43:54 +01:00
toasterbabe
3ce411b62a Mario mode is boring again. (I'm going to revert this commit as soon as possible, but shield_actions needs to be clean of Mario stuff for now.) 2016-10-24 12:35:40 +01:00
toasterbabe
a5a6ceff71 More thorough Mario soundification for new shield sounds. 2016-10-23 22:21:42 +01:00
toasterbabe
3e3f595f1e Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into shield-actions 2016-10-23 20:39:05 +01:00
toasterbabe
45d32b7f7c * Flameaura shield now has boosh sprites.
* MF2_SHIELD calls shield thinker (P_AddShield/P_ShieldLook).
* Multiple types of force shields now handled.
2016-10-23 20:34:43 +01:00
Monster Iestyn
6bf8e3dcad Merge branch 'development_stuff' into 'master'
Development improvements

An improvement to Objectplace I've wanted to make for a loooong time.

* Object number up/down is now assigned to ringslinger weapon next/prev. SO much nicer to use, especially since most people have that stuff bound to the scroll wheel.

Also, some changes to the devmode overlay:

* Plays nicely with showfps on - see http://imgur.com/a/zSzvm for the various cases (showfps on, devmode 65535, and both).
* Add PF_THOKKED to the flags in devmode DBG_DETAILED (as "TH").
* "Flags:" replaced with "PF:", "Heap used" replaced with "Heap". The latter is a debatable change, but the former isn't - otherwise the line is way too long compared to the rest of the stuff.

See merge request !45
2016-10-23 14:42:57 -04:00
toasterbabe
cfc9302bd3 Minor fix to ensure PF_FORCEJUMPDAMAGE is always known. 2016-10-23 17:05:17 +01:00
toasterbabe
956a8358c2 Important component for nojumpspin characters. 2016-10-23 16:26:36 +01:00
toasterbabe
c54d62851c Okay, this is a MUCH better solution than PF_JUMPDAMAGE. 2016-10-23 16:04:02 +01:00
toasterbabe
76ff26e6fb Revert "Thorough jumpdamage setting."
This reverts commit 8720252059.
2016-10-23 15:53:12 +01:00
toasterbabe
c18c014bef Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into shield-actions 2016-10-23 14:47:37 +01:00
toasterbabe
8720252059 Thorough jumpdamage setting. 2016-10-23 14:42:37 +01:00
Monster Iestyn
e390598e13 Fix objectplace controls text so it displays "Weapon Next/Prev" 2016-10-23 14:35:35 +01:00
Inuyasha
fa187c5ae7 Merge branch 'unslot-music' into 'master'
Hardcoded music name switches

Like I said earlier, it's better if all the hardcoded music switches in 2.2 start with an underscore so that it's harder to accidentally overwrite them.

Should be accepted when music.dta is updated.

See merge request !17
2016-10-23 06:46:33 -04:00
Inuyasha
9d5e0b314b Autoload music_new.dta if it exists
Same no non-music lump requirement as music.dta, and is ignored with no error if music_new.dta doesn't exist
(should hopefully make playing around with music easier)
2016-10-23 03:44:51 -07:00
Monster Iestyn
bd153d83b7 Merge branch 'nix-srb1' into 'master'
Remove SRB1 Remake data

What it says on the tin.

See merge request !47
2016-10-22 22:18:36 -04:00
Monster Iestyn
326ad8a14f Merge branch 'wallscrollbylinedef-fix' into 'master'
Wallscrollbylinedef fix

See commit description.

See merge request !43
2016-10-22 09:52:07 -04:00
toasterbabe
5ad7fc8495 A better check than for skin==0. 2016-10-21 12:34:16 +01:00
toasterbabe
6abd4d20d3 Further tightening. 2016-10-21 12:31:06 +01:00
toasterbabe
bda630ce41 I could do better than the previous commit. 2016-10-21 11:57:59 +01:00
toasterbabe
4c0ef9f0a3 * No ridiculously-fast float animation.
* No falling when you accidentially press spin.
2016-10-21 11:48:41 +01:00
toasterbabe
b34dc93a18 Fix to the previous commit to basically do what I wanted it to do as opposed to accidentially altering behaviour of jumping on crawlas. 2016-10-21 11:31:44 +01:00
toasterbabe
a053b117e1 Moved the Super Sonic hover over to holding down the jump button (which conveniently links it pretty closely to the thok, which could be called the Float Thok or something I dunno.)
Also, only one shield ability is selectively blocked by being Super now, and that's because Invincibility does it too and therefore I assume that's a match balance thing instead of a keyboard clash.
2016-10-21 11:08:32 +01:00
toasterbabe
f145898ca4 Woops. 2016-10-20 21:39:58 +01:00
toasterbabe
769962c884 Minor cleanup. 2016-10-20 21:15:41 +01:00