Commit graph

606 commits

Author SHA1 Message Date
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
Mike Swanson
630a0e33cc remove a backup file that got included by mistake
Signed-off-by: Mike Swanson <mikeonthecomputer@gmail.com>
2010-03-23 08:55:52 -07:00
Catoptromancy
7021f0037e patches: FreeDM a few small patches from Ralphis
Signed-off-by: Catoptromancy <catoptromancy@yahoo.com>
Signed-off-by: Mike Swanson <mikeonthecomputer@gmail.com>
2010-03-23 08:52:03 -07:00
Wesley D. Johnson
7e2ea488c9 levels: updated map09 and map13
Signed-off-by: Mike Swanson <mikeonthecomputer@gmail.com>
2010-03-20 17:53:42 -07:00
RjY
25c4d1499b sprites: remove unused hellknight frame BOS2C2C8
Signed-off-by: RjY <rjy@users.sourceforge.net>
Signed-off-by: Mike Swanson <mikeonthecomputer@gmail.com>
2010-03-20 17:40:45 -07:00
RjY
ed8d2f4c26 sprites: fix hellknight rotation frames
A few of the hellknight's frames were being mirrored the wrong way.

Thanks to Wesley Johnson for the report:
http://www.doomworld.com/vb/freedoom/49402-hell-knight-bug/

Signed-off-by: RjY <rjy@users.sourceforge.net>
Signed-off-by: Mike Swanson <mikeonthecomputer@gmail.com>
2010-03-20 17:40:45 -07:00
Mike Swanson
2e2eecd2a1 levels: fix map09 symlink
Signed-off-by: Mike Swanson <mikeonthecomputer@gmail.com>
2010-01-02 13:14:52 -08:00
Mike Swanson
e56bcb2a3b levels: remove MAP32, it will be built with the dummy level instead
Huge freaking ripoff of Doom's E1M3.

Signed-off-by: Mike Swanson <mikeonthecomputer@gmail.com>
2010-01-02 13:14:24 -08:00
Catoptromancy
6845ef692e levels: New map09 by Wesley
Signed-off-by: Catoptromancy <catoptromancy@yahoo.com>
Signed-off-by: Mike Swanson <mikeonthecomputer@gmail.com>
2009-11-18 12:52:16 -08:00
Catoptromancy
b4dd4c68c7 musics: The rest of Jute's music
Signed-off-by: Simon Howard <fraggle@gmail.com>
2009-10-16 22:37:28 +01:00
Catoptromancy
4ec97f98b0 musics: wastedjamacan music and more links
Linked more of jute's music and new music from wastedjamacan

Signed-off-by: Mike Swanson <mikeonthecomputer@gmail.com>
2009-10-15 15:37:03 -07:00
Catoptromancy
0001be3fe9 levels: updated wesley map13
Signed-off-by: Catoptromancy <catoptromancy@yahoo.com>
Signed-off-by: Mike Swanson <mikeonthecomputer@gmail.com>
2009-10-14 20:38:53 -07:00
Catoptromancy
c5f32ad259 musics: Music by jute
Signed-off-by: Catoptromancy <catoptromancy@yahoo.com>
Signed-off-by: Simon Howard <fraggle@gmail.com>
2009-10-12 01:25:59 +01:00
Mike Swanson
ed41c6f7fc doc/graphics: Change to shorter URL.
There's real work to be done, but this URL is shorter!

Signed-off-by: Mike Swanson <mikeonthecomputer@gmail.com>
2009-10-06 18:33:57 -07:00
Catoptromancy
bf8a22d83d levels: finished map13 by Wesley
Signed-off-by: Mike Swanson <mikeonthecomputer@gmail.com>
2009-09-30 22:30:33 -07:00
Catoptromancy
2a5753e9fa musics: lots of music by Jute
Signed-off-by: Mike Swanson <mikeonthecomputer@gmail.com>
2009-09-30 22:29:05 -07:00
cato
bcc26d260c levels: Updated map13 by Wesley
Signed-off-by: Mike Swanson <mikeonthecomputer@gmail.com>
2009-09-13 19:55:36 -07:00