mirror of
https://github.com/freedoom/freedoom.git
synced 2025-09-01 13:25:46 -04:00
Merge remote-tracking branch 'talon1024/texdefs'
This commit is contained in:
commit
4b35a137af
1 changed files with 258 additions and 204 deletions
|
@ -291,15 +291,6 @@ BIGMURAL 256 128
|
|||
* BIGMURAL 0 0
|
||||
BIGWALL 128 128
|
||||
* BIGWALL 0 0
|
||||
BLOD3 512 128
|
||||
* RW48_4 0 0
|
||||
* RW48_4 64 0
|
||||
* DOSW3C 128 0
|
||||
* DOSW3 200 0
|
||||
* DOSLVR13 272 0
|
||||
* DOSLVR23 344 0
|
||||
* DOBLIP3A 416 0
|
||||
* CYAN 488 0
|
||||
BRNOPEN 64 128
|
||||
* BRNOPEN 0 0
|
||||
BTNTMETL 64 128
|
||||
|
@ -793,174 +784,6 @@ PNK4EXIT 128 128
|
|||
* EXIT1 48 25
|
||||
REDOPEN 64 128
|
||||
* REDOPEN 0 0
|
||||
SLAD2 512 128
|
||||
* DOSHB1 0 0
|
||||
* DOSPI2B 136 0
|
||||
* SMFILLER 272 0
|
||||
* COMP03_4 276 0
|
||||
* COMP03_4 276 64
|
||||
* COMP03_4 308 0
|
||||
* COMP03_4 308 64
|
||||
* SMFILLER 340 0
|
||||
* PREEL1 283 21
|
||||
* PREEL2 311 21
|
||||
* SAW2 344 0
|
||||
* SAW2SD 416 0
|
||||
* PBLAK 448 0
|
||||
* PL_05 454 2
|
||||
SLAD3 512 128
|
||||
* DOSHC1 0 0
|
||||
* DOSPI3B 136 0
|
||||
* SMFILLER 272 0
|
||||
* COMP03_4 276 0
|
||||
* COMP03_4 276 64
|
||||
* COMP03_4 308 0
|
||||
* COMP03_4 308 64
|
||||
* SMFILLER 340 0
|
||||
* PREEL4 283 21
|
||||
* PREEL5 311 21
|
||||
* SAW3 344 0
|
||||
* SAW3SD 416 0
|
||||
* PBLAK 448 0
|
||||
* PL_10 454 2
|
||||
SLAD4 512 128
|
||||
* DOSHD1 0 0
|
||||
* DOSPI2B 136 0
|
||||
* SMFILLER 272 0
|
||||
* COMP03_4 276 0
|
||||
* COMP03_4 276 64
|
||||
* COMP03_4 308 0
|
||||
* COMP03_4 308 64
|
||||
* SMFILLER 340 0
|
||||
* PREEL3 283 21
|
||||
* PREEL3 311 21
|
||||
* SAW4 344 0
|
||||
* SAW2SD 416 0
|
||||
* PBLAK 448 0
|
||||
* PL_18 454 2
|
||||
SLAD5 512 128
|
||||
* DOSHE1 0 0
|
||||
* DOSPI3B 136 0
|
||||
* SMFILLER 272 0
|
||||
* COMP03_4 276 0
|
||||
* COMP03_4 276 64
|
||||
* COMP03_4 308 0
|
||||
* COMP03_4 308 64
|
||||
* SMFILLER 340 0
|
||||
* PREEL3 283 21
|
||||
* PREEL3 311 21
|
||||
* SAW5 344 0
|
||||
* SAW5SD 416 0
|
||||
* PBLAK 448 0
|
||||
* PL_18 454 2
|
||||
* PL_19 454 2
|
||||
SLAD6 512 128
|
||||
* DOSHF1 0 0
|
||||
* DOSPI4B 136 0
|
||||
* SMFILLER 272 0
|
||||
* COMP03_4 276 0
|
||||
* COMP03_4 276 64
|
||||
* COMP03_4 308 0
|
||||
* COMP03_4 308 64
|
||||
* SMFILLER 340 0
|
||||
* PREEL2 283 21
|
||||
* PREEL1 311 21
|
||||
* SAW6 344 0
|
||||
* SAW6SD 416 0
|
||||
* PBLAK 448 0
|
||||
* PL_18 454 2
|
||||
* PL_20 453 4
|
||||
SLAD7 512 128
|
||||
* DOSHA1 0 0
|
||||
* DOSPI1B 136 0
|
||||
* SMFILLER 272 0
|
||||
* COMP03_4 276 0
|
||||
* COMP03_4 276 64
|
||||
* COMP03_4 308 0
|
||||
* COMP03_4 308 64
|
||||
* SMFILLER 340 0
|
||||
* PREEL2 283 21
|
||||
* PREEL1 311 21
|
||||
* SAW1 344 0
|
||||
* SAW1SD 416 0
|
||||
* PBLAK 448 0
|
||||
* PL_18 454 2
|
||||
* PL_U 452 20
|
||||
* PL_25 464 6
|
||||
SLAD8 512 128
|
||||
* DOSHB1 0 0
|
||||
* DOSPI2B 136 0
|
||||
* SMFILLER 272 0
|
||||
* COMP03_4 276 0
|
||||
* COMP03_4 276 64
|
||||
* COMP03_4 308 0
|
||||
* COMP03_4 308 64
|
||||
* SMFILLER 340 0
|
||||
* PREEL7 283 21
|
||||
* PREEL6 311 21
|
||||
* SAW2 344 0
|
||||
* SAW2SD 416 0
|
||||
* PBLAK 448 0
|
||||
* PL_18 454 2
|
||||
* PL_U 452 20
|
||||
* PL_A 464 20
|
||||
* PL_31 467 2
|
||||
SLAD9 512 128
|
||||
* DOSHC1 0 0
|
||||
* DOSPI3B 136 0
|
||||
* SMFILLER 272 0
|
||||
* COMP03_4 276 0
|
||||
* COMP03_4 276 64
|
||||
* COMP03_4 308 0
|
||||
* COMP03_4 308 64
|
||||
* SMFILLER 340 0
|
||||
* PREEL3 283 21
|
||||
* PREEL3 311 21
|
||||
* SAW3 344 0
|
||||
* SAW3SD 416 0
|
||||
* PBLAK 448 0
|
||||
* PL_18 454 2
|
||||
* PL_U 452 20
|
||||
* PL_A 464 20
|
||||
* PL_C 476 20
|
||||
SLAD10 512 128
|
||||
* DOSHD1 0 0
|
||||
* DOSPI2B 136 0
|
||||
* SMFILLER 272 0
|
||||
* COMP03_4 276 0
|
||||
* COMP03_4 276 64
|
||||
* COMP03_4 308 0
|
||||
* COMP03_4 308 64
|
||||
* SMFILLER 340 0
|
||||
* PREEL3 283 21
|
||||
* PREEL3 311 21
|
||||
* SAW4 344 0
|
||||
* SAW4SD 416 0
|
||||
* PBLAK 448 0
|
||||
* PL_18 454 2
|
||||
* PL_A 464 20
|
||||
* PL_C 476 20
|
||||
* TFOGF0 452 20
|
||||
* TFOGI0 462 18
|
||||
SLAD11 512 128
|
||||
* DOSHE1 0 0
|
||||
* DOSPI3B 136 0
|
||||
* SMFILLER 272 0
|
||||
* COMP03_4 276 0
|
||||
* COMP03_4 276 64
|
||||
* COMP03_4 308 0
|
||||
* COMP03_4 308 64
|
||||
* SMFILLER 340 0
|
||||
* PREEL3 283 21
|
||||
* PREEL3 311 21
|
||||
* SAW5 344 0
|
||||
* SAW5SD 416 0
|
||||
* PBLAK 448 0
|
||||
* PL_19 454 2
|
||||
* PL_T 452 20
|
||||
* PL_N 464 20
|
||||
* TFOGF0 458 20
|
||||
* TFOGI0 476 18
|
||||
SMGLASS1 64 128
|
||||
* PCWINL 0 0
|
||||
SMSTONE6 128 128
|
||||
|
@ -1770,14 +1593,6 @@ EXITSTON 64 128
|
|||
* EXIT1 16 22
|
||||
FIREBLU1 128 128
|
||||
* W65B_1 0 0
|
||||
AROCK2 128 128
|
||||
* AROCK2 0 0
|
||||
AROCK3 128 128
|
||||
* AROCK3 0 0
|
||||
AROCK4 128 128
|
||||
* AROCK4 0 0
|
||||
AROCK5 128 128
|
||||
* AROCK5 0 0
|
||||
FIREBLU2 128 128
|
||||
* W65B_2 0 0
|
||||
FIRELAV3 128 128
|
||||
|
@ -2747,7 +2562,14 @@ MIDBARS3 64 72
|
|||
* RW45_1 0 0
|
||||
MARBFAC3 128 128
|
||||
* MWALL5_1 0 0
|
||||
MC1 128 128
|
||||
|
||||
; These are "new" textures that are really just here so that all patches
|
||||
; needed for Plutonia compatibility are included. plutonia.wad has these
|
||||
; textures but they're modified versions of textures that were in
|
||||
; doom2.wad, so they've been renamed to avoid conflicts:
|
||||
|
||||
; DBRAIN/MC
|
||||
P-DBRAN1 128 128
|
||||
* MC1 0 0
|
||||
MC2 128 128
|
||||
* MC2 0 0
|
||||
|
@ -2783,17 +2605,19 @@ MC18 128 128
|
|||
* MC18 0 0
|
||||
MC19 128 128
|
||||
* MC19 0 0
|
||||
MC20 128 128
|
||||
* MC20 0 0
|
||||
|
||||
; These are "new" textures that are really just here so that all patches
|
||||
; needed for Plutonia compatibility are included. plutonia.wad has these
|
||||
; textures but they're modified versions of textures that were in
|
||||
; doom2.wad, so they've been renamed to avoid conflicts:
|
||||
|
||||
; FIREBLU1, FIREBLU2
|
||||
P-DBRAN4 128 128
|
||||
* MC20 0 0
|
||||
; FIREBLU/AROCK
|
||||
P-FRBLU1 128 128
|
||||
* FIREBLU1 0 0
|
||||
AROCK2 128 128
|
||||
* AROCK2 0 0
|
||||
AROCK3 128 128
|
||||
* AROCK3 0 0
|
||||
AROCK4 128 128
|
||||
* AROCK4 0 0
|
||||
AROCK5 128 128
|
||||
* AROCK5 0 0
|
||||
P-FRBLU2 128 128
|
||||
* FIREBLU2 0 0
|
||||
; SKY*
|
||||
|
@ -2828,15 +2652,6 @@ T-BLODG1 512 128
|
|||
* DOSLVR21 344 0
|
||||
* DOBLIP1A 416 0
|
||||
* CYAN 488 0
|
||||
T-BLODG4 512 128
|
||||
* RW48_4 0 0
|
||||
* RW48_4 64 0
|
||||
* DOSW4C 128 0
|
||||
* DOSW4 200 0
|
||||
* DOSLVR14 272 0
|
||||
* DOSLVR24 344 0
|
||||
* DOBLIP4A 416 0
|
||||
* CYAN 488 0
|
||||
; Was SW1SKULL:
|
||||
SW1TSKUL 512 128
|
||||
* RW48_4 0 0
|
||||
|
@ -2847,6 +2662,24 @@ SW1TSKUL 512 128
|
|||
* DOSLVR22 344 0
|
||||
* DOBLIP2A 416 0
|
||||
* CYAN 488 0
|
||||
BLOD3 512 128
|
||||
* RW48_4 0 0
|
||||
* RW48_4 64 0
|
||||
* DOSW3C 128 0
|
||||
* DOSW3 200 0
|
||||
* DOSLVR13 272 0
|
||||
* DOSLVR23 344 0
|
||||
* DOBLIP3A 416 0
|
||||
* CYAN 488 0
|
||||
T-BLODG4 512 128
|
||||
* RW48_4 0 0
|
||||
* RW48_4 64 0
|
||||
* DOSW4C 128 0
|
||||
* DOSW4 200 0
|
||||
* DOSLVR14 272 0
|
||||
* DOSLVR24 344 0
|
||||
* DOBLIP4A 416 0
|
||||
* CYAN 488 0
|
||||
; WFALL1:
|
||||
T-WFALL1 512 128
|
||||
* RW48_2 0 0
|
||||
|
@ -2919,6 +2752,227 @@ T-SLDRP1 512 128
|
|||
* SAW1SD 416 0
|
||||
* PBLAK 448 0
|
||||
* PL_01 462 2
|
||||
SLAD2 512 128
|
||||
* DOSHB1 0 0
|
||||
* DOSPI2B 136 0
|
||||
* SMFILLER 272 0
|
||||
* COMP03_4 276 0
|
||||
* COMP03_4 276 64
|
||||
* COMP03_4 308 0
|
||||
* COMP03_4 308 64
|
||||
* SMFILLER 340 0
|
||||
* PREEL1 283 21
|
||||
* PREEL2 311 21
|
||||
* SAW2 344 0
|
||||
* SAW2SD 416 0
|
||||
* PBLAK 448 0
|
||||
* PL_05 454 2
|
||||
SLAD3 512 128
|
||||
* DOSHC1 0 0
|
||||
* DOSPI3B 136 0
|
||||
* SMFILLER 272 0
|
||||
* COMP03_4 276 0
|
||||
* COMP03_4 276 64
|
||||
* COMP03_4 308 0
|
||||
* COMP03_4 308 64
|
||||
* SMFILLER 340 0
|
||||
* PREEL4 283 21
|
||||
* PREEL5 311 21
|
||||
* SAW3 344 0
|
||||
* SAW3SD 416 0
|
||||
* PBLAK 448 0
|
||||
* PL_10 454 2
|
||||
SLAD4 512 128
|
||||
* DOSHD1 0 0
|
||||
* DOSPI2B 136 0
|
||||
* SMFILLER 272 0
|
||||
* COMP03_4 276 0
|
||||
* COMP03_4 276 64
|
||||
* COMP03_4 308 0
|
||||
* COMP03_4 308 64
|
||||
* SMFILLER 340 0
|
||||
* PREEL3 283 21
|
||||
* PREEL3 311 21
|
||||
* SAW4 344 0
|
||||
* SAW2SD 416 0
|
||||
* PBLAK 448 0
|
||||
* PL_18 454 2
|
||||
SLAD5 512 128
|
||||
* DOSHE1 0 0
|
||||
* DOSPI3B 136 0
|
||||
* SMFILLER 272 0
|
||||
* COMP03_4 276 0
|
||||
* COMP03_4 276 64
|
||||
* COMP03_4 308 0
|
||||
* COMP03_4 308 64
|
||||
* SMFILLER 340 0
|
||||
* PREEL3 283 21
|
||||
* PREEL3 311 21
|
||||
* SAW5 344 0
|
||||
* SAW5SD 416 0
|
||||
* PBLAK 448 0
|
||||
* PL_18 454 2
|
||||
* PL_19 454 2
|
||||
SLAD6 512 128
|
||||
* DOSHF1 0 0
|
||||
* DOSPI4B 136 0
|
||||
* SMFILLER 272 0
|
||||
* COMP03_4 276 0
|
||||
* COMP03_4 276 64
|
||||
* COMP03_4 308 0
|
||||
* COMP03_4 308 64
|
||||
* SMFILLER 340 0
|
||||
* PREEL2 283 21
|
||||
* PREEL1 311 21
|
||||
* SAW6 344 0
|
||||
* SAW6SD 416 0
|
||||
* PBLAK 448 0
|
||||
* PL_18 454 2
|
||||
* PL_20 453 4
|
||||
SLAD7 512 128
|
||||
* DOSHA1 0 0
|
||||
* DOSPI1B 136 0
|
||||
* SMFILLER 272 0
|
||||
* COMP03_4 276 0
|
||||
* COMP03_4 276 64
|
||||
* COMP03_4 308 0
|
||||
* COMP03_4 308 64
|
||||
* SMFILLER 340 0
|
||||
* PREEL2 283 21
|
||||
* PREEL1 311 21
|
||||
* SAW1 344 0
|
||||
* SAW1SD 416 0
|
||||
* PBLAK 448 0
|
||||
* PL_18 454 2
|
||||
* PL_U 452 20
|
||||
* PL_25 464 6
|
||||
SLAD8 512 128
|
||||
* DOSHB1 0 0
|
||||
* DOSPI2B 136 0
|
||||
* SMFILLER 272 0
|
||||
* COMP03_4 276 0
|
||||
* COMP03_4 276 64
|
||||
* COMP03_4 308 0
|
||||
* COMP03_4 308 64
|
||||
* SMFILLER 340 0
|
||||
* PREEL7 283 21
|
||||
* PREEL6 311 21
|
||||
* SAW2 344 0
|
||||
* SAW2SD 416 0
|
||||
* PBLAK 448 0
|
||||
* PL_18 454 2
|
||||
* PL_U 452 20
|
||||
* PL_A 464 20
|
||||
* PL_31 467 2
|
||||
SLAD9 512 128
|
||||
* DOSHC1 0 0
|
||||
* DOSPI3B 136 0
|
||||
* SMFILLER 272 0
|
||||
* COMP03_4 276 0
|
||||
* COMP03_4 276 64
|
||||
* COMP03_4 308 0
|
||||
* COMP03_4 308 64
|
||||
* SMFILLER 340 0
|
||||
* PREEL3 283 21
|
||||
* PREEL3 311 21
|
||||
* SAW3 344 0
|
||||
* SAW3SD 416 0
|
||||
* PBLAK 448 0
|
||||
* PL_18 454 2
|
||||
* PL_U 452 20
|
||||
* PL_A 464 20
|
||||
* PL_C 476 20
|
||||
SLAD10 512 128
|
||||
* DOSHD1 0 0
|
||||
* DOSPI2B 136 0
|
||||
* SMFILLER 272 0
|
||||
* COMP03_4 276 0
|
||||
* COMP03_4 276 64
|
||||
* COMP03_4 308 0
|
||||
* COMP03_4 308 64
|
||||
* SMFILLER 340 0
|
||||
* PREEL3 283 21
|
||||
* PREEL3 311 21
|
||||
* SAW4 344 0
|
||||
* SAW4SD 416 0
|
||||
* PBLAK 448 0
|
||||
* PL_18 454 2
|
||||
* PL_A 464 20
|
||||
* PL_C 476 20
|
||||
* TFOGF0 452 20
|
||||
* TFOGI0 462 18
|
||||
SLAD11 512 128
|
||||
* DOSHE1 0 0
|
||||
* DOSPI3B 136 0
|
||||
* SMFILLER 272 0
|
||||
* COMP03_4 276 0
|
||||
* COMP03_4 276 64
|
||||
* COMP03_4 308 0
|
||||
* COMP03_4 308 64
|
||||
* SMFILLER 340 0
|
||||
* PREEL3 283 21
|
||||
* PREEL3 311 21
|
||||
* SAW5 344 0
|
||||
* SAW5SD 416 0
|
||||
* PBLAK 448 0
|
||||
* PL_18 454 2
|
||||
* PL_T 452 20
|
||||
* PL_N 464 20
|
||||
* TFOGF0 458 20
|
||||
* TFOGI0 476 18
|
||||
T-SLDRP3 512 128
|
||||
* DOSHF1 0 0
|
||||
* DOSPI4B 136 0
|
||||
* SMFILLER 272 0
|
||||
* COMP03_4 276 0
|
||||
* COMP03_4 276 64
|
||||
* COMP03_4 308 0
|
||||
* COMP03_4 308 64
|
||||
* SMFILLER 340 0
|
||||
* PREEL3 283 21
|
||||
* PREEL3 311 21
|
||||
* SAW6 344 0
|
||||
* SAW6SD 416 0
|
||||
* PBLAK 448 0
|
||||
* PL_18 454 2
|
||||
* PL_T 452 20
|
||||
* PL_N 464 20
|
||||
* PL_T 476 20
|
||||
; TNT SW{1,2}GSTON
|
||||
SW1TSTON 512 128
|
||||
* WALL48_2 0 0
|
||||
* SW2_7 13 67
|
||||
* WALL48_2 64 0
|
||||
* SW2_7 77 67
|
||||
* WALL48_2 128 0
|
||||
* SW2_7 141 67
|
||||
* WALL48_2 192 0
|
||||
* SW2_7 205 67
|
||||
* RW7_2 256 0
|
||||
* SW2_7 270 69
|
||||
* RW7_2 320 0
|
||||
* SW2_7 334 69
|
||||
* RW7_2 384 0
|
||||
* SW2_7 398 69
|
||||
* RW7_2 448 0
|
||||
* SW2_7 462 69
|
||||
SW2TSTON 512 128
|
||||
* WALL48_2 0 0
|
||||
* SW2_8 13 67
|
||||
* WALL48_2 64 0
|
||||
* SW2_8 77 67
|
||||
* WALL48_2 128 0
|
||||
* SW2_8 141 67
|
||||
* WALL48_2 192 0
|
||||
* SW2_8 205 67
|
||||
* RW7_2 256 0
|
||||
* SW2_8 270 69
|
||||
* RW7_2 320 0
|
||||
* SW2_8 334 69
|
||||
* RW7_2 384 0
|
||||
* SW2_8 398 69
|
||||
* RW7_2 448 0
|
||||
* SW2_8 462 69
|
||||
|
||||
; Plain/flat color textures:
|
||||
PDUMMY 64 128
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue