lifning/SRB2
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
4239 commits 1 branch 29 tags 122 MiB
Commit graph

4239 commits

This branch
This branch
All branches
Author SHA1 Message Date
mazmazz 809646e7fe 453: Try ResetFakeFloorFader if condition again 2018-09-15 02:24:44 -04:00
mazmazz a85953a903 453: P_ResetFakeFloorFader stray & address if condition 2018-09-15 02:16:54 -04:00
mazmazz 5585edf459 453: Mixed D+C fixes; unused param cast in P_FadeFakeFloor 2018-09-15 01:05:21 -04:00
mazmazz e8a5735f75 Merge branch 'lightfade-ticbased' into le-fadefof 2018-09-14 08:42:02 -04:00
mazmazz 714464993e 420: Removed unnecessary include (gametic no longer needed) 2018-09-14 08:26:52 -04:00
mazmazz 63a3125df2 420: A parenthesis 2018-09-12 21:49:03 -04:00
mazmazz 46067f0579 Merge remote-tracking branch 'origin/lightfade-ticbased' into lightfade-ticbased 2018-09-12 21:35:46 -04:00
mazmazz 41fe080a68 420: Allow Back Y Offset for timing parameter 2018-09-12 21:32:12 -04:00
mazmazz fad12d6be3 Merge branch 'master' into le-fadefof 2018-09-12 18:01:42 -04:00
mazmazz 9fb9b44383 Fade FOF colormap support 2018-09-12 16:59:35 -04:00
mazmazz 42f1f0acdb P_ResetFakeFloorFader: Argument order error with dolighting 2018-09-12 12:40:56 -04:00
Monster Iestyn 55418f9750 Merge branch 'change-colormap-ldef' into 'master' 
New linedef executor special: change tagged sector's colormap

See merge request STJr/SRB2Internal!149
 2018-09-11 17:21:31 -04:00
Monster Iestyn 82a26580de Merge branch 'master' into change-colormap-ldef 2018-09-11 16:43:01 +01:00
Monster Iestyn fd783f09ea Merge branch 'public_next' 
# Conflicts:
#	src/p_setup.c
#	src/r_data.c
 2018-09-11 16:41:27 +01:00
Monster Iestyn 3218ab17e0 Merge branch 'master' into next 2018-09-11 16:34:16 +01:00
Monster Iestyn 1199a5f9b4 Merge branch 'colormap-code-cleanup' into 'master' 
Colormap code cleanup

See merge request STJr/SRB2!275
 2018-09-11 11:31:56 -04:00
mazmazz 9a52816cb4 Use percentage calc instead of interval decrement for tic-based fading 2018-09-11 10:28:24 -04:00
mazmazz c468451a63 Merge branch 'lightfade-ticbased' into le-fadefof 2018-09-11 10:08:13 -04:00
mazmazz 36923ae7b0 Use percentage calc instead of interval decrement for tic-based timing 2018-09-11 10:05:25 -04:00
mazmazz 88d9da79e6 Move tic-based to EFFECT4 2018-09-10 12:00:44 -04:00
mazmazz acea0bfd68 Move tic-based to EFFECT4, relative calc to EFFECT3 2018-09-10 12:00:15 -04:00
Monster Iestyn 40ff436829 Remove commented out stuff, now I've confirmed everything works fine without them 2018-09-10 15:49:21 +01:00
mazmazz 148e3ff538 Use ML_NOCLIMB for FF_TRANSLUCENT handling in type 452 2018-09-10 10:17:39 -04:00
mazmazz 8e75fe50db 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 da5a7a013d 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 02a94dc941 Add distance-based params and make default (ML_DONTPEGBOTTOM to use back offsets) 2018-09-10 09:49:52 -04:00
mazmazz b8da218b61 Add relative destvalue calc (ML_EFFECT4) 
* rover->alpha init fixes with invisible FOFs
 2018-09-10 09:49:00 -04:00
mazmazz e171e565ce Remove bottommap and topmap from savegame because unused 2018-09-10 09:03:58 -04:00
mazmazz 002f1bad8f Savegame netsync for sector colormaps; add spawn_midmap and co for comparison 2018-09-10 09:01:09 -04:00
mazmazz 5136293f62 Store sectornum/ffloornum as UINT32, not INT32 2018-09-09 23:52:36 -04:00
mazmazz 9cc186441b Fix fog visual glitch with fading 2018-09-09 22:14:24 -04:00
mazmazz 0202bbcfd3 Replace firsttic with timer increment 2018-09-09 20:45:12 -04:00
mazmazz 703764d769 Merge branch 'lightfade-ticbased' into le-fadefof 2018-09-09 20:18:57 -04:00
mazmazz 3d5f225702 Replace firsttic with decrement timer 2018-09-09 20:18:43 -04:00
mazmazz ea2276eb07 Fix tic-based bug returning early 2018-09-09 19:57:41 -04:00
mazmazz 43ae628adc Cap lightlevel fading at spawn_lightlevel (don't make darker) 2018-09-09 19:44:35 -04:00
mazmazz c3c4a251f1 Added tic-based logic to FOF fade (ML_EFFECT5) 2018-09-09 19:31:32 -04:00
Monster Iestyn c0bf79ad8e 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 80a4a03f8e 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 368f96e605 Fade FOF lighting fixes; properly calculate destlightvalue 2018-09-09 15:41:30 -04:00
mazmazz ca58fba24a Merge branch 'lightfade-ticbased' into le-fadefof 2018-09-09 13:44:30 -04:00
mazmazz aeb45132c5 Revert "Snap light level to software values (32 levels)" 
This reverts commit cc26d03c93.
 2018-09-09 13:43:00 -04:00
mazmazz baababcf0b Add spawn_lightlevel to sector_t 2018-09-09 12:44:35 -04:00
mazmazz 675f69afea 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 032f95803d Merge branch 'master' into change-colormap-ldef 2018-09-09 08:40:38 -04:00
mazmazz 5032f783d7 Don't add a thinker if alpha is already equal 2018-09-09 08:10:45 -04:00
mazmazz 0049f904c0 Add light fading to FadeFakeFloor 
* Declare P_RemoveLighting in header for p_spec.c use
 2018-09-08 23:44:29 -04:00
mazmazz 4ca38dc8a1 Merge branch 'lightfade-ticbased' into le-fadefof 2018-09-08 23:03:18 -04:00
mazmazz cc26d03c93 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 68e67917f1 Split P_FadeLight into P_FadeLightBySector 2018-09-08 22:14:49 -04:00