Commit graph

4588 commits

Author SHA1 Message Date
mazmazz 27aa357053 453: A line break 2018-09-18 07:28:30 -04:00
mazmazz f5b25c91f5 453: Commented out, but allow existing fade overlap of 2 tics (or speed*2) 2018-09-18 07:28:28 -04:00
mazmazz 5b16590ba2 453: Don't interrupt current FOF fade unless EFFECT5 2018-09-18 07:27:47 -04:00
Monster Iestyn fab25a451f Merge branch 'public_next' 2018-09-17 21:50:19 +01:00
Monster Iestyn 1763087844 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 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 c462bd4b17 Merge branch 'colormap-overhaul-change-ldef' into colormap-overhaul-fade 2018-09-17 10:57:02 -04:00
mazmazz 71df02c996 Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef 2018-09-17 10:56:56 -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 1e7a4af207 Merge branch 'colormap-overhaul' into colormap-overhaul-fade 2018-09-17 08:06:17 -04:00
mazmazz 8b4c4e20d5 Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef 2018-09-17 08:06:10 -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 c44ce7b401 Merge branch 'colormap-overhaul-change-ldef' into colormap-overhaul-fade 2018-09-17 00:28:16 -04:00
mazmazz 3ebd545523 Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef 2018-09-17 00:27:11 -04:00
mazmazz f3e1d280d0 Colormap netsync: Mixed D+C fixes 2018-09-17 00:26:58 -04:00
mazmazz 60ba0f5911 Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef 2018-09-16 22:42:57 -04:00
mazmazz 4b55415add New colormap netsync fixes 2018-09-16 22:42:36 -04:00
mazmazz 0a998fec02 New colormap netsync fixes 2018-09-16 22:41:08 -04:00
mazmazz d4a18fd456 455: Fade colormap netsync use new colormap saving 2018-09-16 20:27:24 -04:00
mazmazz 545602d94d Merge branch 'colormap-overhaul' into colormap-overhaul-fade 2018-09-16 20:25:59 -04:00
mazmazz 4cdbc7249f Streamlined colormap netsyncing so duplicates are not saved to $$$.sav per sector 2018-09-16 20:25:46 -04:00
Monster Iestyn 1b7b1f3f79 Fix order of operations messups by adding brackets 2018-09-16 20:25:07 +01:00
Digiku 7aedb8d035 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 7c8fa151c4 Merge branch 'lightfade-ticbased' into le-fadefof 2018-09-16 08:20:57 -04:00
mazmazz d49f0be4ee 420: Strip test comments 2018-09-16 08:20:14 -04:00
mazmazz 1321ab9d92 453: Extra parameter for Add_ColormapFader 2018-09-15 20:40:17 -04:00
mazmazz 17e23f55eb 492: Merge speed and duration logic for fade polyobject 2018-09-15 20:00:37 -04:00
Monster Iestyn 22ee740fa8 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 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 d939e597a5 420: Unncessary include 2018-09-15 20:03:43 -04:00
mazmazz ab4a825385 420: Combine speed and duration logic for fade lighting 2018-09-15 19:01:21 -04:00
mazmazz 809646e7fe 453: Try ResetFakeFloorFader if condition again 2018-09-15 02:24:44 -04:00
mazmazz a85953a903 453: P_ResetFakeFloorFader stray & address if condition 2018-09-15 02:16:54 -04:00
mazmazz efe0af960d Colormap overhaul: Wrap R_CheckNumForNameList under ifdef EXTRACOLORMAPLUMPS 2018-09-15 02:10:55 -04:00
mazmazz 79484de4ea Merge branch 'colormap-overhaul-change-ldef' into colormap-overhaul-fade 2018-09-15 01:51:06 -04:00
mazmazz 5e55f6f311 Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef 2018-09-15 01:50:53 -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
mazmazz ca4a94eca5 492: Mixed D+C fix 2018-09-15 00:56:46 -04:00
mazmazz 1db8aee539 455: Mixed D+C fix 2018-09-15 00:53:21 -04:00
mazmazz be6acdb019 Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef 2018-09-15 00:52:45 -04:00
mazmazz 57959522e2 Colormap overhaul r_data: Mixed D+C fix 2018-09-15 00:49:03 -04:00
mazmazz 40a8c9c1ee Mixer: HAVE_LIBGME ifdef in I_LoadSong 2018-09-15 00:35:24 -04:00
mazmazz 2e2acdd16a Merge branch 'colormap-overhaul-change-ldef' into colormap-overhaul-fade 2018-09-14 22:36:09 -04:00
mazmazz 5f2df0f453 Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef 2018-09-14 22:35:51 -04:00
mazmazz 2f995f4cbe Remove possibly wrong comment about extracolormap_t->fog 2018-09-14 22:35:30 -04:00
mazmazz f85d1da54f Lua support for floorrover/ceilingrover 2018-09-14 21:43:43 -04:00