Commit graph

722 commits

Author SHA1 Message Date
Sodaholic
a3ade8ac6a sprites: new pool of blood from Sodaholic
http://www.doomworld.com/vb/post/959343

Signed-off-by: RjY <rjy@users.sourceforge.net>
2011-04-09 15:57:26 +01:00
Wesley D. Johnson
96c50846e7 levels: map13 revision 2.2 (Feb 6, 2011)
Signed-off-by: RjY <rjy@users.sourceforge.net>
2011-04-09 15:56:26 +01:00
RjY
532e0d9fec levels: e2m8 fixes
delete sidedefless lines 781, 791
  these can potentially crash the game although they were in the void

allow door out of first room to open
  set linedefs 21, 61 to type 1 manual door
  set passuse on line 131 for completeness' sake

fix secret area entrance
  sector 93 and linedef 394 have tag 12
  remove special from linedef 457 (not needed)

fix lift up to red key (sector 115)
  set tag 13, also linedefs 559, 562

fix lifts in penultimate area, after red key teleporter
  sector 132 and linedefs 666, 680 have tag 14
  sector 133 and linedefs 623, 661 have tag 15

change hanging body (thing 73) to non-blocking version

fix secret area count
  mark sector 94 as a proper secret for which you get credit

remove spurious tag 7 from sectors 127-129

cosmetic fixes
  stop secret area entrance tracks descending with floor
    clear lower unpegged flag on linedefs 456, 458
  fix alignment of wall behind lift up to red key (linedef 562)
  prevent walls under crushers in final area from moving with ceiling
    set lower unpegging flag on linedefs 747, 752, 754
  fix various misaligned STONE2 ugliness in final room

Signed-off-by: RjY <rjy@users.sourceforge.net>
2011-03-09 08:37:57 +00:00
Archfile
3882071e3b levels: new E2M8 from Archfile
Signed-off-by: RjY <rjy@users.sourceforge.net>
2011-03-09 08:37:56 +00:00
RjY
20a0c53f0f textures: fix Doom1 skies
This patch fixes a long-standing bug where the first three Doom1 sky
textures used the Doom2 sky patches, giving them the wrong appearance.

Signed-off-by: RjY <rjy@users.sourceforge.net>
Signed-off-by: Mike Swanson <mikeonthecomputer@gmail.com>
2011-03-06 16:02:05 -08:00
RjY
ffd4554e96 CREDITS: add Archfile
Signed-off-by: RjY <rjy@users.sourceforge.net>
Signed-off-by: Mike Swanson <mikeonthecomputer@gmail.com>
2011-02-24 12:56:43 -08:00
RjY
6cf4b620cc levels: e3m6: fixes
solid hanging corpses made non-blocking

- 27 and 28 blocked a player attempting to hurl himself off
  the red key platform.
- 152 was an irritatingly invisible blockage in the final corridor.
  Unfortunately Freedoom's version of this sprite is a lot smaller
  than Doom's.
- 68 and 119 are mostly cosmetic, but fix them anyway.

fake manual zdoomisms fixed

- linedefs 492, 493: the drawbridge already has a tag 5, set its sides
  to have the same tag.
- give linedef 194 and sector 10 tag 14 so the red key platform sinks
  into the lava correctly.
- give linedefs 116 and 118 and sector 11 tag 15, so you can get out
  of the lava after said platform has sunk.

incorrect door track pegging fixed (linedefs 817, 819)

Signed-off-by: RjY <rjy@users.sourceforge.net>
Signed-off-by: Mike Swanson <mikeonthecomputer@gmail.com>
2011-02-24 12:56:43 -08:00
Archfile
efcef266c2 levels: new e3m6 from Archfile
Signed-off-by: RjY <rjy@users.sourceforge.net>
Signed-off-by: Mike Swanson <mikeonthecomputer@gmail.com>
2011-02-24 12:55:25 -08:00
Catoptromancy
4c50ee4dae levels: map24 update, reset symlink
Catoptromancy writes in <http://www.doomworld.com/vb/post/949221>:
>This should be updated to map24 [...] The current 0.7 map24 is actually
>a brand new udoom map I swapped in since mine was far from finished.

Reset map24 symlink back to catoptromancy/map24.wad
(Partially reverts 0c4144eba0)

Signed-off-by: RjY <rjy@users.sourceforge.net>
Signed-off-by: Mike Swanson <mikeonthecomputer@gmail.com>
2011-02-24 12:34:45 -08:00
RjY
321df13b43 Revert "levels: remove map19, many errors with boom"
Catoptromancy writes in <http://www.doomworld.com/vb/post/949221>
> Also map19 from dabski needs relinked, was removed for release due to
> error and not finished.

This reverts commit 3b76d63ecd.

Signed-off-by: RjY <rjy@users.sourceforge.net>
CC: Catoptromancy <catoptromancy@yahoo.com>
Signed-off-by: Mike Swanson <mikeonthecomputer@gmail.com>
2011-02-24 12:34:37 -08:00
Wesley D. Johnson
b059313cb7 levels: map09 revision 7 (Feb 3, 2011)
Signed-off-by: RjY <rjy@users.sourceforge.net>
CC: Catoptromancy <catoptromancy@yahoo.com>
Signed-off-by: Mike Swanson <mikeonthecomputer@gmail.com>
2011-02-24 12:34:34 -08:00
RjY
f34ba7c7c2 map02: use floor light transfer under exit sign (BondEar)
In map02 (siggi/hawl.wad) the exit sign is lit up, but the ground
beneath it is kept dark by using vanilla shadowcasting effects.

BondEar reported evidence of slime trails around the exit sign[1]. I
couldn't verify this, but nevertheless here is an attempt to fix it.

Uses linedef 254 as the control linedef rather than creating a whole
new control sector, to avoid an unnecessary node rebuild which would
break Catoptromancy's demo pack :-)

[1] http://www.doomworld.com/vb/post/940478

Signed-off-by: RjY <rjy@users.sourceforge.net>
Signed-off-by: Mike Swanson <mikeonthecomputer@gmail.com>
2011-02-11 16:36:15 -08:00
Mike Swanson
654df3f84e Update ChangeLog to include post-rc1 changes
Signed-off-by: Mike Swanson <mikeonthecomputer@gmail.com>
2011-01-22 02:31:49 -08:00
Mike Swanson
8befccd3ac Bump version to v0.7 for release
Signed-off-by: Mike Swanson <mikeonthecomputer@gmail.com>
2011-01-22 02:15:55 -08:00
RjY
10d5543a37 buildcfg: include correct demos for each iwad
It's a bit hard to see given the flat format of buildcfg.txt but we need
to do this:

if doom2
  include demo{1,2,3}_d2
else
  include demo1_ud // both shareware and ultdoom
  if ultdoom
    include demo{2,3,4}_ud
  endif
endif

The previous code had doom2 and ultdoom separately and always included
an unsourced demo2 and demo3, which was breaking the ultdoom IWAD.

Signed-off-by: RjY <rjy@users.sourceforge.net>
Signed-off-by: Mike Swanson <mikeonthecomputer@gmail.com>
2011-01-22 00:57:40 -08:00
RjY
9c51d114d8 levels: fix missing texture on map09
Boom only recognises texture names as colormaps names on certain line
specials (e.g. 242, deep water) If a colormap name is used on any other
kind of special (or non-special) line the name is interpreted as a
texture as normal, and Boom202 cannot cope with unknown textures.

Thus, remove the lower texture MFADEMAP from linedef 2328 of map09.

Signed-off-by: RjY <rjy@users.sourceforge.net>
Signed-off-by: Mike Swanson <mikeonthecomputer@gmail.com>
2011-01-22 00:36:44 -08:00
Catoptromancy
7aa69f793b lumps: Recorded new demos
Signed-off-by: Mike Swanson <mikeonthecomputer@gmail.com>
2011-01-21 23:11:46 -08:00
Mike Swanson
0c4144eba0 levels: updated map09, new e4m2 from GhostlyDeath, replaced map24
Just some long pending changes.

Signed-off-by: Mike Swanson <mikeonthecomputer@gmail.com>
2011-01-21 22:17:42 -08:00
Mike Swanson
5640b81aa6 COPYING: add 2010 to the years
Nearly 2011 already and it has been updated!

Signed-off-by: Mike Swanson <mikeonthecomputer@gmail.com>
2010-12-07 19:13:49 -08:00
Matthew Cibulas
23d06d7066 sounds: new dspo*, dspunch, dsslop
In particular: dspodth1, dspodth2, dspodth3, dspopain,
dsposact, dsposit1, dsposit2, dsposit3, dspunch, dsslop.

Thanks to RottKing, especially for his patience!

[ RjY: I've left behind the original dsslop as it is
  still used as the demon (worm) death sound - if the
  new one should be used for both, please update ]

Signed-off-by: RjY <rjy@users.sourceforge.net>
Signed-off-by: Mike Swanson <mikeonthecomputer@gmail.com>
2010-12-03 22:33:30 -08:00
Simon Howard
d6907ea974 build: Update Python scripts to work with Python 3.
Python 3 makes a number of changes to the language and breaks backward
compatibility with Python 2 in some places.  This change updates the
Python scripts used in the build system to work with Python 3,
although the updated scripts still run in Python 2 as well.  Most of
the changes are minor; the biggest changes are to the palette /
colormap generation scripts.

Signed-off-by: Simon Howard <fraggle@gmail.com>
2010-11-09 23:11:11 +00:00
Mike Swanson
8bad55ffef sounds: convert fdoof.wav to proper format
Signed-off-by: Mike Swanson <mikeonthecomputer@gmail.com>
2010-11-03 20:52:00 -07:00
Matthew Cibulas
cc01c1abb5 sounds: change oof and death sounds
Signed-off-by: Mike Swanson <mikeonthecomputer@gmail.com>
2010-11-03 20:39:12 -07:00
Andrew Rehberger
aefd60b41b levels: new e2m2 map
Signed-off-by: Mike Swanson <mikeonthecomputer@gmail.com>
2010-10-31 14:31:42 -07:00
Catoptromancy
f80dd18cb5 levels: fixed map21 and map22
Signed-off-by: Mike Swanson <mikeonthecomputer@gmail.com>
2010-10-17 19:07:07 -07:00
Mike Swanson
a2005a3b80 levels: forgot to ZenNode the previous commit
Signed-off-by: Mike Swanson <mikeonthecomputer@gmail.com>
2010-10-16 19:32:56 -07:00
Catoptromancy
2b17a91faf levels: map11 and map20 fixes
Signed-off-by: Mike Swanson <mikeonthecomputer@gmail.com>
2010-10-16 19:32:15 -07:00
Catoptromancy
283f2138a6 levels: fixes to map04 and map06
Signed-off-by: Mike Swanson <mikeonthecomputer@gmail.com>
2010-10-11 21:24:26 -07:00
Miguel Suarez Gomez
6ef9aacaab levels: map15 and map28 updates
Signed-off-by: Mike Swanson <mikeonthecomputer@gmail.com>
2010-10-11 20:46:55 -07:00
Catoptromancy
d6ac28c3b9 patches: fix mc* textures
Full consistency for Doom II levels, Final Doom compatibility but
some visual inconsistencies for Final Doom PWADs (eg, Plutonia 2).

Signed-off-by: Mike Swanson <mikeonthecomputer@gmail.com>
2010-09-27 18:57:33 -07:00
Catoptromancy
931b8ba84f map29: more health and ammo
Signed-off-by: Mike Swanson <mikeonthecomputer@gmail.com>
2010-09-26 13:21:17 -07:00
Mike Swanson
5258a5f184 buildcfg.txt: Make M_EPISOD appear in doom2.wad
The texture appears in id's Doom II and fixes issues with ZDoom.

Signed-off-by: Mike Swanson <mikeonthecomputer@gmail.com>
2010-09-23 18:00:17 -07:00
Catoptromancy
4b56bf3010 levels: fix various issues in maps
Signed-off-by: Mike Swanson <mikeonthecomputer@gmail.com>
2010-09-22 23:38:10 -07:00
Catoptromancy
116075b2bb fixed texture1, thanks hawkwind
Signed-off-by: Mike Swanson <mikeonthecomputer@gmail.com>
2010-09-22 19:07:04 -07:00
Mike Swanson
c88f4b9a77 Change example commit in README and fix formatting in asciidoc.
The commit referenced was from prior to the history-rewrite and
no longer was a real commit in the repository.

Also, asciidoc had some formatting error in the "Submitting your
work" section where a large chungy of text was being rendered as
monospace in the HTML version.  To fix this, "git commit -s" is
surrounded by +s rather than `s.

Signed-off-by: Mike Swanson <mikeonthecomputer@gmail.com>
2010-09-17 02:19:13 -07:00
Catoptromancy
ff1c9a0d89 levels: Updated map27
Adjusted Things.

Signed-off-by: Mike Swanson <mikeonthecomputer@gmail.com>
2010-09-16 12:47:18 -07:00
Mike Swanson
767fbc75c4 Update NEWS and ChangeLog
Signed-off-by: Mike Swanson <mikeonthecomputer@gmail.com>
2010-09-15 22:20:57 -07:00
Mike Swanson
c982612a27 Tag v0.7-rc1 and add lumps/freedm.lmp to .gitignore
Signed-off-by: Mike Swanson <mikeonthecomputer@gmail.com>
2010-09-15 22:00:31 -07:00
Mike Swanson
71e8fd0390 FreeDM: add a FREEDM lump for source port detection
Signed-off-by: Mike Swanson <mikeonthecomputer@gmail.com>
2010-09-15 13:55:03 -07:00
Ulises "Urric Hammersong" Lozano
88f258d181 sprites: new cyberdemon
Boss monster "Devourer" by Ulises Lozano, A.K.A. "Urric Hammersong",
made in Mexico.

Modifications made:
- Catoptromancy:
  - sprites renamed to fit cyberdemon
- RjY:
  - convert to .gif with doom palette
  - updated symlinks and buildcfg.txt

Signed-off-by: RjY <rjy@users.sourceforge.net>
Signed-off-by: Mike Swanson <mikeonthecomputer@gmail.com>
2010-09-13 00:38:11 -07:00
Catoptromancy
13c6a4b2bf levels: updated map24
<Catoptromancy> its had tons of work since last one

Signed-off-by: Mike Swanson <mikeonthecomputer@gmail.com>
2010-09-08 21:52:02 -07:00
Wesley D. Johnson
b1ec7162b9 sprites: new spider demon
:Name: Spider Demon design
:author: Wesley Johnson
📅 4/2/2010
::END
email: john <obfuscate> son 2412 <@> usgo <dot> net

Spider Demon complete Sprite set.
  Custom designed spider demon for FreeDoom, to match other existing
  FreeDoom sprites.
  This has a unique set of sprites, so cannot use old wadinfo.txt.

Contains files:
    spid.txt		this file
    /sprites  		directory of all ppm files
    wadinfo.txt 	deutex wadinfo, for only the spid sprites

- Description:
  Spider demon with 8 mech. legs, 4 arms, machine gun.

[ RjY: graphics converted to gif with cyan background, symlinks added,
  wadinfo.txt appended to spid.txt which can be found in sprites/wesley/
  Note: every frame is separate - could maybe use optimization? ]

Signed-off-by: RjY <rjy@users.sourceforge.net>
Signed-off-by: Mike Swanson <mikeonthecomputer@gmail.com>
2010-09-08 19:52:05 -07:00
Jon Dowland
49dc6ca861 use Over as compose argument for dummy sprites
'Over' is an equivalent option to 'src-over' for composite, introduced
at some point before Imagemagick 6.x.

The 'graphicsmagick' fork of Imagemagick provides a (supposedly)
compatible imagemagick interface, but lacks the (older) 'src-over'
composite type.

Using 'Over' means you can build with imagemagick or graphicsmagick.

Signed-off-by: Mike Swanson <mikeonthecomputer@gmail.com>
2010-09-03 18:55:24 -07:00
Mike Swanson
3b76d63ecd levels: remove map19, many errors with boom
Not actually removed, but the built IWAD will have a dummy level
in its place.

Signed-off-by: Mike Swanson <mikeonthecomputer@gmail.com>
2010-09-03 18:13:31 -07:00
Catoptromancy
63089203de levels: update map12
Signed-off-by: Mike Swanson <mikeonthecomputer@gmail.com>
2010-09-03 18:13:10 -07:00
Miguel Suarez Gomez
9baa9e56bb levels: map15 and map28 updates
Signed-off-by: Mike Swanson <mikeonthecomputer@gmail.com>
2010-08-31 23:30:00 -07:00
Miguel Suarez Gomez
7303564a54 levels: map28 update
Signed-off-by: Mike Swanson <mikeonthecomputer@gmail.com>
2010-07-04 22:10:22 -07:00
Blackjar72
7e19102571 music: add a new d_victor song
The only author info we have so far is Blackjar72.

Signed-off-by: Mike Swanson <mikeonthecomputer@gmail.com>
2010-07-02 21:11:20 -07:00
Wesley D. Johnson
7b6f02fd03 levels: new map13 build
Signed-off-by: Mike Swanson <mikeonthecomputer@gmail.com>
2010-06-23 09:54:04 -07:00
Miguel Suarez Gomez
ac7f2bcc97 levels: new map28 build
Signed-off-by: Mike Swanson <mikeonthecomputer@gmail.com>
2010-06-22 00:18:14 -07:00