mazmazz
43ae25c4fd
Make default extracolormap on init
...
* Calc fadedist in R_CreateLightTable
2018-09-10 21:56:57 -04:00
mazmazz
53b92a1601
Make default extracolormap on init
...
* Calc fadedist in R_CreateLightTable
2018-09-10 21:56:09 -04:00
mazmazz
0c4f3cbeca
Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef
2018-09-10 21:15:44 -04:00
mazmazz
22746c1d91
Savegame fixes
2018-09-10 21:15:34 -04:00
mazmazz
c007dfacec
Savegame fixes
2018-09-10 21:12:56 -04:00
mazmazz
75267dfa2c
Merge remote-tracking branch 'origin/change-colormap-ldef' into colormap-overhaul-change-ldef
2018-09-10 21:06:28 -04:00
mazmazz
3da38f2a9b
Fixed colormap matching code again * Added debug messages for matching code
2018-09-10 20:56:59 -04:00
mazmazz
1e4f5e8d45
Remove MAXCOLORMAPS
2018-09-10 20:41:12 -04:00
mazmazz
8d78c22194
extracolormap_t refinement and netsyncing
...
* Store raw values per rgba in extracolormap_t (no maskcolor or fadecolor)
* Crunched some UINT16/32 into UINT8
* Calculate mask values in R_CreateLightTable
* ifdef out EXTRACOLORMAPLUMPS
2018-09-10 20:36:34 -04:00
mazmazz
c92226890e
Remove bottommap and topmap from savegame because unused
2018-09-10 16:50:35 -04:00
mazmazz
7e9297d06e
Savegame netsync for sector colormaps; add spawn_midmap and co for comparison
2018-09-10 16:50:27 -04:00
mazmazz
7608583c6f
Fix shared colormap matching
2018-09-10 16:42:07 -04:00
mazmazz
53733ddf76
Type 606 renderer check allow OGL again
2018-09-10 16:32:54 -04:00
mazmazz
2701976ba3
Compiler fixes
2018-09-10 16:28:39 -04:00
mazmazz
e0d8a6eec0
Get rid of bottommap, midmap, topmap
2018-09-10 16:16:04 -04:00
mazmazz
574a591d43
P_LoadRawSideDefs2 colormap cleanup (merge ogl and software to one block)
2018-09-10 16:08:43 -04:00
mazmazz
e33ed45b7b
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
fef38acc59
Merge remote-tracking branch 'public-gitlab/colormap-code-cleanup' into colormap-cleanup
2018-09-10 13:24:57 -04:00
mazmazz
88d9da79e6
Move tic-based to EFFECT4
2018-09-10 12:00:44 -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
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
a6f959ba21
Set mobj->floorrover and ceilingrover in appropriate places
2018-09-10 00:38:07 -04:00
mazmazz
0d88f31bbd
Add floorrover and ceilingrover to precipmobj_t
2018-09-10 00:23:23 -04:00
mazmazz
943dc9412d
Initialize floorrover and ceilingrover on SpawnMobj
2018-09-10 00:20:51 -04:00
mazmazz
832f891cbb
Remove rovernum increment from P_CheckPosition because unused
2018-09-10 00:13:32 -04:00
mazmazz
03d1baf422
Savegame floorrover fixes
2018-09-10 00:07:22 -04:00
mazmazz
dd35871699
Savegame netsync for mobj->floorrover and ceilingrrover
2018-09-09 23:48:42 -04:00
mazmazz
f33f9dd284
Replace sectornum/rovernum index vars with ffloor pointers
2018-09-09 23:12:37 -04:00
mazmazz
d01193df80
Apply ~FF_EXISTS moving plat fix for VERTICALFLIP
2018-09-09 21:59:41 -04:00
mazmazz
231f19aaab
Revert "Merge branch 'random-fof-fixes' into fof-fixes-movingplatexists"
...
This reverts commit cc11459054
, reversing
changes made to 7e3d5cd373
.
2018-09-09 21:02:43 -04:00
mazmazz
573e1d0017
Replace firsttic with timer increment
2018-09-09 21:01:00 -04:00
mazmazz
3d5f225702
Replace firsttic with decrement timer
2018-09-09 20:18:43 -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
aeb45132c5
Revert "Snap light level to software values (32 levels)"
...
This reverts commit cc26d03c93
.
2018-09-09 13:43:00 -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
3f4656e57e
Polyobject Fade logic
2018-09-09 08:08:48 -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
mazmazz
1e1b01c157
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
b629104197
Also check for FF_SOLID
2018-09-08 01:07:08 -04:00
mazmazz
cc11459054
Merge branch 'random-fof-fixes' into fof-fixes-movingplatexists
2018-09-08 00:37:04 -04:00
mazmazz
7e3d5cd373
Comment out tmfloorrover and tmceilingrover because unused
2018-09-08 00:36:43 -04:00
mazmazz
76d7a54b2b
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
f52f72256b
Thwomp fix: Don't trigger (look for players) when ~FF_EXISTS
2018-09-07 18:14:52 -04:00
Monster Iestyn
316c08bbbb
Merge branch 'netcode-nitpicking' into 'next'
...
Netcode nitpicking
See merge request STJr/SRB2!274
2018-09-07 15:59:49 -04:00
mazmazz
0b365d0d08
Initial polyobj fade skeleton
2018-09-07 15:27:18 -04:00
Digiku
ffde71c656
Merge branch 'flicky-things' into 'master'
...
Flicky Thing Types
See merge request STJr/SRB2Internal!154
2018-09-06 16:02:19 -04:00
mazmazz
9e5b9ac50e
Flicky colors indexing fix
2018-09-06 13:20:55 -04:00