mazmazz
|
02c33bcac8
|
Merge branch 'colormap-overhaul-change-ldef' into colormap-overhaul-fade
|
2018-09-17 00:28:16 -04:00 |
|
mazmazz
|
db35c7cd45
|
Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef
|
2018-09-17 00:27:11 -04:00 |
|
mazmazz
|
0cba69e75a
|
Colormap netsync: Mixed D+C fixes
|
2018-09-17 00:26:58 -04:00 |
|
mazmazz
|
c36f189da3
|
Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef
|
2018-09-16 22:42:57 -04:00 |
|
mazmazz
|
e5d533edc2
|
New colormap netsync fixes
|
2018-09-16 22:42:36 -04:00 |
|
mazmazz
|
3bfdcad4cc
|
New colormap netsync fixes
|
2018-09-16 22:41:08 -04:00 |
|
mazmazz
|
82ebf0c64a
|
455: Fade colormap netsync use new colormap saving
|
2018-09-16 20:27:24 -04:00 |
|
mazmazz
|
1103503dee
|
Merge branch 'colormap-overhaul' into colormap-overhaul-fade
|
2018-09-16 20:25:59 -04:00 |
|
mazmazz
|
5923e85c5a
|
Streamlined colormap netsyncing so duplicates are not saved to $$$.sav per sector
|
2018-09-16 20:25:46 -04:00 |
|
Monster Iestyn
|
9481e7d358
|
Fix order of operations messups by adding brackets
|
2018-09-16 20:25:07 +01: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
|
20537f1310
|
Merge branch 'lightfade-ticbased' into le-fadefof
|
2018-09-16 08:20:57 -04:00 |
|
mazmazz
|
33bc560f15
|
420: Strip test comments
|
2018-09-16 08:20:14 -04:00 |
|
mazmazz
|
3ce5362a1d
|
453: Extra parameter for Add_ColormapFader
|
2018-09-15 20:40:17 -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
|
e01fd1f3a3
|
453: Try ResetFakeFloorFader if condition again
|
2018-09-15 02:24:44 -04:00 |
|
mazmazz
|
a19c44d21f
|
453: P_ResetFakeFloorFader stray & address if condition
|
2018-09-15 02:16:54 -04:00 |
|
mazmazz
|
09338f77a7
|
Colormap overhaul: Wrap R_CheckNumForNameList under ifdef EXTRACOLORMAPLUMPS
|
2018-09-15 02:10:55 -04:00 |
|
mazmazz
|
17ea15a050
|
Merge branch 'colormap-overhaul-change-ldef' into colormap-overhaul-fade
|
2018-09-15 01:51:06 -04:00 |
|
mazmazz
|
400dbe0118
|
Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef
|
2018-09-15 01:50:53 -04:00 |
|
mazmazz
|
20eb98b89f
|
Colormap overhaul: %d format size_t -> UINT32 fix
|
2018-09-15 01:50:33 -04:00 |
|
mazmazz
|
95aeb78550
|
453: Mixed D+C fixes; unused param cast in P_FadeFakeFloor
|
2018-09-15 01:05:21 -04:00 |
|
mazmazz
|
413f25f323
|
492: Mixed D+C fix
|
2018-09-15 00:56:46 -04:00 |
|
mazmazz
|
73a907f52f
|
455: Mixed D+C fix
|
2018-09-15 00:53:21 -04:00 |
|
mazmazz
|
2d032082a8
|
Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef
|
2018-09-15 00:52:45 -04:00 |
|
mazmazz
|
23de95dce2
|
Colormap overhaul r_data: Mixed D+C fix
|
2018-09-15 00:49:03 -04:00 |
|
mazmazz
|
2083cd815b
|
Merge branch 'colormap-overhaul-change-ldef' into colormap-overhaul-fade
|
2018-09-14 22:36:09 -04:00 |
|
mazmazz
|
ac094790b7
|
Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef
|
2018-09-14 22:35:51 -04:00 |
|
mazmazz
|
d19eefdcf4
|
Remove possibly wrong comment about extracolormap_t->fog
|
2018-09-14 22:35:30 -04:00 |
|
mazmazz
|
43b0c71de1
|
Lua support for floorrover/ceilingrover
|
2018-09-14 21:43:43 -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
|
5515fba00e
|
Merge branch 'lightfade-ticbased' into le-fadefof
|
2018-09-14 08:42:02 -04: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
|
b849693c96
|
Merge branch 'colormap-overhaul-change-ldef' into colormap-overhaul-fade
|
2018-09-13 12:19:28 -04:00 |
|
mazmazz
|
2e75be2d42
|
Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef
|
2018-09-13 12:19:10 -04:00 |
|
mazmazz
|
3dc4a1d7da
|
Missed fog boolean -> integer
|
2018-09-13 12:18:53 -04:00 |
|
mazmazz
|
065638d029
|
455: Fog flag fix for fading
|
2018-09-13 12:18:10 -04:00 |
|
mazmazz
|
2bef671a5f
|
Merge branch 'colormap-overhaul-change-ldef' into colormap-overhaul-fade
|
2018-09-13 12:10:14 -04:00 |
|
mazmazz
|
375f48be27
|
Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef
|
2018-09-13 12:08:56 -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
|
b58f765254
|
455: Set timing by either Back Y or Front Y, but not line length
|
2018-09-13 10:53:03 -04:00 |
|
mazmazz
|
8464a5ec8a
|
455: Don't override fadergba on default/no colormap init (~BOUNCY)
|
2018-09-13 10:43:41 -04:00 |
|