200 Commits

Author SHA1 Message Date
Brett Harrell
168f6e8bcc graphics: updated statusbar numbers
Rounded shapes that are easier to read at a glance, more in common
with how the digits are normally hand-written.
2015-12-08 17:36:19 -08:00
Mike Swanson
b931bcfbc7 titlepic: don't apply dithering 2015-12-05 06:48:35 -08:00
Mike Swanson
b546df38eb titlepic: move subtitle text towards the bottom 2015-12-05 06:38:25 -08:00
Blastfrog
2a0586744a graphics: new menu skulls, based on a wall texture by raymoohawk 2015-12-05 06:22:21 -08:00
Kracov Bolkonski
ffc7e87534 graphics: new titlepic 2015-12-05 06:22:13 -08:00
RjY
d3a78b5133 titlepic/create_caption: try alternative fonts
Do not FTBFS if the user does not have ghostscript / gsfonts installed.
Instead try some other fonts commonly installed by Linux distributions.

The patch is written to be easily extendable with extra font names, but
to be independent of the order of "convert -list font" output. Each
listed font is searched for in turn, and the first one found is used.
2015-12-04 17:52:39 +00:00
Nick Zatkovich
9bc5779087 Status bar numbers revert
Reverted to old numbering
2015-12-03 15:41:15 -08:00
Sodaholic
01a9ba7c83 graphics: add a new status bar style
This was originally created by Da Werecat, but changed around to fit
the Freedoom theme better, and be internally consistent with the font
by Mechadon.

resolves #45
2015-06-18 06:46:27 -07:00
Simon Howard
f1c35d17e3 dist: Add icon version of FreeDM logo.
Rework CaptainW's FreeDM logo so that the "Free" and "DM" portions
are arranged vertically rather than horizontally. Update the dist/
directory to generate the installed FreeDM icon by scaling down
this image.
2014-11-02 20:07:40 -05:00
Mike Swanson
90fd6b1686 Cleanup __pycache__ directories with "make clean" 2014-10-29 00:37:42 -07:00
Simon Howard
02bd566362 Update other scripts to support Python 3 build.
A couple of scripts were not Python 3 compatible. Update smtextgen to
use print() instead of bare print, and update the texture build script
to use the correct binary mode for writing binary files.
2014-10-28 03:55:43 +00:00
Jon Dowland
45908da295 Adjust IDENTIFY_OUTPUT_RE for graphicsmagick
The 'identify' binary supplied in graphicsmagick-imagemagick-compat outputs
lines of the form

     fontchars/font033.gif GIF 9x16+0+0 PseudoClass 32c 8-bit 194 0.000u 0:01

However the IDENTIFY_OUTPUT_RE regex was written against an output which lacked
the +0+0 suffix to the dimensions. This patch adjusts accordingly.
2014-10-13 22:36:06 +01:00
Mike Swanson
7356fe4dfa Use Voltcom9's suggestions for chapter titles in Phase 1
Also more consistently refer to the Phase 1 segments as chapters.
It's just another small bit of distancing from Doom.
2014-10-12 20:15:56 -07:00
Mike Swanson
8f48751792 fix the filenames in the last commit 2014-10-05 04:10:41 -07:00
Mike Swanson
110522f10e graphics/text/Makefile: clean more generated files 2014-10-05 04:06:51 -07:00
Alexandre-Xavier Labonté-Lamoureux
a330e7707b graphics: replace screen border with more interesting graphic
The old one was simply a solid green border. Closes #86
2014-10-04 23:35:09 -07:00
Simon Howard
c1ea99b483 dehacked: Use https: version of website link.
Github now provides encrypted https: access to its github.io pages.
Use the https: equivalent URL instead of the unencrypted http:
version. Update the CREDIT screen text to do the same.
2014-10-03 05:16:39 +00:00
Simon Howard
750feed4ea graphics: Add new logo for FreeDM.
CaptainW kindly contributed a new logo for FreeDM in this thread:
http://www.doomworld.com/vb/freedoom/66962-freedm-needs-a-logo/

This uses the new logo for the title screen, menu header (M_DOOM) and
the large banner texture used in the FreeDM levels.

This fixes #12.
2014-10-03 04:02:52 +00:00
Simon Howard
3608770626 graphics: Update E2, E4 end screens.
The end screens include the corpses of the old version of the
assault tripod boss from before raymoohawk's change, and VICTORY2
also showed the old E2M8 level that has since been replaced. So
replace these images with up-to-date versions instead.
2014-09-28 23:24:12 -04:00
Mike Swanson
f1c0909cd9 graphics/text/.gitignore additions 2014-09-26 07:17:26 -07:00
Simon Howard
e06b81ac9f graphics: Add HELP2 lump.
HELP2 is the screen shown when playing shareware Doom, after
completing the first episode (gives you information on how to buy
the registered version, etc.).  For some reason, ZDoom seems to
expect this lump after completing episode 1, even though
freedoom1.wad isn't a shareware IWAD in any sense. Include HELP2
as a copy of the CREDIT screen; even though it's redundant it
doesn't do any harm.
2014-09-22 00:41:54 +00:00
Simon Howard
7a1b49e965 textgen: Generate CREDIT screen.
This is one of the screens of text shown between demos in the demo
loop. Generate this from the contents of a static text file. I
originally wanted to generate this programatically from the CREDITS
file but there are too many contributors to fit them all on the page.
2014-09-07 05:25:12 +00:00
Simon Howard
9968fe0ed1 textgen: Add image include support for smtextgen.
Instead of generating text and image parts in separate stages, add
the ability to include an image in the smtextgen command line. This
makes the command line in the Makefile clearer.
2014-09-07 04:22:09 +00:00
Simon Howard
5405104814 textgen: Move common code into a common file.
Reduce code duplication by refactoring the textgen and smtextgen
scripts.
2014-09-07 03:56:45 +00:00
Simon Howard
026ce9137f graphics: Fix name for stealth sphere.
The invisibility power-up is named 'Stealth Sphere' in the Freedoom
DEHACKED lump. Change the HELP screen to match this for consistency.
2014-07-27 03:49:03 +00:00
Simon Howard
18be2c988c graphics: Generate the HELP screen programatically.
The original Doom HELP screen showed the default key bindings for the
game's controls. This is not so useful nowadays: at worst it's
outright misleading because the player might not be using the
defaults, but it's also redundant because most modern source ports
allow the key bindings to be changed via the menus, which doubles as a
convenient list of the current key bindings.

Z0k suggested an alternative HELP screen that shows the items and
powerups available in the game. More discussion can be seen in this
thread: http://www.doomworld.com/vb/freedoom/69458-help/
2014-07-27 03:28:14 +00:00
Brett Harrell
c1af20bcb7 Add lower case font characters.
This extends the new font to include lower case as well as upper
case characters. Add a couple of kerning rules for the lower case
characters so that they render nicely, too.
2014-07-12 22:44:33 +00:00
Brett Harrell
5d15042c39 graphics: Add updates to small font.
Update several characters from the small font. More context is here:
http://www.doomworld.com/vb/post/1283219
2014-07-03 18:12:04 +00:00
Simon Howard
7f281321c9 graphics: Generate HELP screens programatically.
Decompose the help screen into three parts: the background, the
text and the title. Generate all except the main text programatically:
the background as a color transformed version of the INTERPIC graphic
and the title using the textgen tool.
2014-06-30 00:10:54 +00:00
Simon Howard
c06cb4478c textgen: Add kerning rules for new font.
These rules provide special cases that adjust the spacing between
certain pairs of characters so that they fit together better.
2014-06-29 22:54:02 +00:00
Brett Harrell
646434a039 graphics: Add new status bar numbers.
These status bar numbers match the new font used for the menu and
heads-up messages. More information is found in the forum thread:

http://www.doomworld.com/vb/freedoom/69080-new-font-candidate/
2014-06-25 02:33:13 +00:00
Brett Harrell
93a192b07c Add new small (HUD) font.
This is the small version of the font by Mechadon named "Denex";
more information can be found in this thread:

http://www.doomworld.com/vb/freedoom/69080-new-font-candidate/
2014-06-23 00:07:45 +00:00
Brett Harrell
1ef30acfaa graphics: Add new Freedoom font.
This replaces the old Freedoom font with a new chunky one named "Denex".
I (fraggle) have split the font out into separate images for use with
the textgen script, but have included the original source .pcx image
here.

Currently the font only includes uppercase characters and does not
include smaller lowercase ones, so I've hacked the textgen script to
convert all strings to uppercase before rendering. There are also no
font kerning rules for the time being.
2014-06-22 23:50:21 +00:00
Simon Howard
35c61c9318 textgen: Adjust M_MULTI graphic height, alignment.
M_MULTI is used in some multiplayer ports (Zandronum, others?) for
the main menu "Multiplayer" option. Make this taller to match the
other main menu graphics and align appropriately in buildcfg.

This conflicts with the height of the graphic as found in other ports
like SMMU/Eternity/PrBoom, but I've checked, and in those ports it's
either unused or short enough that it still works okay.
2014-02-22 03:07:03 +00:00
Simon Howard
57daf24437 graphics: Change WIMINUS graphic to be red.
This was configured to be white, but it just looks weird next to
the red numbers. Change to red for consistency.
2014-02-05 04:07:30 +00:00
Simon Howard
17598bdc00 graphics: Depluralize victims/killers graphics.
The "victims" graphic was slightly too wide, so that it was getting
overwritten by the green square to its right on the deathmatch
intermission screen. Truncate to "victim" (and "killer") so that
it fits. This fixes #49.

Also adjust the brightness/contrast on these images to match the
other text.
2014-02-05 04:02:50 +00:00
Simon Howard
eb7d4fb280 textgen: Reduce height of lowercase graphics.
If a text string contains all lower-case characters, then generate
it at a reduced height. This is necessary for certain graphics, like
the WIF graphic ("FINISHED") on the intermission screen, otherwise
it ends up in the wrong location (#49).

Adjust the offsets for some graphics in the build config to
compensate, and fix up the vertical offsets for WICOLON/WIMINUS while
we're at it.
2014-02-05 03:41:23 +00:00
Simon Howard
140b805857 graphics: Fix PFUB1.
Extend screen to the full 320x200; somehow the original was only
314 pixels wide.
2014-01-25 05:55:07 +00:00
Mike Swanson
706633ec59 make: VERSION variable can be set either via git or the VERSION file
Change up the shell line so that it can fallback on the VERSION file
if building without a Git repository (eg, from a release tarball).

Additionally, change the titlepic generation so that it uses this
single instance of setting VERSION rather than doing its own thing.
2014-01-22 19:32:25 -08:00
Mike Swanson
be70a52bec graphics: remove the date from the titlepic
This is a small step towards deterministic builds (#41). It's not very
useful information on its own: what it tells, you can gather by the
file modification date (which is preserved in the zip files), and even
better (the titlepic date was based on the builder's local time, not
UTC!). Some people have tended to refer to the date as well when
talking about what build they have, which is also unhelpful, multiple
commits can happen per day and the Version marker already uses git
describe for more accurate information.
2014-01-22 19:28:07 -08:00
Simon Howard
f76e05984a Fix git ignores for several generated files. 2014-01-22 05:47:06 +00:00
Mike Swanson
4c4ad3ac37 Fix a botched merge conflict attempt
While harmless, my previous commit resolving a merge accidentally
resulted in Fabian's line being preserved at the end when it shouldn't
have been.
2014-01-20 06:30:26 -08:00
Mike Swanson
29695eb7ca Merge remote-tracking branch 'fabian/clean_pyc'
Conflicts:
	graphics/text/Makefile
2014-01-20 05:38:21 -08:00
Fabian Greffrath
d9c9b315e6 Remove Python byte-code in the clean rule. 2014-01-20 13:06:50 +01:00
Simon Howard
d241e7f326 build: Fix 'make -j' handling.
Some build targets create multiple outputs, which can cause problems
when doing parallel builds. Clean up the build system so that all
subdir invocations come from the top-level Makefile and use $(MAKE).
Also fix the FREEDOOM/FREEDM lumps to really include the version
number by using $(shell ...) syntax.
2014-01-16 06:30:15 +00:00
Simon Howard
1325800e86 graphics: Add animation for E3 end screen.
Use the END0-END6 graphics to make the marine on the PFUB2 animate,
firing a few shots towards the boss corpse.
2014-01-13 04:10:26 +00:00
Simon Howard
ebb999f995 graphics: Add endgame screen graphics.
Freedoom Phase 1 needs endgame screens for the ends of episodes
2, 3 and 4. Add some basic screens that are essentially just
screenshots from level 8 of each episode. Set END0-END6 to be the
dummy empty graphic so that the game doesn't crash after E3.

This (for the time being) fixes the most egregious problems in #32.
2014-01-13 03:07:14 +00:00
Simon Howard
bc5ade0f33 textgen: Fix config file path.
My earlier commit added the wrong config file paths for the dehacked
lumps, which broke the build.
2014-01-11 23:22:05 +00:00
Simon Howard
5469cd9c11 graphics: Remove unfinished map graphics.
We have had these graphics for a long time but they were never
finished and look ugly. For consistency, remove them and just use
the normal INTERPIC graphics for all the intermission screens.
2014-01-11 23:16:57 +00:00
Simon Howard
affe9b53a1 graphics: Rename title screen.
By popular vote[1] on Doomworld we are ditching the "Ultimate" name
for Freedoom 1; the two IWADs are now named "Freedoom: Phase 1" and
"Freedoom: Phase 2". Rework the title screen to incorporate the logo
from the menu, and add a matching logo for FreeDM.

[1] http://www.doomworld.com/vb/freedoom/66855-renaming
2014-01-11 22:39:09 +00:00