Merge branch 'freedoom:master' into ENDOOM-screens
5
CREDITS
|
@ -1034,4 +1034,7 @@ D: sprites
|
||||||
N: Dmytro Moskovchenko
|
N: Dmytro Moskovchenko
|
||||||
S: Dimon12321
|
S: Dimon12321
|
||||||
E: d.moskowchenko@gmail.com
|
E: d.moskowchenko@gmail.com
|
||||||
D: levels
|
D: levels
|
||||||
|
|
||||||
|
S: MrFlibble
|
||||||
|
D: textures
|
||||||
|
|
|
@ -154,9 +154,6 @@ It is sensible to also heed the following guidelines:
|
||||||
engines, especially those that use hardware accelerated rendering,
|
engines, especially those that use hardware accelerated rendering,
|
||||||
may not render it properly. Examples of tricks to avoid include
|
may not render it properly. Examples of tricks to avoid include
|
||||||
those used to simulate 3D bridges and “deep water” effects.
|
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
|
* Test your levels in https://www.chocolate-doom.org/[Chocolate
|
||||||
Doom] to make sure that vanilla compatibility is maintained. This
|
Doom] to make sure that vanilla compatibility is maintained. This
|
||||||
is an engine with strict adherence to vanilla Doom limits and
|
is an engine with strict adherence to vanilla Doom limits and
|
||||||
|
|
|
@ -2311,10 +2311,10 @@ PUFFA0 2 3
|
||||||
PUFFB0 6 8
|
PUFFB0 6 8
|
||||||
PUFFC0 7 9
|
PUFFC0 7 9
|
||||||
PUFFD0 8 10
|
PUFFD0 8 10
|
||||||
PUNGA0 -96 -128
|
PUNGA0 -94 -139
|
||||||
PUNGB0 -64 -144
|
PUNGB0 -88 -129
|
||||||
PUNGC0 -192 -108
|
PUNGC0 -185 -93
|
||||||
PUNGD0 -144 -84
|
PUNGD0 -140 -80
|
||||||
PVISA0 14 13
|
PVISA0 14 13
|
||||||
PVISB0 14 13
|
PVISB0 14 13
|
||||||
RKEYA0 8 19
|
RKEYA0 8 19
|
||||||
|
|
BIN
levels/e2m3.wad
BIN
levels/e2m9.wad
BIN
levels/e3m1.wad
BIN
levels/map09.wad
BIN
levels/map27.wad
|
@ -3711,6 +3711,13 @@ COMPWERF 64 128
|
||||||
* PREEL2 6 84
|
* PREEL2 6 84
|
||||||
* PREEL1 38 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.
|
M_BDOOR 128 128 ; TNT keyed door, it was missing the blue version.
|
||||||
* RW33_4 0 -16
|
* RW33_4 0 -16
|
||||||
* RW33_4 64 -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.
|
METAL9 64 128 ; METAL3 with no markings or panels.
|
||||||
* RW33_5 0 0
|
* 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.
|
PIPE3 256 128 ; Unused textures in doom beta, now has vines on freedoom.
|
||||||
* TP2_1 0 0
|
* TP2_1 0 0
|
||||||
* TP2_2 128 0
|
* TP2_2 128 0
|
||||||
|
@ -3821,6 +3831,11 @@ LITEBLU5 32 128 ; Variant of LITE3 but blue.
|
||||||
* BLITC0 24 112
|
* BLITC0 24 112
|
||||||
* BLITC0 24 120
|
* 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
|
; These textures are only in FreeDM
|
||||||
|
|
||||||
#ifdef FREEDM
|
#ifdef FREEDM
|
||||||
|
|
Before Width: | Height: | Size: 4.1 KiB After Width: | Height: | Size: 4.5 KiB |
Before Width: | Height: | Size: 4.1 KiB After Width: | Height: | Size: 4.8 KiB |
Before Width: | Height: | Size: 2.1 KiB After Width: | Height: | Size: 4 KiB |
Before Width: | Height: | Size: 2.3 KiB After Width: | Height: | Size: 2.7 KiB |
Before Width: | Height: | Size: 2.3 KiB After Width: | Height: | Size: 2.7 KiB |
Before Width: | Height: | Size: 2.3 KiB After Width: | Height: | Size: 2.8 KiB |
Before Width: | Height: | Size: 2.3 KiB After Width: | Height: | Size: 2.9 KiB |
Before Width: | Height: | Size: 2.3 KiB After Width: | Height: | Size: 2.8 KiB |
Before Width: | Height: | Size: 997 B After Width: | Height: | Size: 1.9 KiB |
Before Width: | Height: | Size: 4.1 KiB After Width: | Height: | Size: 5.1 KiB |
Before Width: | Height: | Size: 4.1 KiB After Width: | Height: | Size: 5.2 KiB |
Before Width: | Height: | Size: 2.1 KiB After Width: | Height: | Size: 4.3 KiB |
Before Width: | Height: | Size: 2.3 KiB After Width: | Height: | Size: 3 KiB |
Before Width: | Height: | Size: 2.3 KiB After Width: | Height: | Size: 3 KiB |
Before Width: | Height: | Size: 2.3 KiB After Width: | Height: | Size: 3 KiB |
Before Width: | Height: | Size: 2.3 KiB After Width: | Height: | Size: 3.1 KiB |
Before Width: | Height: | Size: 997 B After Width: | Height: | Size: 1.9 KiB |
Before Width: | Height: | Size: 1.7 KiB After Width: | Height: | Size: 1.8 KiB |
Before Width: | Height: | Size: 1.7 KiB After Width: | Height: | Size: 1.8 KiB |
Before Width: | Height: | Size: 1.7 KiB After Width: | Height: | Size: 1.9 KiB |
Before Width: | Height: | Size: 1.7 KiB After Width: | Height: | Size: 1.9 KiB |
Before Width: | Height: | Size: 2.4 KiB After Width: | Height: | Size: 3.6 KiB |
Before Width: | Height: | Size: 2.4 KiB After Width: | Height: | Size: 3.9 KiB |
Before Width: | Height: | Size: 2.4 KiB After Width: | Height: | Size: 2.9 KiB |
Before Width: | Height: | Size: 2.4 KiB After Width: | Height: | Size: 4 KiB |
Before Width: | Height: | Size: 2.9 KiB After Width: | Height: | Size: 3.9 KiB |
Before Width: | Height: | Size: 2.9 KiB After Width: | Height: | Size: 4 KiB |
Before Width: | Height: | Size: 2.9 KiB After Width: | Height: | Size: 4.2 KiB |
Before Width: | Height: | Size: 2.9 KiB After Width: | Height: | Size: 4.4 KiB |
Before Width: | Height: | Size: 2.9 KiB After Width: | Height: | Size: 4.6 KiB |
Before Width: | Height: | Size: 2.9 KiB After Width: | Height: | Size: 4.4 KiB |
Before Width: | Height: | Size: 3.1 KiB After Width: | Height: | Size: 2.9 KiB |
Before Width: | Height: | Size: 3.1 KiB After Width: | Height: | Size: 3 KiB |
Before Width: | Height: | Size: 3.1 KiB After Width: | Height: | Size: 2.9 KiB |
Before Width: | Height: | Size: 3.1 KiB After Width: | Height: | Size: 3 KiB |
Before Width: | Height: | Size: 2.6 KiB After Width: | Height: | Size: 2.9 KiB |
Before Width: | Height: | Size: 2.6 KiB After Width: | Height: | Size: 2.9 KiB |
Before Width: | Height: | Size: 2.6 KiB After Width: | Height: | Size: 2.9 KiB |
Before Width: | Height: | Size: 2.6 KiB After Width: | Height: | Size: 2.9 KiB |
Before Width: | Height: | Size: 1.7 KiB After Width: | Height: | Size: 7.9 KiB |
Before Width: | Height: | Size: 1.7 KiB After Width: | Height: | Size: 7.9 KiB |
Before Width: | Height: | Size: 1.7 KiB After Width: | Height: | Size: 7.9 KiB |
Before Width: | Height: | Size: 1.7 KiB After Width: | Height: | Size: 7.9 KiB |
BIN
patches/exit3.png
Normal file
After Width: | Height: | Size: 5 KiB |
BIN
patches/poster1.png
Normal file
After Width: | Height: | Size: 18 KiB |
Before Width: | Height: | Size: 2.1 KiB After Width: | Height: | Size: 1.7 KiB |
Before Width: | Height: | Size: 4.8 KiB After Width: | Height: | Size: 3.8 KiB |
Before Width: | Height: | Size: 5.2 KiB After Width: | Height: | Size: 3.8 KiB |
Before Width: | Height: | Size: 8.4 KiB After Width: | Height: | Size: 12 KiB |
BIN
patches/w106_2.png
Normal file
After Width: | Height: | Size: 5 KiB |
Before Width: | Height: | Size: 9.3 KiB After Width: | Height: | Size: 13 KiB |
BIN
patches/w107_2.png
Normal file
After Width: | Height: | Size: 5.5 KiB |
Before Width: | Height: | Size: 748 B After Width: | Height: | Size: 452 B |
Before Width: | Height: | Size: 748 B After Width: | Height: | Size: 478 B |
Before Width: | Height: | Size: 957 B After Width: | Height: | Size: 488 B |
Before Width: | Height: | Size: 957 B After Width: | Height: | Size: 499 B |
Before Width: | Height: | Size: 1.3 KiB After Width: | Height: | Size: 1 KiB |
Before Width: | Height: | Size: 1.4 KiB After Width: | Height: | Size: 1.3 KiB |
Before Width: | Height: | Size: 2.2 KiB After Width: | Height: | Size: 2.3 KiB |
Before Width: | Height: | Size: 2.6 KiB After Width: | Height: | Size: 3.5 KiB |
Before Width: | Height: | Size: 626 B After Width: | Height: | Size: 690 B |
Before Width: | Height: | Size: 690 B After Width: | Height: | Size: 626 B |