Commit graph

5633 commits

Author SHA1 Message Date
mazmazz
d8056b1fea Get rid of bottommap, midmap, topmap 2018-09-10 16:16:04 -04:00
mazmazz
5f03a9b1a9 P_LoadRawSideDefs2 colormap cleanup (merge ogl and software to one block) 2018-09-10 16:08:43 -04:00
mazmazz
15aded0882 Colormap overhaul in r_data.c
* Split R_CreateColormap to R_CreateLightTable
* Replace extra_colormaps array with next/prev pointer chain
* Remove foundcolormaps; instead store lumpnum in extracolormap_t
* Add properties to extracolormap_t for portability
2018-09-10 15:59:31 -04:00
mazmazz
e3fd7eee79 Merge remote-tracking branch 'public-gitlab/colormap-code-cleanup' into colormap-cleanup 2018-09-10 13:24:57 -04:00
PrisimaTheFox
a6e3b3eb16 Update m_anigif.c
Remember gif_frames starts at 0
2018-09-10 17:12:10 +01:00
PrisimaTheFox
67102cc829 Update m_anigif.c
More accurate GIF delay.
2018-09-10 17:12:04 +01:00
mazmazz
fe4938a1c2 Move tic-based to EFFECT4 2018-09-10 12:00:44 -04:00
mazmazz
fc6b599bbc Move tic-based to EFFECT4, relative calc to EFFECT3 2018-09-10 12:00:15 -04:00
Monster Iestyn
22b799a655 Remove commented out stuff, now I've confirmed everything works fine without them 2018-09-10 15:49:21 +01:00
mazmazz
38a63c5d8f Use ML_NOCLIMB for FF_TRANSLUCENT handling in type 452 2018-09-10 10:17:39 -04:00
mazmazz
88e22b73a9 Default to using back offset params if back linedef exists; else fallback to distance-based params 2018-09-10 10:11:27 -04:00
mazmazz
eb7a5fc0cf Add type 452 Set FOF Alpha
* Fade FOF moved to type 453
* Stop Fade FOF moved to type 454
2018-09-10 10:09:02 -04:00
mazmazz
fe813bff47 Add distance-based params and make default (ML_DONTPEGBOTTOM to use back offsets) 2018-09-10 09:49:52 -04:00
mazmazz
583262d073 Add relative destvalue calc (ML_EFFECT4)
* rover->alpha init fixes with invisible FOFs
2018-09-10 09:49:00 -04:00
mazmazz
473d902696 Remove bottommap and topmap from savegame because unused 2018-09-10 09:03:58 -04:00
mazmazz
8a4bb895af Savegame netsync for sector colormaps; add spawn_midmap and co for comparison 2018-09-10 09:01:09 -04:00
mazmazz
092b58fe39 Set mobj->floorrover and ceilingrover in appropriate places 2018-09-10 00:38:07 -04:00
mazmazz
df9c6c4a1f Add floorrover and ceilingrover to precipmobj_t 2018-09-10 00:23:23 -04:00
mazmazz
3d83908596 Initialize floorrover and ceilingrover on SpawnMobj 2018-09-10 00:20:51 -04:00
mazmazz
913177ce23 Remove rovernum increment from P_CheckPosition because unused 2018-09-10 00:13:32 -04:00
mazmazz
93fa4d2f3a Savegame floorrover fixes 2018-09-10 00:07:22 -04:00
mazmazz
1c878ccce1 Store sectornum/ffloornum as UINT32, not INT32 2018-09-09 23:52:36 -04:00
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
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
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