Commit graph

23092 commits

Author SHA1 Message Date
mazmazz
53568d3808 Split P_FadeLight into P_FadeLightBySector 2018-09-08 22:14:49 -04:00
mazmazz
07c6705bdb Implemented tic-based light fading
* ML_BLOCKMONSTERS specifies destvalue and speed by texture offsets
* ML_NOCLIMB toggles tic-based logic
* Added props `duration`, `interval`, and `firsttic` to `lightlevel_t`
2018-09-08 22:10:51 -04:00
mazmazz
b74fa1e9c8 Re-render lighting when setting FF_EXISTS 2018-09-08 20:49:32 -04:00
mazmazz
47dce92d8b Add dolighting flag to FadeFakeFloor thinker 2018-09-08 20:41:45 -04:00
mazmazz
e78ce5fdc3 When detecting invisible FOFs, don't include light blocks 2018-09-08 20:08:48 -04:00
toaster
793ab348bf Merge branch 'sal-misc' of https://git.magicalgirl.moe/KartKrew/Kart.git into itemdrop 2018-09-09 00:51:54 +01:00
TehRealSalt
216cc9a5b6 Revert "Rebalanced odds table again"
This reverts commit b7e0baad98.
2018-09-08 19:50:31 -04:00
toaster
c9a5e533a2 Merge branch 'sal-misc' of https://git.magicalgirl.moe/KartKrew/Kart.git into itemdrop 2018-09-08 23:46:07 +01:00
TehRealSalt
cefa21059c Camera adjustments
- reverted boostcam timing, different max dist
- zooms out based on camera momz
- drift panning is twice as slow
2018-09-08 18:45:57 -04:00
toaster
cf56852909 Make bomb attacks HUD drop. (Karma may be changed later, but Oni said let's try all together first...) 2018-09-08 23:45:51 +01:00
TehRealSalt
702e4dda11 weaker 2018-09-08 16:32:39 -04:00
toaster
ca5d5079d5 Forgot a default case. 2018-09-08 17:53:41 +01:00
toaster
d0fdd09be5 Bugfix a Jawz crash Jeck got a few days ago.
Not menu-based, but I guess this branch is misc PLUS menu stuff, not just menu stuff based on sal-misc.
2018-09-08 17:50:53 +01:00
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