Commit graph

4036 commits

Author SHA1 Message Date
mazmazz
45228f823c Savegame netsync for mobj->floorrover and ceilingrrover 2018-09-09 23:48:42 -04:00
mazmazz
5402e8a9a3 Replace sectornum/rovernum index vars with ffloor pointers 2018-09-09 23:12:37 -04: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
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
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
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
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
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
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
mazmazz
969741717d Thwomp fix: Don't trigger (look for players) when ~FF_EXISTS 2018-09-07 18:14:52 -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
mazmazz
9055c58783 Initial polyobj fade skeleton 2018-09-07 15:27:18 -04: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
mazmazz
71b1a78f76 Merge branch 'master' into le-fadefof 2018-09-06 18:12:24 -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
mazmazz
4dcf3835e3 Stray comments 2018-09-06 12:13:03 -04:00