Commit graph

3074 commits

Author SHA1 Message Date
Simon Howard
f802aa44fd Merge branch 'master' of github.com:chocolate-doom/chocolate-doom 2016-06-01 14:34:18 -04:00
Simon Howard
f0999abcf1 setup: Remove widget for disk activity icon.
This seems like UI crackrock and the disk icon code is in a good
enough state that we're already turning it on by default. In keeping
with chocolate philosophy, if people really care they can manually
turn it off by editing the config file.
2016-05-31 20:14:27 +01:00
Simon Howard
2730a06cf1 video: Remove show_diskicon from video code.
Since this is game-specific there is no real reason for this to be
defined in the common video code. This also fixes the show_diskicon
variable which was broken by recent changes.
2016-05-31 20:03:55 +01:00
Simon Howard
90a455e539 diskicon: De-dupe icon dimension constants.
These were already defined in v_diskicon.h.
2016-05-31 19:58:58 +01:00
Simon Howard
70b90f34d9 diskicon: Fix Strife disk icon.
Strife has no STCDROM lump; it always uses STDISK. Change the
V_EnableLoadingDisk() function to take the lump name as an argument,
as the lump to use for the loading disk is really game-specific.

Also fix the location where the Strife disk icon is shown on screen;
the vertical position wasn't quite right.
2016-05-31 19:56:16 +01:00
Simon Howard
5bddaa7c57 diskicon: Draw disk icon with black background.
Vanilla {Doom,Strife} show a black background to the disk icons if the
icons are transparent, a side effect of how the disk icon code works
(the commented-out version can be found in Heretic's i_ibm.c). To be
consistent with how the vanilla code works, don't use V_DrawPatch to
draw the loading icon every time, but rather draw it to a buffer on
startup and blit the whole disk region to the screen.
2016-05-31 19:47:48 +01:00
Fabian Greffrath
7607140288 Use a heuristic approach to detect infinite state cycles
Count the number of times the loop in P_SetMobjState() executes
and exit with an error once an arbitrary very large limit is reached.
2016-05-24 21:02:05 +02:00
Simon Howard
512f850d91 Fix STDISK patch offset calculation.
Directions were backwards for these offsets; the STDISK lump has a -1
y offset, so we were grabbing and restoring the background from the
wrong location in the video buffer.
2016-05-22 22:36:44 +02:00
Mike Swanson
ed8cbb08e8 NEWS: change khokh2001 attribution to Nuke.YKT 2016-05-22 10:41:37 -07:00
Simon Howard
ced40ce2c4 Refactor loading disk icon code.
Only draw the disk icon just before doing the SDL blit to the screen,
and restore the background to I_VideoBuffer immediately after doing
so. This avoids the possibility of the disk remaining in the video
buffer and fixes #668.

Also centralize most loading disk code inside v_diskicon.c.
2016-05-22 17:34:17 +02:00
Mike Swanson
ebeccb0ff2 NEWS: Use past-tense rather than present and imperative. 2016-05-22 07:43:55 -07:00
Mike Swanson
d0467c9ae2 NEWS: Strife IWAD/voices.wad loading behavior tweak 2016-05-21 12:38:27 -07:00
James Haley
7742f0d459 Swap order of checks for voices.wad; resolve issue #675 2016-05-21 13:57:58 -05:00
Mike Swanson
1efd274daf NEWS: Update for the current state of the repo. Maybe release soon...? 2016-05-20 07:40:15 -07:00
Mike Swanson
c0492ef8da d_iwad: Find Strife from a GOG.com installation 2016-05-19 08:44:33 -07:00
Simon Howard
e94e6cd994 Merge pull request #705 from nukeykt/dmxgus
music: DMX's "GUS instrument mappings bug" emulation
2016-05-14 14:17:02 -04:00
Mike Swanson
1db8ff0b4b doom: Use inequality comparison for the freedoom variant (thanks Jon) 2016-05-05 07:58:44 -07:00
Mike Swanson
4bab09e993 Merge pull request #702 from chungy/master
doom: Always allow loading PWADs for Freedoom: Phase 1
2016-05-05 07:29:57 -07:00
nukeykt
bd0a63d92b music: DMX's "GUS instrument mappings bug" emulation 2016-05-03 22:42:30 +09:00
Mike Swanson
b5dabaf78e doom: Always allow loading PWADs for Freedoom: Phase 1
With the combination of freedoom1.wad and -gameversion 1.666 through
1.9, Chocolate Doom would fail to pass the checks against loading
PWADs on the shareware version of Doom.
2016-04-30 22:45:56 -07:00
Simon Howard
0fd26e606c Merge pull request #703 from chocolate-doom/gamevariant
introduce a "gamevariant" variable to tell different IWADs apart
2016-05-01 00:52:09 -04:00
Simon Howard
59b322bd84 Merge pull request #635 from chungy/automake_bindir
automake: install binaries to ${bindir} not ${exec_prefix}/games
2016-04-29 11:08:00 -04:00
Mike Swanson
7b95fbbff4 automake: install binaries to ${bindir} not ${exec_prefix}/games
This has been enforcing an optional part of the FHS that proves
problematic on distributions that do not include /usr/games or
/usr/local/games on the $PATH by default.  On the packagers’ side, the
Arch, Fedora, and OpenBSD packages (at least) have been patching the
Makefile.in files in order to get it to install to the bin directory
instead.  On the users’ side, this comes as a rather nasty surprise
when neither the terminal nor GUI will launch the games when they have
been installed to a location not in the $PATH.

If desired by packagers or end-users, the old behavior can still be
effectively implemented by using `./configure --bindir=/usr/games`
2016-04-28 15:21:25 -07:00
Fabian Greffrath
4ff554629f opl_sdl.c: remove unused variable "i" 2016-04-25 20:48:17 +02:00
Fabian Greffrath
ab050f0a6f gamevariant can be either freedoom or freedm
Also, simplify the checks and set the variable earlier, i.e. before
any PWADs are loaded that could contain one of the lumps we check for.
2016-04-22 06:10:43 +02:00
Fabian Greffrath
6df0ab8680 introduce a gamevariant variable to tell different IWADs apart
Chocolate Doom supports different variants that are available of the
IWADs, e.g. for Doom 2 it supports the Vanilla IWAD, the one shipped
with the Doom 3: BFG Edition as well as Freedoom: Phase 2 and FreeDM.

Each of these IWAD variants requires some specific special-casing and
the newly introduced global "gamevariant" variable can be used to keep
track of all of this.
2016-04-20 17:07:13 +02:00
Simon Howard
d982aa21ea Merge pull request #701 from krystalgamer/patch-1
Removed non-existing files from project
2016-04-18 09:52:34 -04:00
krystalgamer
8e36bba2bc Removed non-existing files from project 2016-04-17 14:32:18 +01:00
Simon Howard
7c4a6bf731 Merge pull request #688 from jkbenaim/heretix-namefix
heretic: Add map names for Episode 6
2016-03-27 18:30:06 -04:00
Jason
85b6f63a70 Heretic: Add map names for Episode 6
Add blank map names for Episode 6.

This fixes a crash that can occur at the intermission screen after
completing a map in Episode 6.
2016-03-27 16:03:24 -04:00
Simon Howard
1089c6a37d Merge pull request #687 from chocolate-doom/jmtd-doc-install-freedm
Update INSTALL.template
2016-03-24 21:25:21 -04:00
Jonathan Dowland
6cd7d53a27 Update INSTALL.template
Add freedm.wad to the list of IWADs that can be used for chocolate-doom.

Closes: #666.
2016-03-24 21:26:12 +00:00
Jonathan Dowland
41c3d6d54b Merge pull request #683 from nukeykt/authors2
Add me to AUTHORS
2016-03-23 18:14:20 +00:00
nukeykt
6b0a6feea3 Add Alexey to AUTHORS 2016-03-24 02:34:32 +09:00
Jonathan Dowland
bd7a22c321 Update AUTHORS
Update my email
2016-03-11 15:37:11 +00:00
Simon Howard
cf9c03648c Merge pull request #679 from jmtd/osx-launcher-lmp
osx: Add support for .lmp file formats to Mac Launcher
2016-03-10 17:47:32 -05:00
Jonathan Dowland
c9d46e0c7c Add support for .lmp file formats to Mac Launcher
Once the app has been launched at least once, double-clicking upon
an .lmp file should start the Chocolate Doom launcher and add
appropriate "-playdemo" command-line arguments.

Closes: #677.
2016-03-10 22:30:56 +00:00
James Haley
21668aca63 Cast player pitch to unsigned when calculating sigil mega blast trajectory 2016-03-09 19:57:31 -06:00
James Haley
4077f339e7 Verified change to AM_addMark logic 2016-03-06 12:00:52 -06:00
James Haley
c2a82e2430 Verified changes needed to P_KillMobj 2016-03-06 11:51:26 -06:00
James Haley
899bc171b7 pw_invisibility is in fact cleared on burning death; addl resolution for issue #663 2016-03-06 01:36:43 -06:00
James Haley
a515d590c9 Address multiple issues identified by nukeykt; partially resolves issue #663 2016-03-06 01:22:27 -06:00
James Haley
71cf6472c2 Merge branch 'master' of https://github.com/chocolate-doom/chocolate-doom 2016-03-06 00:39:01 -06:00
James Haley
bc09b36a20 Allow SDL headers and libraries to exist in the msvc project directory 2016-03-06 00:38:49 -06:00
Simon Howard
2dedb03719 Merge pull request #672 from jmtd/jmtd-revert-mrandom-seeding
doom: Revert commit 59aad53.
2016-03-01 20:58:11 -05:00
Jonathan Dowland
4f040459eb Revert "Seed the M_Random random number generator from the system time to give"
This reverts commit 59aad53bbd.

Closes #665.

The original commit enhanced the behaviour of Doom to make some of the
pseudo-random behaviour less predictable. Whilst this is a nice feature, it's a
feature that vanilla lacks: replaying a demo would result in those behaviours
(wipe, pitched sound effects) being identical each time. This is not the case
with the above feature.

It could actually be quite useful to ensure that such behaviours are
reproducible to fine-tune our emulation of e.g. Doom/Heretic/Hexen pitch
shifting. Perhaps in the future our testing will be enhanced to compare
multimedia output of Vanilla versus chocolate for demo playback, in which case
we would also need to have reproducibility here.
2016-03-01 16:10:50 +00:00
Simon Howard
3a1bc4269d Add Contributor Covenant as Code of Conduct.
Chocolate Doom is only a small project, but it does have a small
community, and nowadays it is best practice to always have a Code of
Conduct.
2016-02-28 20:02:10 -05:00
Simon Howard
96a017b56f Update some doomworld http: links I missed.
Also fix the link to Lee Killough's page about visplane overflows;
it used to be on John Romero's website but is no longer there.
2016-02-28 14:36:59 -05:00
Simon Howard
826d2a09fa Update Doomworld URLs.
Doomworld is now available over https: so there's no reason to link
to unencrypted http: URLs (which are just redirect anyway). Also the
idgames interface URLs have changed.
2016-02-28 14:30:31 -05:00
Simon Howard
2137da434e Change all chocolate-doom.org URLs to https:
The website is now available over encrypted https: and there's no
reason to direct people to unencrypted http: URLs any more.
2016-02-28 14:20:19 -05:00