mazmazz
bb55774171
Fix tic-based bug returning early
2018-09-09 19:57:41 -04:00
mazmazz
295ff73e70
Cap lightlevel fading at spawn_lightlevel (don't make darker)
2018-09-09 19:44:35 -04:00
mazmazz
f77957ddf0
Added tic-based logic to FOF fade (ML_EFFECT5)
2018-09-09 19:31:32 -04:00
wolfy852
56e615d595
Merge commit 'c92926bfb6e080e39e658086fbc6f44b605348d3' into sonicitems
2018-09-09 17:57:23 -05:00
toaster
b933db6763
Merge branch 'sal-misc' of https://git.magicalgirl.moe/KartKrew/Kart.git into itemdrop
2018-09-09 23:25:19 +01:00
TehRealSalt
c8f802370b
// we're fucking sick of this
...
Why hasn't SRB2 already done this themselves YEARS ago...
2018-09-09 18:24:09 -04:00
TehRealSalt
77131a30ec
Comment ou remaining traces of cv_karthud
...
We've poured so much effort into our own HUD that it doesn't make much sense to have the option to replace it with another game's at this point
2018-09-09 18:10:11 -04:00
TehRealSalt
7383bb28c7
Revert pan speed
...
Old one was more exciting, and gave that feeling of "you're scraping against the walls" when you try to corner really hard
2018-09-09 18:04:35 -04:00
Monster Iestyn
a5ba47cb3a
R_CreateColormap2 and R_MakeColormaps have been made obsolete, it's just R_CreateColormap now, like it used to be!
...
With that, I moved R_CreateColormap2's exclusive software colormap malloc code to R_CreateColormap, and merged the two software-only blocks of code into one. I also disabled any unneeded variables and fixed a preprocessor-related goofup
2018-09-09 22:48:09 +01:00
mazmazz
44ba282d5f
Finalize light level on fade finish (not forced stop)
...
* Added destlightlevel property to fade_t
* Fixed dotranslucent, dolighting, docollision order weirdness in function calls
2018-09-09 17:20:35 -04:00
mazmazz
4e3f0c9a84
Fade FOF lighting fixes; properly calculate destlightvalue
2018-09-09 15:41:30 -04:00
mazmazz
18c6f560e4
Merge branch 'lightfade-ticbased' into le-fadefof
2018-09-09 13:44:30 -04:00
mazmazz
cbf692fc52
Revert "Snap light level to software values (32 levels)"
...
This reverts commit 8ec3e23ed5
2018-09-09 13:43:00 -04:00
mazmazz
888ea233dc
Add spawn_lightlevel to sector_t
2018-09-09 12:44:35 -04:00
toaster
605224ff08
Disable the options you MEANT to disable.
2018-09-09 15:44:37 +01:00
toaster
62f55a7f52
Merge branch 'sal-misc' of https://git.magicalgirl.moe/KartKrew/Kart.git into misc_plus_menustuffs
2018-09-09 15:41:37 +01:00
toaster
afec11f84e
This isn't vanilla, don't be a shit about secrets and addfile (plus it helps that this fixes a crash)
2018-09-09 15:17:41 +01:00
mazmazz
96d8723238
Flag re-organization
...
* Change alternate param flag from BLOCKMONSTERS to DONTPEGBOTTOM
* Change tic-based flag from NOCLIMB to EFFECT5
2018-09-09 09:34:36 -04:00
toaster
adebd8c4e0
// if this doesn't work i'm removing papersprites
...
(check both the left and right side overflow of the sprite column being drawn)
2018-09-09 13:47:49 +01:00
mazmazz
47cf5ebdd7
Merge branch 'master' into change-colormap-ldef
2018-09-09 08:40:38 -04:00
mazmazz
baeb1f2aa5
Don't add a thinker if alpha is already equal
2018-09-09 08:10:45 -04:00
mazmazz
b0fca6b7b4
Polyobject Fade logic
2018-09-09 08:08:48 -04:00
mazmazz
a177548da6
Added NIGHTSLINK bonus type for the 2.1 Link Bonus
2018-09-09 01:13:02 -04:00
mazmazz
deb0ba1648
Add light fading to FadeFakeFloor
...
* Declare P_RemoveLighting in header for p_spec.c use
2018-09-08 23:44:29 -04:00
mazmazz
8571b407c6
Merge branch 'lightfade-ticbased' into le-fadefof
2018-09-08 23:03:18 -04:00
mazmazz
8ec3e23ed5
Snap light level to software values (32 levels)
...
* New properties `exactlightlevel` and `lightlevel` in `lightlevel_t`
2018-09-08 23:01:35 -04:00
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
