Commit graph

22279 commits

Author SHA1 Message Date
mazmazz
5402e8a9a3 Replace sectornum/rovernum index vars with ffloor pointers 2018-09-09 23:12:37 -04:00
wolfy852
715711cc7b Change ESC menu override string to "Open/Close Menu (ESC)", adjust menu accordingly 2018-09-09 21:24:19 -05:00
mazmazz
ca0d6fd0c2 Fix fog visual glitch with fading 2018-09-09 22:14:24 -04:00
mazmazz
3f1789ad79 Apply ~FF_EXISTS moving plat fix for VERTICALFLIP 2018-09-09 21:59:41 -04:00
mazmazz
f1fe584552 Revert "Merge branch 'random-fof-fixes' into fof-fixes-movingplatexists"
This reverts commit f7731d7a41, reversing
changes made to bc63a44330.
2018-09-09 21:02:43 -04:00
mazmazz
4a6ddbd496 Replace firsttic with timer increment 2018-09-09 21:01:00 -04:00
TehRealSalt
08e101e8f8 New gamepad defaults
Based on input recieved from Jeck
2018-09-09 20:57:54 -04:00
mazmazz
5f3512546b A number 2018-09-09 20:51:08 -04:00
mazmazz
ecfc2e66f1 Replace firsttic with timer increment 2018-09-09 20:45:12 -04:00
mazmazz
97bc852b80 Merge branch 'lightfade-ticbased' into le-fadefof 2018-09-09 20:18:57 -04:00
mazmazz
8efe62e4de Replace firsttic with decrement timer 2018-09-09 20:18:43 -04:00
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