Commit Graph

256 Commits (master)

Author SHA1 Message Date
RjY a33af58634 buildcfg: use real sprites in FreeDM iwad
Remove the #ifdef FREEDM section that makes all monsters appear as a
black silhouette. This leaves sprites/{blank,nomonst}.gif unused.

I believe the plan is that FreeDM will become a vanilla-compatible IWAD
that the user can use with Chocolate Doom to play single player vanilla
maps, so real monsters are needed in it.

Signed-off-by: RjY <rjy@users.sourceforge.net>
2011-04-20 00:27:47 +01:00
RjY 97842f51dd buildcfg: remove some unnecessary #ifdef ULTDOOMs
With shareware gone, only Doom2 and Ultdoom remain, and in particular
there is no non-Ultdoom Doom1 target. Therefore #ifdef ULTDOOM sections
inside #ifndef DOOM2 sections are just extra clutter.

Signed-off-by: RjY <rjy@users.sourceforge.net>
2011-04-15 11:06:00 +01:00
RjY 3b22f6c1ef flats: buildcfg: remove many duplicate entries (Sodaholic)
This was a lot easier to do without having to worry about shareware!

Thanks to Sodaholic for reporting:
http://www.doomworld.com/vb/post/952575

Signed-off-by: RjY <rjy@users.sourceforge.net>
2011-04-10 12:07:30 +01:00
RjY 3d56b50b81 Sharewarendectomy
Consensus that the "shareware" target was no longer necessary was
reached long ago[1]. It just needs to actually get done. Thus:

Makefile:
- remove shareware targets

buildcfg.txt, textures/combined.txt:
- remove #ifdef/#ifndef SHAREWARE sections (almost entirely #ifndef)

graphics/help2.gif:
- remove symlink, help2 screen was shareware-only

gitignore:
- remove shareware files no longer built

textures/shareware:
- remove directory

--
[1] http://www.doomworld.com/vb/freedoom/52758-removing-shareware/ .

In particular, Jon wrote:
>The original purpose of the shareware IWAD was to have a smaller set of
>resources to target 100% completion of. That was probably met a long
>time ago.

More recently chungy wrote in <http://www.doomworld.com/vb/post/957707>
>Removing the "demo"/"shareware" version of Freedoom has been discussed
>but it's never been done. Actually it's a bit easier to just leave it
>in than to remove it. (It'd be pretty easy to get rid of it anyway, but
>nothing is really gained from it)

Signed-off-by: RjY <rjy@users.sourceforge.net>
2011-04-10 11:22:48 +01:00
RjY 95d9c8c092 buildcfg: remove a huge block of dead code
Signed-off-by: RjY <rjy@users.sourceforge.net>
2011-04-10 10:36:46 +01:00
RjY 3946032cb8 sprites: move the berserk box up out of the floor (Catoptromancy)
Signed-off-by: RjY <rjy@users.sourceforge.net>
2011-04-09 17:30:17 +01: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
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
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
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
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
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
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
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 c8cd1bcd45 lumps: New demo1, 2, and 3 lmps for both Doom 2 and Ultimate Doom
Signed-off-by: Mike Swanson <mikeonthecomputer@gmail.com>
2009-07-28 12:33:00 -07:00
Mike Swanson 71a94f60fa buildcfg: put a Cyberdemon sound into the doom.wad target
Way back when Freedoom only had shareware and Doom II targets, the
Cyberdemon was naturally restricted to Doom II only; now that we have
added an Ultimate Doom target, we should add Cyberdemon resources to
that as well so the game doesn't crash!  :-)

Signed-off-by: Mike Swanson <mikeonthecomputer@gmail.com>
2009-07-19 21:57:35 -07:00
Simon Howard af90fbcaca sprites: Add death frames for lost soul.
Explosion animation is derived from the barrel explosion animation
(bexp*).  The lost soul pain frame (skule) is currently identical
to one of the normal/attack frames (skuld).

Signed-off-by: Simon Howard <fraggle@gmail.com>
Signed-off-by: Mike Swanson <mikeonthecomputer@gmail.com>
2009-07-12 14:07:55 -07:00
Catoptromancy 58cfebe70f patches: rename dogpanl to doglpanl
Signed-off-by: Mike Swanson <mikeonthecomputer@gmail.com>
2009-06-27 19:59:35 -07:00
Catoptromancy 4933e1a068 patches: more fixes and a new buildcfg.txt
Signed-off-by: Mike Swanson <mikeonthecomputer@gmail.com>
2009-06-27 02:51:15 -07:00
Mike Swanson 1c34d4c32b titlepic: Make the ultimate target have its own title
Right now it's called "Ultimate Freedoom"; a more original name should
be given later down the line.

Signed-off-by: Mike Swanson <mikeonthecomputer@gmail.com>
2009-06-23 19:59:46 -07:00
RjY 031894bef9 buildcfg.txt: add E2M4 intermission screen title
Signed-off-by: RjY <rjy@users.sourceforge.net>
Signed-off-by: Mike Swanson <mikeonthecomputer@gmail.com>
2009-06-16 01:53:11 -07:00
Catoptromancy 2671ebd387 buildcfg.txt: fix boom 2.02 compatibility
Signed-off-by: Mike Swanson <mikeonthecomputer@gmail.com>
2009-05-29 16:13:31 -07:00
Catoptromancy 55a4a5f594 patches: delete camo[23], add brick1, brown2, mosrok2
Enhancing plutonia support some more.

Signed-off-by: Mike Swanson <mikeonthecomputer@gmail.com>
2009-01-05 03:27:02 -08:00
Catoptromancy ce2dd94b84 patches: Add many patches for Plutonia support
Signed-off-by: Mike Swanson <mikeonthecomputer@gmail.com>
2009-01-02 20:20:25 -08:00
Mike Swanson 43947f1886 buildcfg: Separate demos to specific IWAD targets
The same demos won't work across IWADs; the previous commit completely
locked up Boom when using doom.wad.  Now there will be independent demos
for each IWAD.

Signed-off-by: Mike Swanson <mikeonthecomputer@gmail.com>
2008-12-30 17:08:59 -08:00
Simon Howard a1511aac95 Change build to use simplecpp for preprocessing, as this does not munge
up the configuration file.
2008-12-22 19:01:21 +00:00
RjY 52f2f5cf5e Include doom pnames in buildcfg.txt when ULTDOOM is defined
Signed-off-by: Mike Swanson <mikeonthecomputer@gmail.com>
2008-12-21 16:41:24 -08:00
Mike Swanson 3b82923718 Add copyrights, remove latest/ directory
Adding copyright notices to critical files; some files which the project
is not strictly dependent on, such as tools/cleanroom, are not tagged;
many of these were meant for temporary use in assisting the development
of Freedoom and their existence should probably be questioned.

latest/ directory is removed since it's not critical to building the
project, its use was for pre-sourceforge daily builds.  Such a frequent
building system may still be sought after, but this doesn't need to be
in the repo ;)

Signed-off-by: Mike Swanson <mikeonthecomputer@gmail.com>
2008-12-17 19:00:48 -08:00
Simon Howard be0cd445a2 Add code to generate a GENMIDI lump using the register values from the OpenBSD OPL driver. 2007-12-28 20:33:22 +00:00
Simon Howard 73f66bddeb Remove DMXGUS and GENMIDI lumps, as these are derived from the Doom lumps. 2007-12-28 02:56:12 +00:00
Jon Dowland 8b5e82954b a new sucker wants to do a level ;)
add some missing skel angles
remove scuba's demon (old)
fix rev -> imp mapping. Although it's only half-fixed and it looks like the
revenant is doing the moon-walk sometimes.
2006-08-29 19:07:10 +00:00
Jon Dowland 7224bfe275 add missing bos2 frames
map last 3 skul death frames to rocket explosion
adjust bos2 death frame offsets
2006-08-29 14:42:38 +00:00
Jon Dowland a22b2ad5eb map hellknight to the baron placeholder 2006-08-29 14:21:17 +00:00
Jon Dowland 9b2487fa83 Fredrik's new plasma gun 2006-08-29 14:02:31 +00:00
Jon Dowland 2d5fe7949f adjust cyber sprite offsets 2006-08-29 13:57:15 +00:00
Jon Dowland e135454b7c fix spider mastermind frame offsets 2006-08-29 10:25:05 +00:00
Jon Dowland aaae76b3d8 * re-add linguica's AOD skeleton sprites (well, the SARG* ones)
* map most of the vile frames to this AOD skeleton (missing: pain, 
resurrection)
Still to do: superimpose the "not done" rectangle
2006-08-28 14:40:38 +00:00
Jon Dowland af43d84b2c a few more tweaks for revenant rocket remapping: change which caco
projectile frame we use, map the explosion frames too (these were
mislabelled as the mancubus projectile explosion frames -- it seems
the mancubus just uses normal rocket explosion frames)
2006-08-25 12:34:14 +00:00
Jon Dowland 1941c69e25 * add missing revenant death frames
* map revenant sprite (not done yet) to a mixture of the imp
  and caco fireballs (alternating, arcade-game style)
2006-08-24 22:44:04 +00:00
Jon Dowland c30189d3d9 add some missing BOS2 definitions 2006-08-21 23:02:55 +00:00
Jon Dowland afac99005a add lokito's baron sprite
adjust freedoom_graphics.wad so lumps are added (e.g. colormaps)
2006-08-21 10:24:55 +00:00
Jon Dowland f63480b4a5 new imp sprites from gargylol, but map them to the revenant
(some frames missing so IWADs broken until that is fixed)
2006-08-21 09:45:58 +00:00
Jon Dowland 724372b1b1 updated barrel sprite placement 2006-08-16 21:42:38 +00:00
Jon Dowland 356b55abc0 add fredrik's WIP demon 2006-08-15 22:01:36 +00:00
Jon Dowland 929490f6b4 fredrik's chaingun 2006-08-15 21:43:50 +00:00
Jon Dowland a8d3a42f30 new sounds from gargoylol: dsbarexp, dspistol, dsrlaunc
new shotgun sprite from gargoylol
new ssg from fredrik
new rocket launcher from fredrik
2006-06-25 22:03:32 +00:00
Simon Howard 926c4f5c29 Include the right patch list when building freedm.wad. 2006-06-16 17:11:05 +00:00
Jon Dowland 5e2593f7df move towards using system CPP
buildcfg.txt: rework OR relationship to be CPP-compliant
	remove tools/simplecpp
	Makefile: CPP=/usr/bin/cpp
stop redundant rebuilds
	remove all from PHONY in lumps/cph/misc-lumps/Makefile
clean up build output
	add a newline to lumps/cph/misc-lumps/colormap.pl
add a clean target, to:
	./Makefile
	./lumps/Makefile
	./lumps/cph/misc-lumps/Makefile
2006-06-12 20:36:32 +00:00
Simon Howard fb99d84061 Draw black silhouettes for monsters in FreeDM. Gives a target to shoot
at on the few deathmatch levels that have monsters in.
2006-06-08 19:48:13 +00:00
Simon Howard 868ab15f43 Generate different titlepics for freedoom and freedm. 2006-06-04 15:33:28 +00:00
Simon Howard 585765b393 Fix problems with FBXP sprite in FreeDM. 2006-06-04 02:54:58 +00:00
Simon Howard aa5f1342ed Add FreeDM levels and freedm.wad IWAD build. 2006-06-03 23:18:12 +00:00
Simon Howard f6fee01cf8 Remove BLOOD4 from WAD build (blood textures go from BLOOD1-BLOOD3) 2006-05-13 15:20:43 +00:00
Simon Howard 36658bee0e Import other stuff. 2006-05-09 16:20:42 +00:00