Commit graph

228 commits

Author SHA1 Message Date
Mike Swanson
f814d7a43b Remove Doom 3: BFG Edition support
Might have been a nice idea to be able to run under absolutely any
Doom engine, this has caused problems with PrBoom-Plus for
compatibility, with that engine detecting our game as a BFG Edition
IWAD and applying certain workarounds that don’t actually make sense
in this case.

It is a rather niche use case to run under BFG Edition, and proper
PrBoom-Plus compatibility is much preferred.
2019-08-31 23:19:14 -07:00
MatthewTheGlutton
e8ac3e5078
Update skill definition text. 2019-08-21 00:04:58 -07:00
NickZ
b41bf30551
Update copyright year 2019-04-05 19:04:54 -07:00
Simon Howard
2f520543d3 graphics: Tweak positions of help screen items.
Some of the sprites have changed since the help screen was first put
together and are now overlapping with each other slightly. In
particular the box of shells is overlapping with the weapon above it.
Adjust positions by a couple of pixels and give some extra space.
2018-10-06 19:19:32 -04:00
Simon Howard
1b2319cc50 freedm: Remove override for menu skull.
FreeDM had a special override to use an animated rocket for the menu
selector, a tweak to make it more deathmatch-appropriate. Unfortunately
the rocket animation is too wide and causes Chocolate Doom to error out
when the help screen is brought up (F1) with "Bad V_DrawPatch". Even if
the horizontal offset is adjusted it will overlap with parts of the help
screen and obscure them. I think the easiest solution is to just remove
the override.
2018-10-06 19:13:18 -04:00
Erick Tenorio
0bf8ccb0ef graphics: Updated C4 endpic 2018-07-02 13:53:02 -07:00
Erick Tenorio
ea4b9e9cc8 Chapter 4 Update
Updated Chapter 4: Double Impact with the fixes included in the
hotfix. C4M7 was already updated for Freedoom with the fixes, but not
C4M4 and C4M8. Both were updated to be up to par with the
hotfix. C4M8's old edits to lowering the lifts won't be needed
anymore. C4M8 was also edited to be vanilla-compatible, removing some
details at one of the final rooms. Hopefully Vanilla won't crash
anymore.

The endpic for Chapter 4 has been updated to match with the current
Freedoom assets, bye bye that old Imp sprite and floor texture.
2018-07-02 13:52:41 -07:00
Simon Howard
7ef52000bb
Merge pull request #532 from Ferk/facetweaks
graphics: tweaks on freedoom guy standard HUD face
2018-06-28 11:18:58 -04:00
Fernando Carmona Varo
b9ed4f81bf graphics: tune the other HUD faces face & outlines
Tweak the rest of faces to match in thickness as well.
The smile in the stfevl* graphics is also wider now.
2018-06-09 23:54:59 +02:00
Mike Swanson
9b4bd71aab titlepic: update copyright year 2018-05-31 11:34:41 -07:00
Mike Swanson
beebbed1f2 Complete Doom 3 BFG Support, and avoid crashing PrBoom-Plus
DOOM2.WAD contains a MAP33, which is being represented here as only
the dummy map, and also M_EPI1 and M_EPI2 lumps for the “Hell on Earth”
and “No Rest for the Living” texts, both of which are now replicated
here as well (using “Phase 2” and “The Missing Levels” as names instead).

No, we still don’t plan on having a real MAP33, the inclusion here is
only to avoid engine crashes.

Fixes: #533
Ref: #529
2018-05-30 14:50:56 -07:00
Fernando Carmona Varo
e70639cc39 graphics: tweaks on freedoom guy standard HUD face
Doom engines stretch the the images with 20% extra height. This,
together with the already slim jaw and sharp chin in the face of the
freedoom guy, makes it look very juvenile, stretched.

This change tweaks the face images to have a thicker jaw and a more mature
look. It also tweaks the lip position a bit and reduces the excessively
dark outline along the chin.
2018-05-19 13:47:44 +02:00
Mike Swanson
227ec720e6 Support running in Doom 3: BFG Edition
There are a few lumps added to the Doom IWADs required by the BFG Edition
of the game that would cause it to crash abnormally if the IWADs were
replaced by Freedoom.  We add these news graphics lumps to the game here.

BFG Edition also changes m_gdhigh to "Fullscreen:" and m_scrnsz to
"Gamepad:", neither change of which will ever be reflected in Freedoom,
but it won't crash in this engine anymore.

Closes: #529
2018-05-10 19:31:17 -07:00
Nick Zatkovich
1383f50e01 BUILD: fix make -j
Fixes #468
2017-07-31 20:54:57 -07:00
Nick Zatkovich
09f39d4e64 BUILD: code cleanup, VERSION fix
Performed code cleanup, made changes to version number Make gets from
Git to make it consistent across git versions
2017-07-31 14:34:47 -07:00
Nick Zatkovich
e9015b43b3 python3 compatibility fixes 2017-07-31 11:31:25 -07:00
Nick Zatkovich
7251b14892 rotate: fix rotate
Image.rotate had different behavior under 3.1.x, transpose works on all versions
2017-07-31 02:01:48 -07:00
Nick Zatkovich
cac04c1271 textgen: cleanup
Make the classes self-contained
Make the functions re-entrant
2017-07-31 01:19:53 -07:00
Nick Zatkovich
b00f9516e3 rotate.py: fix for PILLOW 3.1.x 2017-07-31 00:42:57 -07:00
Nick Zatkovich
4186211e3f config.py: fix kerning table
duplicate entries in the kerning table caused non-deterministic 
text graphics to be generated
2017-07-31 00:29:06 -07:00
Nick Zatkovich
648f6aebe9 textgen: alpha_composite instead of paste
pasting with kerning cut off some of the letters
2017-07-31 00:13:20 -07:00
Nick Zatkovich
dfde6e8793 create_captions.py: use default font 2017-07-30 23:32:11 -07:00
Nick Zatkovich
215b7c644e BUILD: remove the last of the imagemagick stuff
The only remaining thing depending on imagemagick are the dist scripts
2017-07-30 23:26:52 -07:00
Nick Zatkovich
6724ef5aba BUILD: switch to use pillow instead
create_caption still relies on ImageMagick
2017-07-30 18:58:54 -07:00
Nick Zatkovich
d3038fad30 BUILD: remove background color from textgen
remove the background color when generating the text, 
then remove the extraneous deutex arguments
2017-07-30 14:08:17 -07:00
Mike Swanson
9c6c681276 Burn all GIFs: Convert everything to PNGs.
DeuTex 5 now supports these, and we can use real transparency indexes
in the files too, so no more ugly cyan background!
2017-07-18 22:26:52 -07:00
Mike Swanson
63efd56679 create_caption: Clean up copyright text more by removing "Freedoom, " 2017-03-14 17:51:34 -07:00
Mike Swanson
af5d98ec50 graphics: ignore the new t_phase1/t_phase2 files 2017-03-14 16:08:52 -07:00
Mike Swanson
0b3edc9548 Merge branch 'titlepic' of gh:Voros2/freedoom 2017-03-14 16:05:10 -07:00
Mike Swanson
a51b9d3398 Merge branch 'titlepic' of gh:Ferk/freedoom 2017-03-14 15:57:34 -07:00
RjY
3143339a64 parallel_textgen: run textgen in parallel
textgen: instead of running ImageMagick yourself, output a Makefile rule
for each graphic. Dependencies are passed on the command line.

Makefile: Add rule for 'textgen.mk' which is built by running textgen.
graphics.stamp depends on textgen.mk and all the built graphics files.
Then, each built graphic depends on textgen.mk, ensuring it is made
first. textgen.mk itself depends on textgen config, font, and dehacked.
(Makefile itself also depends on textgen.mk implicitly via include)

This duplicates previous behaviour where changing textgen config remakes
all text graphics, but one Make rule for each, allowing parallel make
with -j instead of the script doing one at a time.

The built IWADs are byte-for-byte identical before and after this patch
series is applied (provided VERSION is set to the same thing of course)

One problem is 'make clean' rebuilds textgen.mk because Make thinks the
Makefile needs it, but then immediately deletes it. Not sure how to fix.
Use git clean -fdx instead, or just don't clean twice in succession.

----

This gives the following improvement in build time (-j1 as control,
built on 4 cores and a large tmpfs so disk speed isn't a factor)

(master)

    make -j1  4.83s user 6.77s system 93% cpu 12.444 total
    make -j1  4.74s user 6.72s system 93% cpu 12.267 total
    make -j1  4.72s user 6.68s system 92% cpu 12.292 total

    make -j4  5.72s user 6.77s system 109% cpu 11.414 total
    make -j4  5.39s user 6.85s system 107% cpu 11.419 total
    make -j4  5.66s user 6.79s system 109% cpu 11.383 total

parallel_textgen

    make -j1  4.57s user 6.66s system 92% cpu 12.185 total
    make -j1  4.73s user 6.57s system 93% cpu 12.152 total
    make -j1  4.60s user 6.72s system 93% cpu 12.152 total

    make -j4  5.62s user 7.72s system 262% cpu 5.084 total
    make -j4  5.82s user 7.76s system 262% cpu 5.165 total
    make -j4  5.79s user 7.73s system 261% cpu 5.161 total
2017-03-14 17:46:40 +00:00
RjY
946db56ccd parallel_textgen: separate font_render and invoke_command
Replace font_render with get_command which returns the command line
instead of executing it. Move invoke_command to font_render callers.
2017-03-14 13:14:16 +00:00
RjY
e94bcdd9ea graphics/titlepic: remove author subdirectory
- move captainw/* into titlepic (rename fdmtitle to freedm_titlepic)
- fix file paths in dist/Makefile, graphics/titlepic/Makefile
2017-03-14 11:43:33 +00:00
Ayub Ahmed
b1a9fe95e5 titlepic/Makefile: clean only generated t_phase...
images within the directory.
2017-03-13 06:03:13 +06:00
Fernando Carmona Varo
4f5bb82e61 Titlepic: use more discrete breathing orifices 2017-03-11 16:37:19 +01:00
Ayub Ahmed
758c53fb54 text/config.py: make t_phase images white 2017-03-11 21:05:25 +06:00
Ayub Ahmed
209f14f071 create_caption: increase height, remove -style 2017-03-11 19:15:00 +06:00
Ayub Ahmed
943ccbb126 create_caption: make y offset positive 2017-03-11 18:55:21 +06:00
Ayub Ahmed
4a39a7730e create_caption: align line 37 properly 2017-03-11 18:42:08 +06:00
Ayub Ahmed
2326d4a741 create_caption: change color to orange
For better visibility.
2017-03-11 18:37:43 +06:00
Ayub Ahmed
5efe26a29b titlepic/Makefile: fix typo 2017-03-11 11:02:21 +06:00
Ayub Ahmed
4f3acc1325 text/Makefile: select t_phase images for copying 2017-03-11 11:00:55 +06:00
Ayub Ahmed
7c00def304 config.py: add t_phase images to generate 2017-03-11 10:57:50 +06:00
Ayub Ahmed
0cdc7c2330 Makefile: generate t_phase images for titlepic 2017-03-11 10:51:50 +06:00
Ayub Ahmed
9261d53eb8 create_caption: footer and text updates
Use blue as fill color rather than white.
Add oblique style to footer text.
Replace URL with copyright notice.
Removed "Version: " text from version footer.
Use image rather than text to generate "Phase 1" and "Phase 2" words
2017-03-11 10:44:04 +06:00
Mike Swanson
55943ca46f Make sure titlepic logo and menu logo are in the same location.
This gives a nice effect of blending the title in with the menu.
We actually used to do this, but it broke with a title screen update.
Thanks @JNechaevsky for the suggestion.

Closes #388
2017-02-23 08:13:54 -08:00
Mike Swanson
c6235d6ffc Makefile: Make sure all built files are removed in make clean. 2017-02-19 12:22:57 -08:00
Mike Swanson
1adfc2d576 RIP widescreen status bar support.
Causes conflicts with ZDoom mods that try to define their own HUDs,
at least three on IRC were reported as being basically totally broken
with Freedoom 0.11.  While it was a good attempt at adding an
enhancement to Freedoom under ZDoom, we cannot afford to break mod
compatibility.
2017-02-17 14:54:19 -08:00
Mike Swanson
5da8e2183e graphics/starms: Try to hide shadow behind the numbers.
Just darkening the fields.  As described in issue #356, vanilla-like
engines produce an odd graphical artifact behind the status bar
numbers.  Even Doom shows small glitchiness masked by the texture.

Should be less obstrusive now.
2017-02-15 17:09:46 -08:00
Blastfrog
985090b8ee graphics: update status bar for widescreen
Closes #371
2017-02-15 16:51:43 -08:00