Commit graph

22279 commits

Author SHA1 Message Date
toaster
e7b53c3c09 * User manual!
* Some visual ordering fixes for the item menu, plus a #define-toggleable option for the bottom right slot to be traversable for ease-of-use purposes (even if it doesn't do anything).
2018-09-08 17:02:03 +01:00
mazmazz
c6ffa6fbe5 Initialize invisible FOF alpha to 1 on first fade 2018-09-08 09:31:23 -04:00
mazmazz
bbdf09f19e Handle rendering flags for invisible FOFs 2018-09-08 09:08:32 -04:00
mazmazz
6cd3fd8c7d Enable FF_CUTSOLIDS handling and updating by sector->moved 2018-09-08 08:59:17 -04:00
toaster
00931cbb35 Watertight fix I was avoiding because it's definitely slower to check ranges at runtime, but papersprites are used intermittently enough that I don't think it's a super big deal. 2018-09-08 12:12:28 +01:00
toaster
200f1cb01e Merge branch 'sal-misc' of https://git.magicalgirl.moe/KartKrew/Kart.git into itemdrop 2018-09-08 11:49:42 +01:00
TehRealSalt
051324c25a Weight increases with speed
Might be a tad weak right now, but we'll see if people want it stronger
2018-09-08 04:04:10 -04:00
TehRealSalt
caafb9265d Merge branch 'sonicitems' into sal-misc 2018-09-08 03:24:59 -04:00
TehRealSalt
c3afcc09cd Critical inconsistency fix 2018-09-08 03:24:32 -04:00
mazmazz
8ad62de044 Disable FadeFakeFloor for laser block 2018-09-08 01:33:12 -04:00
mazmazz
2a89fcfc87 Never handle FF_EXISTS if FF_BUSTUP 2018-09-08 01:23:15 -04:00
mazmazz
61960937b0 Fix Mario block triggering during ghost fade 2018-09-08 01:12:34 -04:00
mazmazz
9c1fc17233 Also check for FF_SOLID 2018-09-08 01:07:08 -04:00
mazmazz
f7731d7a41 Merge branch 'random-fof-fixes' into fof-fixes-movingplatexists 2018-09-08 00:37:04 -04:00
mazmazz
bc63a44330 Comment out tmfloorrover and tmceilingrover because unused 2018-09-08 00:36:43 -04:00
mazmazz
05ac0bb337 Fix player Z snap to floor on moving platform ~FF_EXISTS
* Track player's old floorz by mo->floor_sectornum and floor_ffloornum
* Track tmfloorz by tmfloorrover, tmfloor_sectornum, tmfloor_rovernum
* Ceiling variants of the above
2018-09-08 00:34:56 -04:00
TehRealSalt
b7e0baad98 Rebalanced odds table again 2018-09-07 22:17:38 -04:00
mazmazz
969741717d Thwomp fix: Don't trigger (look for players) when ~FF_EXISTS 2018-09-07 18:14:52 -04:00
TehRealSalt
6fa37c08a0 Okay do this correctly by doing a reacharound to grab the actual sfx id 2018-09-07 16:56:34 -04:00
TehRealSalt
045d3bf91d Speed pads always play a boost voice clip
For the extra SA1 feel :P
2018-09-07 16:20:20 -04:00
Monster Iestyn
ae6085ef1a Merge branch 'netcode-nitpicking' into 'next'
Netcode nitpicking

See merge request STJr/SRB2!274
2018-09-07 15:59:49 -04:00
TehRealSalt
6955b08a7e Minor tweakings
- Win/lose quotes are only played for your player
- Win, lose, and gloat lines are played from farther away
2018-09-07 15:50:24 -04:00
mazmazz
9055c58783 Initial polyobj fade skeleton 2018-09-07 15:27:18 -04:00
toaster
d8f445f456 * Slightly more papersprite stability!
* Slightly more sane Minecraft item scaling!
2018-09-07 14:26:00 +01:00
mazmazz
56d9522a62 Merge branch 'master' into nights-dronebox 2018-09-07 09:06:32 -04:00
mazmazz
2a26f456d4 Stray nights-onfootfix line 2018-09-07 09:01:38 -04:00
mazmazz
520ee1e189 Revert "Ideya fixes when a player has more than one Ideya"
This reverts commit fe37d1e3e0.
2018-09-07 08:56:53 -04:00
mazmazz
6b97930889 Merge branch 'master' into nights-fastercapsule 2018-09-07 08:56:02 -04:00
toaster
34a54b10a8 Merge branch 'sal-misc' of https://git.magicalgirl.moe/KartKrew/Kart.git into itemdrop
# Conflicts:
#	src/info.c
2018-09-07 13:34:01 +01:00
mazmazz
3f971ee921 Deduct marescore immediately on instakill
* Deduct player->spheres too, missed that one
2018-09-07 08:19:22 -04:00
mazmazz
54084b8aa4 Merge branch 'master' into nights-keeppoints 2018-09-07 08:13:57 -04:00
TehRealSalt
1a7a84f614 Placeholder boost effect 2018-09-06 23:49:51 -04:00
TehRealSalt
874d088f77 Tweaked boost cam, again 2018-09-06 21:58:23 -04:00
toaster
060a5cf4dc Merge branch 'sal-misc' of https://git.magicalgirl.moe/KartKrew/Kart.git into itemdrop 2018-09-07 00:31:54 +01:00
TehRealSalt
ceacbd180f Restore the one good bit 2018-09-06 19:31:28 -04:00
toaster
eed4304aca Merge branch 'sal-misc' of https://git.magicalgirl.moe/KartKrew/Kart.git into itemdrop 2018-09-07 00:31:02 +01:00
TehRealSalt
04aa1289fc Revert "Wrote a new function for MT_SOLID object bumping"
This reverts commit 4a597b7ef4.
2018-09-06 19:27:07 -04:00
mazmazz
71b1a78f76 Merge branch 'master' into le-fadefof 2018-09-06 18:12:24 -04:00
toaster
bc9fe026fa Merge branch 'sal-misc' of https://git.magicalgirl.moe/KartKrew/Kart.git into itemdrop 2018-09-06 22:18:54 +01:00
toaster
99fd66fb6d Dropping items!
* Shield Drop...
	* Whatever you've got orbiting or trailing you, DROP THEM WHERE THEY STAND. (Except for the ghost sink. That one's OK.)
	* Pops your Thunder Shield.
	* Happens upon ANY hit, except for deathpits.
* HUD Drop...
	* Also does the above, except for the Thunder Shield thing.
	* If there's any item left in your item box, pop it out as a little hovering, rotating Minecraft item!
	* You can pick up the Minecraft item by driving over it if your item box is sufficiently empty, or the item which is contained within it is of the same type.
	* Happens upon Size Down and battle elimination.
	* Can also be forced on with `cv_kartdebughuddrop on`!
* Some other random stuff.
	* Fix a bunch of `a->scale = b`'s into `P_SetScale(a, b)` form, for maximum validity.
	* Make K_CleanHnextList and K_UpdateHnextList one function, since they only differed by one continue clause (and the type of their input parameter).
	* Allow shrunken players to pick up item boxes again.
	* Fix MF_NOCLIPTHING. (Gonna pass this fix to vanilla when I get the chance, too.)
	* Break NiGHTS a little through my machinations.
2018-09-06 22:17:29 +01:00
TehRealSalt
81af98fd91 Forgot this 2018-09-06 16:09:17 -04:00
TehRealSalt
50f8186651 Player arrows can show x10
Requires new patch.kart
2018-09-06 16:06:37 -04:00
TehRealSalt
0d5aaa65c6 More Jawz tweaking
- Z pos checking is Battle-only now
- Made the Z pos limit much higher
- Increased its range in Battle
2018-09-06 16:05:57 -04:00
Digiku
8d015bd7cc Merge branch 'flicky-things' into 'master'
Flicky Thing Types

See merge request STJr/SRB2Internal!154
2018-09-06 16:02:19 -04:00
TehRealSalt
8866bd9818 Sink bug fix
Sink would only spawn its trail ever if you threw it on a tic that was (leveltime % 4 == 0), because it called its action every 4 tics instead of every tic
2018-09-06 15:52:27 -04:00
mazmazz
fbd6b2c826 Flicky colors indexing fix 2018-09-06 13:20:55 -04:00
mazmazz
a430d133b4 Compiler errors 2018-09-06 13:16:50 -04:00
TehRealSalt
84d4efe5f1 Boost tweaks
Fix offroad not affecting you as soon as it did before, and tweaking boost cam to be stronger
2018-09-06 13:02:08 -04:00
mazmazz
4dcf3835e3 Stray comments 2018-09-06 12:13:03 -04:00
mazmazz
7f404345f0 Make default flicky home radius 384 2018-09-06 11:59:55 -04:00