stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-12-27 13:10:43 +00:00
Code Issues Projects Releases Packages Wiki Activity
8637 commits 173 branches 41 tags 307 MiB
Commit graph

8637 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
587c0079e2 Started work on FLIPX/FLIPY support for patches. Doesn't do anything yet, but the parser should know how to look for them now 
Note: I had to create M_UnGetToken in order to avoid problems with looking for patch parameters (marked by { and }) but not finding anything
 2016-10-22 23:19:24 +01:00
Monster Iestyn
6473953c8c Merge branch 'master' into lua-additions 2016-10-22 14:59:01 +01:00
Monster Iestyn
1d70a9d9d2 Merge branch 'master' into crumble-FOF 2016-10-22 14:58:37 +01:00
Monster Iestyn
dd5fa80839 Merge branch 'master' into damage-control 2016-10-22 14:55:06 +01: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
Prisima the Fox
b5988e082c No more magic numbers 2016-10-21 16:27:15 -04:00
Prisima the Fox
c38457f23c No more magic numbers 2016-10-21 16:25:07 -04:00
Prisima the Fox
6733152651 No more magic numbers 2016-10-21 16:16:54 -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
Prisima the Fox
defc7c1645 Oops; PlayerQuit isn't a boolean! 2016-10-20 23:26:41 -04:00
Prisima the Fox
fcf2fe79e0 Oops; PlayerQuit isn't a boolean! 2016-10-20 23:25:47 -04:00
Prisima the Fox
89e8766b77 "PlayerQuit" hook 2016-10-20 22:30:11 -04:00
Prisima the Fox
cfb2feff8e "PlayerQuit" hook 2016-10-20 22:25:11 -04:00
Prisima the Fox
cb62f08364 "PlayerQuit" hook 2016-10-20 22:23:50 -04:00
toasterbabe
f145898ca4 Woops. 2016-10-20 21:39:58 +01:00
toasterbabe
769962c884 Minor cleanup. 2016-10-20 21:15:41 +01:00
toasterbabe
59fccab8e5 Restructured things so nojumpdamage characters can use the elemental, bubblewrap and attract shields. 2016-10-20 20:55:15 +01:00
Monster Iestyn
3bc29919c2 Merge branch 'public_next' 2016-10-20 16:38:39 +01:00
Monster Iestyn
34d7b51c68 Merge branch 'next' into public_next 2016-10-20 16:38:16 +01:00
toasterbabe
c1a8dd9a37 Minor refactor of what I did last night - as a modifiable state instead of hardcoded references. 2016-10-20 13:44:03 +01:00
Monster Iestyn
8e660ce863 Merge branch 'drawscaled-scalefix' into 'next' 
v.drawScaled negative scales fix

Lua now errors if you try to use negative scales with v.drawScaled, rather than crashing as it does in 2.1.16 currently. Not much else to say here.

See merge request !126
 2016-10-19 21:11:44 -04:00
toasterbabe
8fe932b0e7 * Force shield force stop completed 
* Bubblewrap shield bounce now no longer allows thokking post-bounce, but still allows bouncing
* plus a bunch of tiny changes to clean up code around the place.
 2016-10-20 00:33:12 +01:00
Yukita Mayako
cdb841ef54 Only P_InitPicAnims when wads are loaded. 
Not in P_SetupLevel. That's just dumb.
 2016-10-19 03:24:43 -04:00
Yukita Mayako
aa3e52f05e Fix ANIMDEFS parsing to allow overwrite. 
ANIMATED and ANIMDEFS are now processed in reverse order,
and duplicate definitions in ANIMDEFS are dropped.
 2016-10-19 03:24:26 -04:00
Monster Iestyn
f72e8a8ff8 Merge branch 'reverseplatform_clippingfixed' into 'next' 
Fixing FF_REVERSEPLATFORM clipping fixes

Forgot the case where == 0.

Tested by @wolfy852 in Top Down, where the bugs this caused were first discovered.

See merge request !121
 2016-10-18 17:19:48 -04:00
Monster Iestyn
fc44e53056 Merge branch 'slopes-even-more-fixes' into 'next' 
Even more slope-related fixes

What it says on the tin pretty much:

Currently included fixes:
* Pusher specials applied to FOFs did not properly account for slopes applied to the bottom plane; this probably was just a minor slipup that appeared on adding the support in the first place, I take it? (some waterfall in the last section of SUGOI's Fudge Canyon is the only place I can think of offhand where this bug is noticable)

See merge request !114
 2016-10-18 17:19:13 -04:00
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
TehRealSalt
ee75cbba70 Merge remote-tracking branch 'refs/remotes/upstream/next' into next 2016-10-16 01:39:43 -04: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