mirror of
https://github.com/freedoom/freedoom.git
synced 2025-09-01 13:25:46 -04:00
Merge branch 'freedoom:master' into map27dmstart
This commit is contained in:
commit
7c4bad1306
26 changed files with 49 additions and 10 deletions
52
CREDITS
52
CREDITS
|
@ -644,11 +644,6 @@ E: eriance@gmail.com
|
|||
W: http://amuscaria.deviantart.com/
|
||||
D: sprites
|
||||
|
||||
S: horrormovieguy
|
||||
N: Reinaldo
|
||||
E: crumbscrunchydelights@gmail.com
|
||||
D: sprites, flats
|
||||
|
||||
S: zrrion
|
||||
N: Roth Smith
|
||||
E: zrrion@gmail.com
|
||||
|
@ -803,8 +798,8 @@ D: c3m5
|
|||
|
||||
S: GooseJelly
|
||||
N: Nathaniel Patasky
|
||||
E: n.patasky
|
||||
D: map26
|
||||
E: n.patasky@gmail.com
|
||||
D: buildcfg.txt, CREDITS, levels
|
||||
|
||||
S: Craneo
|
||||
E: memod_99@hotmail.com
|
||||
|
@ -864,8 +859,10 @@ N: Fabian Greffrath
|
|||
E: fabian@greffrath.com
|
||||
D: buildcfg.txt, graphics
|
||||
|
||||
S: HorroMovieGuy
|
||||
D: buildcfg.txt, lumps, manual, sounds, sprites
|
||||
S: Rei
|
||||
N: Reinaldo
|
||||
E: crumbscrunchydelights@gmail.com
|
||||
D: buildcfg.txt, lumps, manual, sounds, sprites, flats
|
||||
|
||||
N: Hugo Locurcio
|
||||
E: hugo.locurcio@hugo.pro
|
||||
|
@ -914,4 +911,41 @@ D: buildcfg.txt, BUILD-SYSTEM.adoc, levels, Makefile, README.adoc, scripts, spri
|
|||
N: Tyler True
|
||||
D: Makefile
|
||||
|
||||
S: BeachThunder
|
||||
D: levels
|
||||
|
||||
N: Clayton Sobrino
|
||||
E: ClaytonSobrino@yahoo.com
|
||||
D: patches
|
||||
|
||||
N: Colton G. Rushton
|
||||
E: colton51919@gmail.com
|
||||
D: lumps
|
||||
|
||||
S: drbugbait
|
||||
E: arlesschill@hotmail.com
|
||||
D: lumps
|
||||
|
||||
S: igdegoo
|
||||
D: COPYING.adoc, lumps, musics
|
||||
|
||||
S: inkoalawetrust
|
||||
D: levels
|
||||
|
||||
S: MissLav
|
||||
D: patches
|
||||
|
||||
S: unfa
|
||||
E: unfa00@gmail.com
|
||||
D: sounds
|
||||
|
||||
N: William Breathitt Gray
|
||||
E: vilhelm.gray@gmail.com
|
||||
D: dist
|
||||
|
||||
S: DOGB01
|
||||
D: levels
|
||||
|
||||
S: arborix
|
||||
|
||||
=======
|
||||
|
|
BIN
levels/dm02.wad
BIN
levels/dm02.wad
Binary file not shown.
BIN
levels/dm08.wad
BIN
levels/dm08.wad
Binary file not shown.
BIN
levels/dm20.wad
BIN
levels/dm20.wad
Binary file not shown.
BIN
levels/dm23.wad
BIN
levels/dm23.wad
Binary file not shown.
BIN
levels/dm25.wad
BIN
levels/dm25.wad
Binary file not shown.
BIN
levels/dm26.wad
BIN
levels/dm26.wad
Binary file not shown.
BIN
levels/e2m5.wad
BIN
levels/e2m5.wad
Binary file not shown.
BIN
levels/e2m7.wad
BIN
levels/e2m7.wad
Binary file not shown.
BIN
levels/e3m3.wad
BIN
levels/e3m3.wad
Binary file not shown.
BIN
levels/e4m1.wad
BIN
levels/e4m1.wad
Binary file not shown.
BIN
levels/e4m3.wad
BIN
levels/e4m3.wad
Binary file not shown.
BIN
levels/e4m4.wad
BIN
levels/e4m4.wad
Binary file not shown.
BIN
levels/e4m6.wad
BIN
levels/e4m6.wad
Binary file not shown.
BIN
levels/e4m7.wad
BIN
levels/e4m7.wad
Binary file not shown.
BIN
levels/e4m8.wad
BIN
levels/e4m8.wad
Binary file not shown.
BIN
levels/e4m9.wad
BIN
levels/e4m9.wad
Binary file not shown.
BIN
levels/map10.wad
BIN
levels/map10.wad
Binary file not shown.
BIN
levels/map14.wad
BIN
levels/map14.wad
Binary file not shown.
BIN
levels/map15.wad
BIN
levels/map15.wad
Binary file not shown.
BIN
levels/map17.wad
BIN
levels/map17.wad
Binary file not shown.
BIN
levels/map18.wad
BIN
levels/map18.wad
Binary file not shown.
BIN
levels/map20.wad
BIN
levels/map20.wad
Binary file not shown.
BIN
levels/map25.wad
BIN
levels/map25.wad
Binary file not shown.
|
@ -315,7 +315,7 @@ HUSTR_23 = MAP23: Underground Facility
|
|||
HUSTR_24 = MAP24: Tertiary Loading Bay
|
||||
HUSTR_25 = MAP25: Red Works
|
||||
HUSTR_26 = MAP26: Dark Depths
|
||||
HUSTR_27 = MAP27: Warped Elementality
|
||||
HUSTR_27 = MAP27: Palace of Red
|
||||
HUSTR_28 = MAP28: Grim Redoubt
|
||||
HUSTR_29 = MAP29: Last Stand
|
||||
HUSTR_30 = MAP30: Jaws of Defeat
|
||||
|
|
|
@ -3664,3 +3664,8 @@ LOGO5 64 128
|
|||
* LOGO5 0 0
|
||||
|
||||
#endif
|
||||
|
||||
; Single patch textures to resolve Medusa warnings / issues.
|
||||
|
||||
SAW2 72 128
|
||||
* SAW2 0 0
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue