diff --git a/CREDITS b/CREDITS index 8f98f7e5..fd6b7f87 100644 --- a/CREDITS +++ b/CREDITS @@ -1034,4 +1034,7 @@ D: sprites N: Dmytro Moskovchenko S: Dimon12321 E: d.moskowchenko@gmail.com -D: levels \ No newline at end of file +D: levels + +S: MrFlibble +D: textures diff --git a/README.adoc b/README.adoc index 0bbb245a..b5d1e1da 100644 --- a/README.adoc +++ b/README.adoc @@ -154,9 +154,6 @@ It is sensible to also heed the following guidelines: engines, especially those that use hardware accelerated rendering, may not render it properly. Examples of tricks to avoid include those used to simulate 3D bridges and “deep water” effects. - * While unrestricted by limits, do not make excessively complicated - scenes. It is desirable that _Freedoom_ levels should be playable - on low-powered hardware, such as phones and old computers. * Test your levels in https://www.chocolate-doom.org/[Chocolate Doom] to make sure that vanilla compatibility is maintained. This is an engine with strict adherence to vanilla Doom limits and diff --git a/buildcfg.txt b/buildcfg.txt index a1d13b8e..28ab9fcc 100644 --- a/buildcfg.txt +++ b/buildcfg.txt @@ -2311,10 +2311,10 @@ PUFFA0 2 3 PUFFB0 6 8 PUFFC0 7 9 PUFFD0 8 10 -PUNGA0 -96 -128 -PUNGB0 -64 -144 -PUNGC0 -192 -108 -PUNGD0 -144 -84 +PUNGA0 -94 -139 +PUNGB0 -88 -129 +PUNGC0 -185 -93 +PUNGD0 -140 -80 PVISA0 14 13 PVISB0 14 13 RKEYA0 8 19 diff --git a/levels/e2m3.wad b/levels/e2m3.wad index 362541ee..06c6a49d 100644 Binary files a/levels/e2m3.wad and b/levels/e2m3.wad differ diff --git a/levels/e2m9.wad b/levels/e2m9.wad index ce305eb6..3d2d0e60 100644 Binary files a/levels/e2m9.wad and b/levels/e2m9.wad differ diff --git a/levels/e3m1.wad b/levels/e3m1.wad index e29ca72c..01d21cae 100644 Binary files a/levels/e3m1.wad and b/levels/e3m1.wad differ diff --git a/levels/map09.wad b/levels/map09.wad index 08b422a4..b3685c6c 100644 Binary files a/levels/map09.wad and b/levels/map09.wad differ diff --git a/levels/map27.wad b/levels/map27.wad index ed2359e9..eeab3cd8 100644 Binary files a/levels/map27.wad and b/levels/map27.wad differ diff --git a/lumps/textures/textures.cfg b/lumps/textures/textures.cfg index 51c2a11b..569c2a45 100644 --- a/lumps/textures/textures.cfg +++ b/lumps/textures/textures.cfg @@ -3711,6 +3711,13 @@ COMPWERF 64 128 * PREEL2 6 84 * PREEL1 38 84 +EXITSECR 64 16 ; Secret exit sign +* EXIT3 0 0 +* EXIT2 32 0 +* EXIT2 40 0 +* EXIT2 48 0 +* EXIT2 56 0 + M_BDOOR 128 128 ; TNT keyed door, it was missing the blue version. * RW33_4 0 -16 * RW33_4 64 -16 @@ -3728,6 +3735,9 @@ METAL8 64 128 ; METAL2 but 8 little squares. METAL9 64 128 ; METAL3 with no markings or panels. * RW33_5 0 0 +POSTER1 256 128 ; Goofy-looking movie poster +* POSTER1 0 0 + PIPE3 256 128 ; Unused textures in doom beta, now has vines on freedoom. * TP2_1 0 0 * TP2_2 128 0 @@ -3821,6 +3831,11 @@ LITEBLU5 32 128 ; Variant of LITE3 but blue. * BLITC0 24 112 * BLITC0 24 120 +A-VINE1A 256 64 ; dangling ends of the big vine textures +* W107_2 0 0 +A-VINE2A 256 64 +* W106_2 0 0 + ; These textures are only in FreeDM #ifdef FREEDM diff --git a/musics/d_dm09.mid b/musics/d_dm09.mid index 465b3db2..5cb150d4 100644 Binary files a/musics/d_dm09.mid and b/musics/d_dm09.mid differ diff --git a/patches/crlwdh6.png b/patches/crlwdh6.png index 1bbe182a..0a4e4be6 100644 Binary files a/patches/crlwdh6.png and b/patches/crlwdh6.png differ diff --git a/patches/crlwdh6b.png b/patches/crlwdh6b.png index 366289c5..76606fde 100644 Binary files a/patches/crlwdh6b.png and b/patches/crlwdh6b.png differ diff --git a/patches/crlwdl12.png b/patches/crlwdl12.png index 97a0317d..fac110f1 100644 Binary files a/patches/crlwdl12.png and b/patches/crlwdl12.png differ diff --git a/patches/crlwdl6.png b/patches/crlwdl6.png index 5e96aca4..abbddfb3 100644 Binary files a/patches/crlwdl6.png and b/patches/crlwdl6.png differ diff --git a/patches/crlwdl6b.png b/patches/crlwdl6b.png index 5e96aca4..02219438 100644 Binary files a/patches/crlwdl6b.png and b/patches/crlwdl6b.png differ diff --git a/patches/crlwdl6c.png b/patches/crlwdl6c.png index 5e96aca4..e847f3c6 100644 Binary files a/patches/crlwdl6c.png and b/patches/crlwdl6c.png differ diff --git a/patches/crlwdl6d.png b/patches/crlwdl6d.png index 5e96aca4..b89f0283 100644 Binary files a/patches/crlwdl6d.png and b/patches/crlwdl6d.png differ diff --git a/patches/crlwdl6e.png b/patches/crlwdl6e.png index 5e96aca4..e0271ad5 100644 Binary files a/patches/crlwdl6e.png and b/patches/crlwdl6e.png differ diff --git a/patches/crlwds6.png b/patches/crlwds6.png index 9b1401d3..1431f4f3 100644 Binary files a/patches/crlwds6.png and b/patches/crlwds6.png differ diff --git a/patches/crwdh6.png b/patches/crwdh6.png index a087a95b..c54a4eeb 100644 Binary files a/patches/crwdh6.png and b/patches/crwdh6.png differ diff --git a/patches/crwdh6b.png b/patches/crwdh6b.png index a087a95b..b06515b4 100644 Binary files a/patches/crwdh6b.png and b/patches/crwdh6b.png differ diff --git a/patches/crwdl12.png b/patches/crwdl12.png index 3c89656a..f2abc3a2 100644 Binary files a/patches/crwdl12.png and b/patches/crwdl12.png differ diff --git a/patches/crwdl6.png b/patches/crwdl6.png index b34b32ce..1ca85f40 100644 Binary files a/patches/crwdl6.png and b/patches/crwdl6.png differ diff --git a/patches/crwdl6b.png b/patches/crwdl6b.png index b34b32ce..e9c672b7 100644 Binary files a/patches/crwdl6b.png and b/patches/crwdl6b.png differ diff --git a/patches/crwdl6c.png b/patches/crwdl6c.png index b34b32ce..9a067eca 100644 Binary files a/patches/crwdl6c.png and b/patches/crwdl6c.png differ diff --git a/patches/crwdl6d.png b/patches/crwdl6d.png index b34b32ce..cac3dc42 100644 Binary files a/patches/crwdl6d.png and b/patches/crwdl6d.png differ diff --git a/patches/crwds6.png b/patches/crwds6.png index d5a1f182..b708a817 100644 Binary files a/patches/crwds6.png and b/patches/crwds6.png differ diff --git a/patches/dobigtva.png b/patches/dobigtva.png index c693b98e..149dadcf 100644 Binary files a/patches/dobigtva.png and b/patches/dobigtva.png differ diff --git a/patches/dobigtvb.png b/patches/dobigtvb.png index c693b98e..735b2517 100644 Binary files a/patches/dobigtvb.png and b/patches/dobigtvb.png differ diff --git a/patches/dobigtvc.png b/patches/dobigtvc.png index c693b98e..f2dda5da 100644 Binary files a/patches/dobigtvc.png and b/patches/dobigtvc.png differ diff --git a/patches/dobigtvd.png b/patches/dobigtvd.png index c693b98e..2e999085 100644 Binary files a/patches/dobigtvd.png and b/patches/dobigtvd.png differ diff --git a/patches/doblip1a.png b/patches/doblip1a.png index 897224f1..889c0e1e 100644 Binary files a/patches/doblip1a.png and b/patches/doblip1a.png differ diff --git a/patches/doblip2a.png b/patches/doblip2a.png index 897224f1..d29593f8 100644 Binary files a/patches/doblip2a.png and b/patches/doblip2a.png differ diff --git a/patches/doblip3a.png b/patches/doblip3a.png index 897224f1..da8fe440 100644 Binary files a/patches/doblip3a.png and b/patches/doblip3a.png differ diff --git a/patches/doblip4a.png b/patches/doblip4a.png index 897224f1..66a44a90 100644 Binary files a/patches/doblip4a.png and b/patches/doblip4a.png differ diff --git a/patches/dosha1.png b/patches/dosha1.png index cd2faea4..15bf0d6c 100644 Binary files a/patches/dosha1.png and b/patches/dosha1.png differ diff --git a/patches/doshb1.png b/patches/doshb1.png index cd2faea4..0f1335a9 100644 Binary files a/patches/doshb1.png and b/patches/doshb1.png differ diff --git a/patches/doshc1.png b/patches/doshc1.png index cd2faea4..43b73286 100644 Binary files a/patches/doshc1.png and b/patches/doshc1.png differ diff --git a/patches/doshd1.png b/patches/doshd1.png index cd2faea4..27050de5 100644 Binary files a/patches/doshd1.png and b/patches/doshd1.png differ diff --git a/patches/doshe1.png b/patches/doshe1.png index cd2faea4..e1246218 100644 Binary files a/patches/doshe1.png and b/patches/doshe1.png differ diff --git a/patches/doshf1.png b/patches/doshf1.png index cd2faea4..e1fc894c 100644 Binary files a/patches/doshf1.png and b/patches/doshf1.png differ diff --git a/patches/doslvr11.png b/patches/doslvr11.png index f94b186c..0b6de9c0 100644 Binary files a/patches/doslvr11.png and b/patches/doslvr11.png differ diff --git a/patches/doslvr12.png b/patches/doslvr12.png index f94b186c..18a88ad7 100644 Binary files a/patches/doslvr12.png and b/patches/doslvr12.png differ diff --git a/patches/doslvr13.png b/patches/doslvr13.png index f94b186c..884e3040 100644 Binary files a/patches/doslvr13.png and b/patches/doslvr13.png differ diff --git a/patches/doslvr14.png b/patches/doslvr14.png index f94b186c..5bf6d87a 100644 Binary files a/patches/doslvr14.png and b/patches/doslvr14.png differ diff --git a/patches/doslvr21.png b/patches/doslvr21.png index 5f4c2d7d..56fa7823 100644 Binary files a/patches/doslvr21.png and b/patches/doslvr21.png differ diff --git a/patches/doslvr22.png b/patches/doslvr22.png index 5f4c2d7d..7d898864 100644 Binary files a/patches/doslvr22.png and b/patches/doslvr22.png differ diff --git a/patches/doslvr23.png b/patches/doslvr23.png index 5f4c2d7d..51177cad 100644 Binary files a/patches/doslvr23.png and b/patches/doslvr23.png differ diff --git a/patches/doslvr24.png b/patches/doslvr24.png index 5f4c2d7d..f910f3f2 100644 Binary files a/patches/doslvr24.png and b/patches/doslvr24.png differ diff --git a/patches/dotv1b.png b/patches/dotv1b.png index c693b98e..4fb76946 100644 Binary files a/patches/dotv1b.png and b/patches/dotv1b.png differ diff --git a/patches/dotv2b.png b/patches/dotv2b.png index c693b98e..cf70dadf 100644 Binary files a/patches/dotv2b.png and b/patches/dotv2b.png differ diff --git a/patches/dotv3b.png b/patches/dotv3b.png index c693b98e..48d9cbad 100644 Binary files a/patches/dotv3b.png and b/patches/dotv3b.png differ diff --git a/patches/dotv4b.png b/patches/dotv4b.png index c693b98e..f4d90c06 100644 Binary files a/patches/dotv4b.png and b/patches/dotv4b.png differ diff --git a/patches/exit3.png b/patches/exit3.png new file mode 100644 index 00000000..7b000e15 Binary files /dev/null and b/patches/exit3.png differ diff --git a/patches/poster1.png b/patches/poster1.png new file mode 100644 index 00000000..1d4f5e4c Binary files /dev/null and b/patches/poster1.png differ diff --git a/patches/redtnt2.png b/patches/redtnt2.png index 76762b1e..2862a26e 100644 Binary files a/patches/redtnt2.png and b/patches/redtnt2.png differ diff --git a/patches/rw18_1.png b/patches/rw18_1.png index 39358c12..c96fe465 100644 Binary files a/patches/rw18_1.png and b/patches/rw18_1.png differ diff --git a/patches/rw18_2.png b/patches/rw18_2.png index 2a71f5e9..d5efc702 100644 Binary files a/patches/rw18_2.png and b/patches/rw18_2.png differ diff --git a/patches/w106_1.png b/patches/w106_1.png index bc77815e..48716f73 100644 Binary files a/patches/w106_1.png and b/patches/w106_1.png differ diff --git a/patches/w106_2.png b/patches/w106_2.png new file mode 100644 index 00000000..772ad01b Binary files /dev/null and b/patches/w106_2.png differ diff --git a/patches/w107_1.png b/patches/w107_1.png index 84f93ded..72c4cc26 100644 Binary files a/patches/w107_1.png and b/patches/w107_1.png differ diff --git a/patches/w107_2.png b/patches/w107_2.png new file mode 100644 index 00000000..077c6778 Binary files /dev/null and b/patches/w107_2.png differ diff --git a/sprites/bon1a0.png b/sprites/bon1a0.png index 4c2fd8ab..8dd49eed 100644 Binary files a/sprites/bon1a0.png and b/sprites/bon1a0.png differ diff --git a/sprites/bon1b0.png b/sprites/bon1b0.png index c7471288..d1a770e1 100644 Binary files a/sprites/bon1b0.png and b/sprites/bon1b0.png differ diff --git a/sprites/bon1c0.png b/sprites/bon1c0.png index c97a6cd1..c9b1e038 100644 Binary files a/sprites/bon1c0.png and b/sprites/bon1c0.png differ diff --git a/sprites/bon1d0.png b/sprites/bon1d0.png index 1693620b..ca8ce124 100644 Binary files a/sprites/bon1d0.png and b/sprites/bon1d0.png differ diff --git a/sprites/punga0.png b/sprites/punga0.png index 3018e77f..96babdb3 100644 Binary files a/sprites/punga0.png and b/sprites/punga0.png differ diff --git a/sprites/pungb0.png b/sprites/pungb0.png index 201ecb65..5c92c2f8 100644 Binary files a/sprites/pungb0.png and b/sprites/pungb0.png differ diff --git a/sprites/pungc0.png b/sprites/pungc0.png index e8b7ba58..8348188d 100644 Binary files a/sprites/pungc0.png and b/sprites/pungc0.png differ diff --git a/sprites/pungd0.png b/sprites/pungd0.png index d4100dbc..0a92e09d 100644 Binary files a/sprites/pungd0.png and b/sprites/pungd0.png differ diff --git a/sprites/pvisa0.png b/sprites/pvisa0.png index aa8ac31d..d09f085a 100644 Binary files a/sprites/pvisa0.png and b/sprites/pvisa0.png differ diff --git a/sprites/pvisb0.png b/sprites/pvisb0.png index ea2fb17f..3d2cef95 100644 Binary files a/sprites/pvisb0.png and b/sprites/pvisb0.png differ