mazmazz
899e8ef2a0
Merge remote-tracking branch 'origin/master' into le-fadefof
2018-09-18 10:52:03 -04:00
Digiku
843ed289a6
Merge branch 'polyobj-fade' into 'master'
...
Linedef Exec 492: Fade PolyObject
See merge request STJr/SRB2Internal!192
2018-09-18 10:48:46 -04:00
Monster Iestyn
fab25a451f
Merge branch 'public_next'
2018-09-17 21:50:19 +01:00
mazmazz
20c4702986
Line exec trigger netsync: Save var2s in addition to vars
2018-09-17 14:13:31 -04:00
Digiku
6f1a44432b
Merge branch 'colormap-overhaul' into 'master'
...
Colormap code overhaul
See merge request STJr/SRB2Internal!189
2018-09-17 11:24:14 -04:00
mazmazz
69a4906911
Colormap netsync: Count ffloors for colormap loading upper limit
2018-09-17 10:38:17 -04:00
mazmazz
d417f733e5
Colormap netsync: Handle unaccounted dummy colormaps properly
2018-09-17 10:30:21 -04:00
mazmazz
752a963037
Colormap netsync: String format numsectors to UINT32 (thanks buildbot)
2018-09-17 08:05:51 -04:00
mazmazz
14339d651d
453: Use new colormap netsync for fade FOF thinker
2018-09-17 00:34:03 -04:00
mazmazz
f3e1d280d0
Colormap netsync: Mixed D+C fixes
2018-09-17 00:26:58 -04:00
mazmazz
4b55415add
New colormap netsync fixes
2018-09-16 22:42:36 -04:00
mazmazz
4cdbc7249f
Streamlined colormap netsyncing so duplicates are not saved to $$$.sav per sector
2018-09-16 20:25:46 -04:00
mazmazz
7c8fa151c4
Merge branch 'lightfade-ticbased' into le-fadefof
2018-09-16 08:20:57 -04:00
mazmazz
17e23f55eb
492: Merge speed and duration logic for fade polyobject
2018-09-15 20:00:37 -04:00
Nev3r
350cd1435b
The thinker is entirely unified now, and there is no difference in the light levels between the "old" behavior and this one now.
2018-09-15 12:21:25 +02:00
mazmazz
ab4a825385
420: Combine speed and duration logic for fade lighting
2018-09-15 19:01:21 -04:00
mazmazz
6844ed37c5
Colormap overhaul: %d format size_t -> UINT32 fix
2018-09-15 01:50:33 -04:00
mazmazz
5585edf459
453: Mixed D+C fixes; unused param cast in P_FadeFakeFloor
2018-09-15 01:05:21 -04:00
Monster Iestyn
546fa383c1
Make sure that T_MarioBlockChecker is synced in netgames, so that the textures of Mario Blocks can change when there are no more items
2018-09-14 21:01:07 +01:00
mazmazz
e8a5735f75
Merge branch 'lightfade-ticbased' into le-fadefof
2018-09-14 08:42:02 -04:00
mazmazz
6824e6a359
Make extracolormap_t->fog UINT8; it's not boolean, but categorical
2018-09-13 12:08:46 -04:00
mazmazz
4ab3a986f3
492 PolyObj Fade, 491 PolyObj Translucency, 490 PolyObj changes
...
* 490: Set proper render flags according to spawnflags
* 491: Add relative calc (EFFECT3) and Front X alpha param (DONTPEGTOP)
* 492:
* Tic-based (EFFECT4) and speed timing
* Add relative calc (EFFECT3) and Front X alpha param (DONTPEGTOP)
* Set proper render flags according to spawnflags
* Fix OpenGL >= NUMTRANSMAPS render bug
2018-09-13 00:06:11 -04:00
mazmazz
46067f0579
Merge remote-tracking branch 'origin/lightfade-ticbased' into lightfade-ticbased
2018-09-12 21:35:46 -04:00
mazmazz
ad9ef5d593
Merge errors
2018-09-12 17:39:30 -04:00
mazmazz
c58e9b0bae
Merge remote-tracking branch 'origin/master' into colormap-overhaul
2018-09-12 17:28:22 -04:00
mazmazz
9fb9b44383
Fade FOF colormap support
2018-09-12 16:59:35 -04:00
mazmazz
92c5cb8233
Colormap savegame failsafe - Handle NULL (default colormap)
2018-09-12 11:13:49 -04:00
mazmazz
92a97fb1a6
Split colormap netsync to Load/SaveExtraColormap methods
2018-09-11 22:44:31 -04:00
mazmazz
c920827032
Consolidate colormap matching into R_GetColormapFromList
2018-09-11 15:56:21 -04:00
mazmazz
a818b9a1dc
Remove cr/cg/cb/ca in favor of rgba * Change default colormap values to be in sync with rgba/fadergba
2018-09-11 13:27:04 -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
43ae25c4fd
Make default extracolormap on init
...
* Calc fadedist in R_CreateLightTable
2018-09-10 21:56:57 -04:00
mazmazz
22746c1d91
Savegame fixes
2018-09-10 21:15:34 -04:00
mazmazz
3da38f2a9b
Fixed colormap matching code again * Added debug messages for matching code
2018-09-10 20:56:59 -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
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
573e1d0017
Replace firsttic with timer increment
2018-09-09 21:01:00 -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
c3c4a251f1
Added tic-based logic to FOF fade (ML_EFFECT5)
2018-09-09 19:31:32 -04: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
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
