Commit graph

3089 commits

Author SHA1 Message Date
Mike Swanson
e2b4804903 Convert the rest of the doc files to Markdown. 2016-06-08 04:42:29 -07:00
Mike Swanson
77c680f7d3 strife/p_plats.c: Add braces for for() loops and un-indent I_Error(). 2016-06-07 10:07:18 -07:00
Mike Swanson
c996c125b7 Convert files from CRLF to LF line endings. 2016-06-07 10:03:34 -07:00
Jonathan Dowland
2e1a244af4 Merge pull request #726 from chungy/readme.md
Convert README to Markdown
2016-06-07 09:44:12 +01:00
Mike Swanson
189fbf78db README: Convert to Markdown format. 2016-06-07 01:41:45 -07:00
Simon Howard
9c6799b462 pkg: Remove ChangeLog file from binary dists.
This file now includes nothing useful other than a link to the Git
repository, so it's pointless to include it with binary distributions.
2016-06-05 23:00:24 -04:00
Simon Howard
4b45eb2d1d TODO: Update TODO file.
I doubt/hope anybody pays much attention to this file nowadays, but
it still has some interesting ideas. Bring it up to date by removing
items which have now been resolved (including all the outstanding OPL
bugs, thanks to Nuke.YKT's efforts). Reformat slightly and add a link
to the bugtracker.
2016-06-05 22:56:20 -04:00
Simon Howard
3ec49f4028 Switch builds to use Trusty.
SDL2 packages are too new for Ubuntu Precise, which is from 2012.
Switch to the Trusty beta environment, as documented here:

https://docs.travis-ci.com/user/trusty-ci-environment/
2016-06-05 11:52:50 -04:00
Simon Howard
dbc0aaf109 Fix travis build of master branch?
Currently Travis is excluding master from builds. It looks like there
was probably a syntax error; let's see if this fixes it.
2016-06-05 11:47:44 -04:00
Simon Howard
0cd3b7e5f8 setup: Fix crash with Chex Quest warp select.
The level selection dialog was crashing on open when Chex Quest was
selected as an IWAD. This appears to have been caused by b0585fa6
which changed Chex Quest to be considered as a retail IWAD rather
than a shareware one, but did not update the tables in d_iwad.c to
match. Change the tables there to match and fix the crash.
2016-06-05 11:45:26 -04:00
Simon Howard
f3405a4d5c Use apt addon rather than sudo for builds.
The 'sudo apt-get install' instructions on the travis-ci website don't
work for containerized builds; instead we must specify packages to
install using the apt addon.
2016-06-05 11:28:02 -04:00
Simon Howard
f8063a2747 Add build file for Travis CI. 2016-06-05 11:17:25 -04:00
Simon Howard
4946e59ea3 Merge pull request #700 from nukeykt/opl-timer-fix
opl: fix time calculation after tempo change
2016-06-05 00:40:46 -04:00
Simon Howard
ed77a8fe11 osx: Bump OSX deployment target to 10.7.
We recently switched to targeting 10.4 because of build problems with
SDL on old versions on OSX. So make this match.
2016-06-04 19:32:59 -04:00
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
nukeykt
6b2fc8427c opl: fix time calculation after tempo change 2016-04-12 16:56:10 +09: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