Commit graph

2018 commits

Author SHA1 Message Date
Mike Swanson
eca25952ad make: use $(RM) for removing files
This is one of the built-in variables for Make and can increase
portability on different operating systems (eg, on Windows, the
built-in $(RM) may be defined as "del" instead of "rm -f").
2019-09-04 14:22:49 -07:00
Mike Swanson
fe7d6f864a dist/freedoom: use DOOMPORT envvar rather than PORT (breaking change)
PORT is too generic, especially if refering to TCP/UDP ports, and if
those are set, the freedoom script may not work properly.  DOOMPORT is
a reasonable alternative.
2019-09-04 14:08:34 -07:00
Mike Swanson
96b28272a6 dist/Makefile: rewrite targets so they build only when sources change
Also includes a change to the top-level Makefile to accommodate new
target names.  Moved the installation variable settings close to the
install targets.
2019-09-04 14:06:17 -07:00
Mike Swanson
2a810409de buildcfg: add an offset for STTMINUS
Allows the hyphen to not draw over the frag count (when negative) in
vanilla Doom.
2019-09-04 02:23:01 -07:00
Mike Swanson
40f9cbf0d6 BUILD-SYSTEM: Update to current state of the project
Some directory names changed, we don't build resource WADs anymore,
cpp variables changed to PHASE1 and PHASE2.
2019-09-01 18:49:58 -07:00
Mike Swanson
a31450f5b9 Rename ULTDOOM/DOOM2 cpp defines to PHASE1/PHASE2
More self-consistent with out project, and those names dated before
Freedoom had a stronger identity.
2019-09-01 18:49:03 -07:00
Simon Howard
9f082e5ffa build: Remove wadinfo.txt.
We no longer build the freedoom.wad resource WAD so this is redundant.
(It was removed in bfb95753bd).
2019-09-01 21:10:14 -04:00
Simon Howard
86a6d7300c Merge branch 'master' of github.com:freedoom/freedoom 2019-09-01 20:58:11 -04:00
Simon Howard
340faf1205 textures: Strip out now-unused #defines from cfg.
Now that we always include all textures in every IWAD, the configuration
is significantly simpler. The #defines we previously used to control
the conditional logic are now redundant.
2019-09-01 20:56:40 -04:00
Mike Swanson
53b4133b20 move source dehacked to dedicated subdirectory 2019-09-01 17:53:55 -07:00
Mike Swanson
8e9ce31b70 dehacked: run through simplecpp, cheat replacements for Phase 1 only
Deduplicates effort from copying between multiple patch files, and we
now have unique outputs for each of our IWADs.

Having just "No Clipping 1 = idclip" proved to be troublesome with at
least prboom-plus, the engine running its cheat detecting twice and
becoming unable to activate no-clipping mode.  Worked around it by
also defining "No Clipping 2 = idspispopd", restoring that cheat's
functionality in most source ports and keeping both variants unique.
Chocolate Doom will only use the "idclip" version.
2019-09-01 17:39:58 -07:00
Mike Swanson
d4c5b3ab48 simplecpp: keep blank lines 2019-09-01 17:24:25 -07:00
Mortrixs
6b8397dc0d levels: new c3m5
Thanks to Mortrixs and Erick for this new addition
2019-09-01 16:10:29 -07:00
Mike Swanson
880cbc3f31 test_levels: constrain the pain lord in its sector, c1m1
He moved around too much.
2019-09-01 16:03:55 -07:00
Mike Swanson
bc69e87207 test_levels: remove line special from E1M1
In MAP01, it reveals the boss brain.  In E1M1, does nothing.
2019-09-01 02:18:30 -07:00
Mike Swanson
2e7bde78db textures: include almost all textures in all IWADs
We have been operating since the beginning with the idea of only
including matching compatible textures for Phase 1 and 2 based on the
textures that appeared in Doom 1 and 2, including keeping some
exclusive to each game.

This is artifically limiting to map creators and there is no good
reason to keep it this way.  Fixes #588
2019-09-01 01:16:49 -07:00
Mike Swanson
d3cdc3e76c test_levels: base E1M1 off of MAP01
Makes a little bit more of a consistent testing experience.  As of
this commit, there are a lot of HOMs/missing textures thanks to
depending on stuff presently in Phase 2 but not 1, though we’ll be
changing that too.

Removed MAP02, which was Cato’s old testing map and unnecessary to
stick around.
2019-09-01 00:49:33 -07:00
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
Mike Swanson
d16dcb86f3 dehacked: use IDCLIP in Phase 1 for no-clipping mode
IDSPISPOPD is long and hard to remember.  Thanks to fraggle for the
suggestion.
2019-08-30 14:58:57 -07:00
Mike Swanson
048ce28854 patches: new SKY4 based on a NASA image
Thanks to @P41R47 for finding the source and @Ferk for editing it to
tile horizontally and vertically both.

Image comes from
https://www.jpl.nasa.gov/spaceimages/details.php?id=PIA20357

Closes #590
2019-08-28 12:56:17 -07:00
Simon Howard
5e6e6332cd Merge github.com:freedoom/freedoom 2019-08-28 04:13:55 +01:00
Simon Howard
aeb96633ce manual: Add more tips. 2019-08-28 04:07:41 +01:00
Simon Howard
ccbbd186a3 manual: Add section on fan-made WADs. 2019-08-28 03:54:42 +01:00
Mike Swanson
5fd725a879 levels: rebuild nodes and run fix-map-names 2019-08-27 12:16:54 -07:00
Simon Howard
e045d5c4c1 manual: Add page breaks between top-level sections. 2019-08-27 04:08:17 +01:00
Simon Howard
61692df6ca manual: Add cheats section. 2019-08-27 04:02:38 +01:00
Mike Swanson
3b0f55db25 documentation: change ascii ' quotes to either ’ or _
Non-reference AsciiDoc implementations such as AsciiDoctor (used by
GitHub) or even the simplistic parser in loccount choke up on these
characters for different reasons.  AsciiDoctor doesn’t seem to even
parse them, displaying them as-is and not with emphasized text.
loccount would get hung up on possessives, expecting a terminating
character for emphasis that never comes.

Annoying, but easy to work around.  the curly ’ character can be used
for possessives and _underscores_ can be used for emphasis.
2019-08-25 21:17:41 -07:00
Mike Swanson
4ccdc785d0 colormap: use a crispier grayscale algorithm
Instead of averaging the RGB values, use a formula that better
approximates how the human eye sees color.

Formula was taken from this page:
http://www.tannerhelland.com/3643/grayscale-image-algorithm-vb6/
2019-08-24 16:57:42 -07:00
Mike Swanson
6566845f05 patches: use a single patch for SKY4 instead of multiple
Some mods (eg, crusades.wad) try to use SKY4 to (re)define other
textures, which doesn’t work in vanilla Doom, and the normal E4 sky
ends up creating a medusa effect.

While it is sad to see our light source go, reducing the effectiveness
of Double Impact’s lighting effects built into some of the maps, we
should prefer mod compatibility with Ultimate Doom.

Resolves #589
2019-08-24 15:37:53 -07:00
Mike Swanson
5f806a4c2f patches: copy over sky[23] to sky[23][abcd]
These patches are only used for TNT and Plutonia mod compatibility,
but we should at least keep them consistent with the skies we have in
the main campaigns.
2019-08-24 15:27:00 -07:00
Mike Swanson
8f4ab8401a dehacked: place commas inside quotation marks 2019-08-24 02:44:16 -07:00
Mike Swanson
5aa9d6d268 Revert "sounds: new teleport sound. (#564)"
This reverts commit 2019-07-23T05:30:11Z!NZatkovich@gmail.com

Apologies to the author of the sound, but this one sounds way too
similar to a monster being gibbed, creating a lot of confusion during
play, as noted in #587
2019-08-24 01:49:38 -07:00
Mike Swanson
1471de203a manual: add clean target to the Makefile 2019-08-23 22:45:10 -07:00
Mike Swanson
3a5d31a714 manual: ignore built manual.pdf file 2019-08-23 22:40:52 -07:00
Mike Swanson
85e00b3057 lumps: lowercase the not-proper-nouns of monsters and weapons
Except for SKAG which is an ancronym, the rest of these belong in
lowercase as they are not proper nouns.

Unlikely to actually have a visible impact in-game, but it is nice to
follow English convention in the source.
2019-08-23 22:30:07 -07:00
Mike Swanson
05d77c8958 Rename “Flame Bringer” to “Necromancer”
Resolves #578
2019-08-23 22:19:32 -07:00
Samuel Oliver
43ec8a91d8 various graphics tweaks and improvements 2019-08-21 03:05:25 -07:00
Mike Swanson
2e705d3e0e
Merge pull request #585 from MatthewTheGlutton/master
Fixes to the skill levels
2019-08-21 01:38:22 -07:00
MatthewTheGlutton
e8ac3e5078
Update skill definition text. 2019-08-21 00:04:58 -07:00
MatthewTheGlutton
99bc2f6b73
Update manual. 2019-08-21 00:01:43 -07:00
Mike Swanson
f16c87281e manual: repair hyperlinks to the savegame section
Misspelled as “savegames,” found when I was trying to build with a2x
which seems far more strict on targets existing than asciidoctor-pdf.
(I’m on Arch, without an asciidoctor-pdf package…)
2019-08-20 21:08:03 -07:00
Hugo Locurcio
7f776cd809
Fix the backpack sprite offset to be centered
This closes #577.
2019-08-20 17:20:48 +02:00
Mike Swanson
cf3b8e7da3 lumps: swap Phase 1 DEMO1 and DEMO4, no more netgames in DEMO1
Vanilla Doom locks out the load game option while playing a netgame
demo, and we should not lock it out so soon after starting the game.

Resolves #579
2019-08-19 13:22:27 -07:00
Simon Howard
c06f8d6d63
Merge pull request #582 from Calinou/manual-fix-shell-icons
Fix shell icons in the manual
2019-08-19 08:46:25 -04:00
Hugo Locurcio
fdcabb87f0
Fix shell icons in the manual
This closes #581.
2019-08-19 14:15:43 +02:00
Simon Howard
d86351c56c manual: Fix makefile to output correct filename. 2019-08-19 02:47:53 +01:00
Mike Swanson
8e06454a7f Merge branch 'master' of gh:fragglet/freedoom 2019-08-18 16:02:42 -07:00
Simon Howard
87c0ea1336 manual: Add README, Makefile. 2019-08-18 23:50:31 +01:00
Simon Howard
119e52aa7f manual: Add Summoner screenshot. 2019-08-18 23:40:56 +01:00
Simon Howard
794e7518f6 manual: Reword install section.
Add a paragraph explaining what freedoom1.wad and freedoom2.wad are.
2019-08-18 23:22:49 +01:00