archives/freedoom
2
0
Fork 0
mirror of https://github.com/freedoom/freedoom.git synced 2025-09-02 07:25:45 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions
791 commits 14 branches 23 tags 178 MiB
Commit graph

791 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Catoptromancy
aad4e0ed3d levels: New map13 by wesley 
Signed-off-by: Catoptromancy <catoptromancy@yahoo.com>
Signed-off-by: Mike Swanson <mikeonthecomputer@gmail.com>
 2009-08-23 16:03:39 -07:00
Catoptromancy
c574efde44 status: music status updated 
Signed-off-by: Catoptromancy <catoptromancy@yahoo.com>
Signed-off-by: Mike Swanson <mikeonthecomputer@gmail.com>
 2009-08-22 13:37:46 -07:00
Catoptromancy
73b2004b13 status: more updated status pages 
Signed-off-by: Catoptromancy <catoptromancy@yahoo.com>
Signed-off-by: Mike Swanson <mikeonthecomputer@gmail.com>
 2009-08-20 20:55:35 -07:00
Catoptromancy
2b31006c7e levels: updated e2m4 
Used zennode, a few glitches fixed.

Signed-off-by: Catoptromancy <catoptromancy@yahoo.com>
Signed-off-by: Mike Swanson <mikeonthecomputer@gmail.com>
 2009-08-16 12:23:24 -07:00
Catoptromancy
7410953c5e sprites: new archvile placeholder 
Just the skeleton recolored.

Signed-off-by: Catoptromancy <catoptromancy@yahoo.com>
Signed-off-by: Mike Swanson <mikeonthecomputer@gmail.com>
 2009-08-12 17:29:51 -07:00
Catoptromancy
cc18d28714 status: updated status lists 
Signed-off-by: Catoptromancy <catoptromancy@yahoo.com>
Signed-off-by: Mike Swanson <mikeonthecomputer@gmail.com>
 2009-08-12 16:04:06 -07:00
Catoptromancy
267aef5a03 sprites: scaled SSG larger 
Scaled SSG larger and longer.

Signed-off-by: Catoptromancy <catoptromancy@yahoo.com>
Signed-off-by: Mike Swanson <mikeonthecomputer@gmail.com>
 2009-08-11 18:13:53 -07:00
Catoptromancy
18c1d9d24b textures: Sorted scripts, fixed missing textures 
E4M1 was using textures not in wad due to line
in combined.txt pointing wrong place

Signed-off-by: Mike Swanson <mikeonthecomputer@gmail.com>
 2009-08-05 15:50:48 -07:00
Catoptromancy
d0a832c6a4 graphics: UFD endpics 
Added placeholder endpics for E2,E3 and E4. Keeps boom202 from crashing.

Signed-off-by: Mike Swanson <mikeonthecomputer@gmail.com>
 2009-08-05 14:59:11 -07:00
Catoptromancy
9f560d54fa Fixed music in UFD for boom202 
Fixed 3 more musics that were 0 channel that crashed boom202.

Signed-off-by: Catoptromancy <catoptromancy@yahoo.com>
Signed-off-by: Mike Swanson <mikeonthecomputer@gmail.com>
 2009-08-05 13:41:30 -07:00
Catoptromancy
416cd6ebfc UltFreedoom music is boom202-compatible now 
ln'ed a bunch of music to dummy spots. Boom202 hated the dummy mus files.

Signed-off-by: Mike Swanson <mikeonthecomputer@gmail.com>
 2009-07-30 23:29:21 -07:00
Mike Swanson
bb1a621e8d Makefile: add doc target to make pretty HTML-ized versions of documents 
Not adding to the all target of the Makefile (which is the default when
make is invoked without parameters) as it would introduce an artificial
build dependency on asciidoc; instead, "make doc" is to be used when you
know you both want the *.html files and have asciidoc installed.

Signed-off-by: Mike Swanson <mikeonthecomputer@gmail.com>
 2009-07-30 15:05:56 -07:00
Catoptromancy
678cbd334a levels: Updated E2M4 
Now with much less HOM, and a should be 99% finished.

Signed-off-by: Mike Swanson <mikeonthecomputer@gmail.com>
 2009-07-29 04:05:18 -07:00
Catoptromancy
6f3f4a2aa6 Fixed music in boom202 
Signed-off-by: Mike Swanson <mikeonthecomputer@gmail.com>
 2009-07-29 03:32:16 -07:00
Svante Ekholm
94b3b6a719 levels: updated map10 
Signed-off-by: Mike Swanson <mikeonthecomputer@gmail.com>
 2009-07-28 18:21:48 -07:00