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>
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>
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>
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>
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>
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>
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>
: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>
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>
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>
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>
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>
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>
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>
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.
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)
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