mirror of
https://github.com/freedoom/freedoom.git
synced 2025-09-01 13:25:46 -04:00
Merge branch 'freedoom:master' into ENDOOM-screens
This commit is contained in:
commit
0681b45507
72 changed files with 23 additions and 8 deletions
|
@ -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
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue