Commit graph

179 commits

Author SHA1 Message Date
Ayub Ahmed
59a3ffd1a0 dehacked: add Phase 1 par times
Along with par times, replace my level names with better ones 
and change the ones that are used in the commercial IWADs.
2017-03-14 17:56:14 -07:00
Mike Swanson
e628c45a0d lumps: New demo2_p2 and demo4_p1.
Map changes since v0.11 have desynced these.  I recorded demo2_p2
keyboard-only, so the gameplay is extra bad.  On demo4_p1, I used
a mouse, so it is a little more skillful.
2017-02-21 18:43:19 -08:00
Mike Swanson
d74681d867 lumps/genmidi: Rename README to *.adoc 2017-02-21 18:43:15 -08:00
Mike Swanson
fde9cbfdac lumps: Remove c_end and c_start
These were special marker lumps for Boom colormaps, which were
removed in 2017-02-19T21:14:28Z!mikeonthecomputer@gmail.com
2017-02-21 18:43:15 -08:00
Mike Swanson
7282f2e5fe Makefile: Make sure all built files are removed in make clean. 2017-02-21 18:43:14 -08:00
Mike Swanson
63b72dbd63 Remove Boom special colormaps.
We’re not a Boom IWAD anymore, we can get rid of these.
2017-02-21 18:43:14 -08:00
Ayub Ahmed
2cc7a36fa8 dehacked: Story revisions, level name changes, serpentipede name consistency.
Fixes #377
2017-02-19 10:53:20 -08:00
Ayub Ahmed
1d2c3aa28c dehacked: Add DM31 and DM32 names. 2017-02-19 10:48:23 -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
Ayub Ahmed
f6727eeb8a dehacked: Remove spurious \n\n\, repairing the end of C6TEXT. 2017-02-16 10:45:47 -08:00
Mike Swanson
8835afef5f Copyright date bump and apply SPDX tags.
The tags are shorthand for the license of each file and avoid
copying the full license text into each one (and avoids having
to manually update the dates in each one...).
2017-02-15 16:41:53 -08:00
Ayub Ahmed
6e305548f2 dehacked: Update par times for levels. 2017-02-15 02:07:09 -08:00
Mike Swanson
3b72a61d1a dehacked: Slightly clean up transition texts. 2017-02-15 02:04:35 -08:00
Catoptromancy
ea03d3af74 lumps: New demos.
Phase 1:
DEMO1 - C1M6 Co-op with Cato, Chungy, Xindage, RestlessRodent
DEMO2 - C3M6 Single-player by Hypnotoad
DEMO3 - C4M3 Deathmatch with Chungy, Cato, Blastfrog
DEMO4 - C2M2 Single-player by Voros

Phase 2:
DEMO1 - MAP10 Single-player by Voros
DEMO2 - MAP06 Co-op with Chungy, Cato, Blastfrog, Hypnotoad
DEMO3 - MAP22 Deathmatch with Cato, Chungy, Blastfrog, Hypnotoad
DEMO4 - MAP09 Single-player by Hypnotoad
2017-02-14 20:25:35 -08:00
Mike Swanson
8352afe310 Change Protox's name to Xindage 2017-02-12 10:08:06 -08:00
Mike Swanson
9d1754c32e textures.cfg: Fix offset of BOSFA0 in A-BROWN4.
Fixes #367
2017-02-11 18:38:25 -08:00
Catoptromancy
b5bcdf0c62 dehacked: You found a backpack!
In levels with multiple backpacks, all of them said they were a
"second backpack" and that's kinda lame.
2017-02-02 07:59:51 -08:00
Mike Swanson
a1bf734a5f lumps: Revert a couple changes made by Voros.
"Got a 1%..." was correct, and why censor the word ass?
2017-01-31 08:31:01 -08:00
Ayub Ahmed
bb29fed8f1 Update dehacked 2017-01-31 08:25:19 -08:00
Mike Swanson
0a116b487e lumps/sbarinfo: Fix the file formatting to Unix newlines
The .gitattributes file tries to enforce Unix newlines, for
Windows users, but somehow this still got forced through...

It messed up the display of `git status`
2016-12-14 01:18:23 -08:00
Ayub Ahmed
347e2d408f Widescreen statusbar (#341)
This adds an SBARINFO lump which is recognized by ZDoom and
other compatible ports to show a larger widescreen status bar
on modern monitors.
2016-12-12 17:17:10 -08:00
Ayub Ahmed
9cbbbefab6 Aquatex fix (#324)
Redefine all of the new aquatex textures to be 128px tall.

This avoid tutti-frutti in vanilla Doom, where textures do not tile
property unless their heights are a multiple of 128.
2016-10-23 02:31:53 -04:00
Ayub Ahmed
9936ed7833 Add Aquatex textures
These are textures by @jmickle66666666 who has given permission
for them to be submitted to the project.
2016-10-15 23:53:49 -04:00
Mike Swanson
2bd40ddafd lumps: restore health/shield references
Discussed in PR #292, this change was a bit pointless and driven by
too much eagerness to be different than Doom.  These terms are
well-accepted in the FPS genre and changing them will only be
confusing.

This partially reverts 2016-08-29T14:15:32Z!ayubahmed2240@gmail.com
2016-10-08 22:43:46 -07:00
Mike Swanson
e081ac986f Change quotes in AsciiDoc to left/right Unicode versions
GitHub’s AsciiDoc parser barfs on the standard AsciiDoc syntax to
represent such characters with only ASCII…  Well, everybody should
support UTF‐8 these days.  Let’s just use these directly.
2016-09-03 15:37:48 -07:00
Ayub Ahmed
1e2f595e34 Update dehacked.lmp
Revised Phase 2 screens and some monster name changes.
New/modified lines to the pickup messages, to make it feel unique.

Added better story screens for Phase 1.

Minor edits to Phase 2's story screens.

All levels in Phase 2 have been named:
-MAP06 (Voltcom9)
-MAP09 (Kristien "sajbear" Nilsen)
-MAP10 (Jewellds)
-MAP26 (DragonMorpheus)
-MAP27 (Voltcom9)

All levels, but C3M5, in Phase 1 have been named:
-C2M3 (Voltcom9)
-C3M4 (Voltcom9)
2016-08-29 10:15:32 -04:00
Simon Howard
6198796e95 dmxgus: Change instrument order to work around DMX.
The DMX sound library used by Vanilla Doom has a bug where instruments
referencing other instruments as stand-ins can only reference
instruments listed earlier in the file. Actually, the instrument
references are just arbitrary cross-reference tags and the first
instrument to use that tag is used for all instruments with that tag.
This behavior can have some strange effects; more information can be
found on David Flater's page: <http://www.flaterco.com/kb/DOOM/DMXGUS/>

This has consequences for Freedoom's GENMIDI generation, particularly
as Chocolate Doom now emulates this behavior. To avoid assigning the
wrong instrument mappings, change the ordering of instruments in the
output file, so that "leader" instruments always appear earlier in the
file than instruments that reference them.
2016-07-12 21:35:36 -04:00
Simon Howard
991ff8180e textures: Clean up textures.cfg.
The formatting on this file was all over the place. Reformat all lines
to consistent, fixed columns and remove all tab characters.
2015-12-24 17:40:43 +01:00
Simon Howard
0822248318 textures: Add Doom 1 versions of conflicting textures.
Some textures which appear in both doom.wad and doom2.wad are defined
differently in each. We were always using the same definition in both
Phase 1 and Phase 2, causing compatibility problems with some levels
which expected a particular version of the texture.

To resolve, add both versions of the conflicting textures, controlled by
a new DOOM1_VERSIONS #define that allows which the version to be
selected. Use the doom.wad versions for Freedoom: Phase 1, and the
doom2.wad versions for Freedoom: Phase 2. This resolves part of #194.
2015-12-24 17:17:01 +01:00
Simon Howard
254602c6db lumps: Add README files for some directories.
These deserve to be documented.
2015-12-24 12:29:25 +01:00
Simon Howard
758164748c genmidi: Remove old C code.
This is obsolete, and is only really kept around for posterity. The
code is already in the idgames archive as bsdmidi.zip.
2015-12-24 12:11:53 +01:00
Simon Howard
7902096915 lumps: Eliminate symlinks for texture lumps.
Copy these to the parent directory to avoid needing symlinks.
More progress towards #202.
2015-12-24 11:26:31 +01:00
Simon Howard
0324308f37 lumps: Eliminate symlinks for dmxgus/genmidi.
Get rid of the symlinks for these lumps by copying into the parent
directory after build. This brings more progress on #202.
2015-12-24 11:15:50 +01:00
Simon Howard
103cd74f4e lumps: Split out cph/misc-lumps.
This eliminates another author-name directory. PLAYPAL and COLORMAP
generation are separate operations that are really only very vaguely
related to one another. Move these into separate, logically-named
directories.

As part of this we eliminate the symlinks for the PLAYPAL and various
colormap lump files, and instead copy these into the parent directory
for use by deutex. This brings further progress on #202.
2015-12-24 11:12:31 +01:00
Mike Swanson
831cdac378 de-symlinkify: nick 2015-12-17 01:22:20 -08:00
Mike Swanson
f6e8744fc1 de-symlinkify: mechadon 2015-12-17 01:22:18 -08:00
Mike Swanson
5c2753f46b de-symlinkify: jond 2015-12-17 01:22:12 -08:00
Mike Swanson
e17a34d9ea de-symlinkify: fraggle 2015-12-17 01:22:01 -08:00
Mike Swanson
6d18e482b6 de-symlinkify: csabo 2015-12-17 00:24:59 -08:00
Mike Swanson
d0f166f07f de-symlinkify: chungy 2015-12-17 00:24:58 -08:00
Mike Swanson
1b766167ff de-symlinkify: catoptromancy 2015-12-17 00:24:57 -08:00
Mike Swanson
aa806dc2c3 de-symlinkify: amarande 2015-12-17 00:24:27 -08:00
Mike Swanson
3f45ebe315 lumps: new demo2, 3, 4 for Phase 2 2015-12-14 23:58:54 -08:00
NickZ
e59cf04fa6 lumps: New map08 demo1 for phase 2. 2015-12-14 22:00:21 -08:00
Mike Swanson
4459b2a47a lumps: new FreeDM demos 2015-12-14 20:42:38 -08:00
NickZ
10b2cdced6 lumps: new c2m7 demo2 and c4m2 demo4 2015-12-14 18:37:55 -08:00
Mike Swanson
8ce95051b6 lumps: new c1m7 demo1 2015-12-14 18:32:57 -08:00
Fabian Greffrath
d50addbf3d MAP05: Gameplay and compatibility fixes
- Remove the extraneous secret room accessible right from the start.
- Increase the floor height of sector holding the red fake key, so it
  is better visible from the outside.
- Entirely remove the dull rectangular sector that once surrounded the
  Doom logo.
- Change the texture of the wall leading to the backpack secret.
- Remove the teleport from the super-secret room (accessible from the
  backpack secret) that lead to the northern-most sector behind the
  bars, instead add a switch to the super-secret room to lower the three
  bars on the left of that sector.
- The three bars on the right of that sector are now lowered when the
  switch lowering the fake red key and unveiling the real red key is
  activated.
- Move the invisible secret switch revealing the rocket launcher
  secret to the switch at the northern end of the northern-most
  corridor (it is still hard enough to discover, after all).
- The three eastern blue bars are now directly switchable (just as
  their western counterparts), remove switches from the walls on
  either sides.
- Turn the sector surrounding the yellow key back into damaging lava
  (it is in a hell area after all), but leave it escapable.
- Also, turn the sector surrounding the rocket launcher back into
  damaging nukage.
- Replace the two Barons guarding the red key by Cacodemons.
- Replace a stuck demon in the yellow key area by a Chaingunner.
- Change linedef on lift into yellow/red key area to type 88.

- Baptize the map "Waste Water Basin" in 'lumps/fraggle/freedoom.bex'.

TODO: Thing placement!
2015-12-10 16:39:00 +01:00
Mike Swanson
7bd4940bdd lumps: show off Acquainted With Grief for demo3_p1
A fairly short unskilled demo played with keyboard-only.  Although the
map doesn't actually fully work in vanilla, I got killed before
problems would actually arise by playing it back in vanilla.
2015-08-19 18:46:44 -07:00
Angry Saint
ff49d49781 levels: new c3m9, "Acquainted With Grief" 2015-07-16 15:04:09 -07:00