Digiku
31ea145fb2
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
Digiku
34a340340d
Merge branch 'no-effect5-fudging' into 'master'
...
p_setup: Don't fudge texture offsets if EFFECT5 and a linedef exec
See merge request STJr/SRB2Internal!193
2018-09-18 10:48:29 -04:00
mazmazz
7b94368549
p_setup: Don't fudge texture offsets if EFFECT5 and a linedef exec
2018-09-18 07:37:29 -04:00
mazmazz
f3f8575dfc
492: Remove pre-existing thinker when setting up new fade
2018-09-18 07:31:19 -04:00
mazmazz
ae5b02bccd
492: Don't interrupt existing polyobj fader unless EFFECT5
2018-09-18 07:31:17 -04:00
Monster Iestyn
c088d55547
Merge branch 'public_next'
2018-09-17 21:50:19 +01:00
Monster Iestyn
e48e3e15c4
Merge branch 'public-var2s-fix' into 'next'
...
Level spec thinker: Netsync var2s
See merge request STJr/SRB2!280
2018-09-17 14:43:44 -04:00
mazmazz
f307c6d1b6
Line exec trigger netsync: Save var2s in addition to vars
2018-09-17 14:13:31 -04:00
Digiku
a35a4e052c
Merge branch 'colormap-overhaul' into 'master'
...
Colormap code overhaul
See merge request STJr/SRB2Internal!189
2018-09-17 11:24:14 -04:00
mazmazz
e57bd5206c
Colormap netsync: Count ffloors for colormap loading upper limit
2018-09-17 10:38:17 -04:00
mazmazz
5f176f5525
Colormap netsync: Handle unaccounted dummy colormaps properly
2018-09-17 10:30:21 -04:00
mazmazz
02ed2d247e
Colormap netsync: String format numsectors to UINT32 (thanks buildbot)
2018-09-17 08:05:51 -04:00
mazmazz
0cba69e75a
Colormap netsync: Mixed D+C fixes
2018-09-17 00:26:58 -04:00
mazmazz
e5d533edc2
New colormap netsync fixes
2018-09-16 22:42:36 -04:00
mazmazz
5923e85c5a
Streamlined colormap netsyncing so duplicates are not saved to $$$.sav per sector
2018-09-16 20:25:46 -04:00
Digiku
7b65f36d43
Merge branch 'lightfade-ticbased' into 'master'
...
Linedef Exec 420: Fade Lighting add duration timing
See merge request STJr/SRB2Internal!186
2018-09-16 08:24:09 -04:00
mazmazz
33bc560f15
420: Strip test comments
2018-09-16 08:20:14 -04:00
mazmazz
d8b57f32e7
492: Merge speed and duration logic for fade polyobject
2018-09-15 20:00:37 -04:00
Monster Iestyn
94b02c8e44
Merge branch 'mario-block-sync' into 'next'
...
Fix for Mario block FOF texture synchronisation in netgames
See merge request STJr/SRB2!279
2018-09-15 10:15:47 -04:00
Nev3r
2009c93ddd
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
13e910f6ff
420: Unncessary include
2018-09-15 20:03:43 -04:00
mazmazz
e2e1ca0ac6
420: Combine speed and duration logic for fade lighting
2018-09-15 19:01:21 -04:00
mazmazz
09338f77a7
Colormap overhaul: Wrap R_CheckNumForNameList under ifdef EXTRACOLORMAPLUMPS
2018-09-15 02:10:55 -04:00
mazmazz
20eb98b89f
Colormap overhaul: %d format size_t -> UINT32 fix
2018-09-15 01:50:33 -04:00
mazmazz
413f25f323
492: Mixed D+C fix
2018-09-15 00:56:46 -04:00
mazmazz
23de95dce2
Colormap overhaul r_data: Mixed D+C fix
2018-09-15 00:49:03 -04:00
mazmazz
d19eefdcf4
Remove possibly wrong comment about extracolormap_t->fog
2018-09-14 22:35:30 -04:00
Monster Iestyn
128e5fd2bb
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
Monster Iestyn
04b14ba169
Merge branch 'public_next'
2018-09-14 19:51:20 +01:00
mazmazz
6a2fb34912
420: Removed unnecessary include (gametic no longer needed)
2018-09-14 08:26:52 -04:00
Monster Iestyn
d097bb7e9e
Merge branch 'thwomp-fixes' into 'next'
...
Thwomp fixes: Don't trigger on spectator; don't trigger on ~FF_EXISTS
See merge request STJr/SRB2!277
2018-09-13 14:47:40 -04:00
mazmazz
3dc4a1d7da
Missed fog boolean -> integer
2018-09-13 12:18:53 -04:00
mazmazz
031bc8f4d7
Make extracolormap_t->fog UINT8; it's not boolean, but categorical
2018-09-13 12:08:46 -04:00
Digiku
8f59606199
Don't trigger thwomp on spectators
2018-09-13 11:32:40 -04:00
mazmazz
a7ec620ea4
Thwomp fix: Don't trigger (look for players) when ~FF_EXISTS
2018-09-13 11:32:38 -04:00
mazmazz
c9f6c362ff
491, 492: Allow BLOCKMONSTERS raw translucency value in floorheight
2018-09-13 00:26:49 -04:00
mazmazz
509965d2c0
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
33c1109993
PolyObjFade: Apply RENDER, SOLID, and NOSPECIALS flags according to spawnflags
2018-09-13 00:06:08 -04:00
mazmazz
d0b2728ce1
490 PolyVisible: Set proper spawn render flags instead of RENDERALL
2018-09-13 00:06:06 -04:00
mazmazz
35e58d3c8c
420: A parenthesis
2018-09-12 21:49:03 -04:00
mazmazz
3b7f7cf305
Merge remote-tracking branch 'origin/lightfade-ticbased' into lightfade-ticbased
2018-09-12 21:35:46 -04:00
mazmazz
ef7de5f543
420: Allow Back Y Offset for timing parameter
2018-09-12 21:32:12 -04:00
mazmazz
70f3f7c80d
Init side->colormap_data pointer to NULL (for paranoia)
2018-09-12 21:05:50 -04:00
mazmazz
18bd48843f
Add colormap_data to side_t and store colormaps there on setup
2018-09-12 20:43:48 -04:00
mazmazz
854caf2383
Merge errors
2018-09-12 17:39:30 -04:00
mazmazz
691ee31681
Merge remote-tracking branch 'origin/master' into colormap-overhaul
2018-09-12 17:28:22 -04:00
mazmazz
d53201d45d
Use lightlist.extra_colormap double pointers in OpenGL
2018-09-12 16:28:55 -04:00
mazmazz
f06e0a6569
Make lightlists react to control sector colormap changes (double pointer)
2018-09-12 16:06:56 -04:00
mazmazz
95f5b7c3f8
Colormap savegame failsafe - Handle NULL (default colormap)
2018-09-12 11:13:49 -04:00
mazmazz
91004ac075
Outdated comment; unused var
2018-09-12 08:07:34 -04:00
