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
|
f57e7c7fc5
|
Merge branch 'colormap-overhaul-change-ldef' into colormap-overhaul-fade
|
2018-09-17 10:57:02 -04:00 |
|
mazmazz
|
7b1856e32a
|
Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef
|
2018-09-17 10:56:56 -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
|
30b57e22cd
|
Merge branch 'colormap-overhaul' into colormap-overhaul-fade
|
2018-09-17 08:06:17 -04:00 |
|
mazmazz
|
67d3b713a2
|
Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef
|
2018-09-17 08:06:10 -04:00 |
|
mazmazz
|
02ed2d247e
|
Colormap netsync: String format numsectors to UINT32 (thanks buildbot)
|
2018-09-17 08:05:51 -04:00 |
|
mazmazz
|
70a672229c
|
453: Use new colormap netsync for fade FOF thinker
|
2018-09-17 00:34:03 -04:00 |
|
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
|
76e3b7a7cd
|
Mixer: HAVE_LIBGME ifdef in I_LoadSong
|
2018-09-15 00:35:24 -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 |
|
mazmazz
|
89a26f28bd
|
Fix Windows buildbot for MP3_MAD/MODPLUG define (the header we use is 2.0.2)
|
2018-09-14 17:47:04 -04:00 |
|
mazmazz
|
ead04aeeeb
|
Mixer: Better MODPLUG/MP3_MAD defines
(cherry picked from commit 5b724e18b5268b0492b3f8b8980aadd2dd41e235)
|
2018-09-14 17:27:31 -04:00 |
|
mazmazz
|
a2dd03bff6
|
Fix compile errors on buildbots
* Check SDL Mixer 2.0.3 for MUS_MODPLUG_UNUSED, MUS_MP3_MAD_UNUSED
* Mixed D+C in I_LoadSong
|
2018-09-14 17:07:13 -04:00 |
|
mazmazz
|
c64d52c1f9
|
Don't call I_StartupSound in SFX toggle
* Mixer: make I_StartupSound return early if already set up
* Restartaudio: Add StopSFX call
|
2018-09-14 16:39:10 -04:00 |
|