Commit graph

4343 commits

Author SHA1 Message Date
Simon Howard
f5ea51bcb1 Merge branch 'master' of github.com:chocolate-doom/chocolate-doom 2018-10-21 19:46:00 -04:00
Simon Howard
9e14ceab62 setup: Add window action to open music pack dir.
This replaces the widget that controls the music pack path with a
window action button that just opens the configured music pack path.
The path is now automatically created and populated with an
explanatory README file that should explain the purpose to users.

Another major step in implementing #1051.
2018-10-21 19:44:01 -04:00
Simon Howard
ceb3e49189 music: Auto-configure a music pack directory.
Currently the user has to create a music pack directory themselves and
configure the path to it in the setup tool. To make configuration
simpler, just create a directory automatically along with a README file
about how to use it, since the user can now just dump files in this
directory.

Part of #1051.
2018-10-21 19:30:44 -04:00
Simon Howard
8c43337af2 textscreen: Allow any widget in action area.
It may be desirable to wrap a window action in a txt_conditional_t
sometimes so that actions dynamically appear based on how the config
changes. So change the TXT_SetWindowAction() API to accept any widget
instead of mandating a txt_window_action_t.
2018-10-21 17:40:18 -04:00
Fabian Greffrath
38a3e0922b
Merge pull request #1097 from devnexen/update_angle_t_type
Update angle_t type.
2018-10-21 23:36:56 +02:00
Simon Howard
74cdbeddf5 music: Disable Strife d_intro table entry.
This clashes with Doom's one. Disabling this isn't too bad since we
autoload the Strife VE subst config anyway.
2018-10-21 16:59:28 -04:00
Simon Howard
1996d03d74 music: Allow filename template for substitution.
Music packs may be in .flac or .ogg format, so check for both by
using a template with .{ext} where the .flac or .ogg should go. This
also allows the .{ext} syntax to be used in config files.

Part of #1051.
2018-10-21 16:54:57 -04:00
Simon Howard
59dae316be music: Add table of common hashes->filenames.
Having a built-in table of common hashes and well-known filenames means
that configuration files will not be necessary in the majority of cases.

This implements most of the functionality of #1051.
2018-10-21 16:27:04 -04:00
David Carlier
bbefecc258 Update angle_t type.
Typically to avoid few overflows.
2018-10-21 07:12:39 +01:00
Simon Howard
ba65f433fe music: Allow shortened hashes for subst configs.
Just as with (eg.) Git it's nice to be able to refer to as hash by a
prefix instead of having to type the whole thing, it's convenient to
be able to give a hash prefix in a substitute music configuration.
This change to the internals will also make it simpler to support
a preconfigured table of filenames.
2018-10-21 01:20:31 -04:00
Simon Howard
243df30e08 video: Add -borderless command line parameter.
When playing in three window mode it's potentially helpful to have a
borderless mode so that the user can line up three windows next to
each other on a single desktop. However, without the windows borders
it's difficult/impossible to move windows around, so I'm not sure yet
how useful this actually is. It probably depends on the OS.

Thanks to joshthenesnerd for the suggestion.
2018-10-20 12:25:04 -04:00
Alexandre-Xavier Labonté-Lamoureux
3de5232454 Hexen: Call W_GenerateHashTable() 2018-10-19 17:27:18 -04:00
Simon Howard
ffbc2b3492 Fix formatting for -response argument. 2018-10-15 00:40:56 -04:00
Simon Howard
9d4b4aeea5 Merge branch 'master' of github.com:chocolate-doom/chocolate-doom 2018-10-14 11:35:56 -04:00
Simon Howard
5e32affd97 Add '-response' command line argument.
Doom has always had the ability to load response files containing
extra command line arguments but the command line syntax of
'@filename.rsp' is unpleasant to use on modern Unix shells because
it breaks tab completion. It's actually more convenient to just have
a normal command line argument, so add one.
2018-10-14 11:34:03 -04:00
Simon Howard
08bb28ed91
Merge pull request #1094 from mfrancis95/master
Heretic: Call W_GenerateHashTable()
2018-10-14 10:59:27 -04:00
Simon Howard
2531f324e3 dehacked: Fix mistake in comment.
Thanks to Grazza for identifying this error on Doomworld (in reference
to DEH9000, although that text came from here).
2018-10-11 22:27:46 -04:00
mfrancis95
e295bb014b Heretic: Call W_GenerateHashTable() 2018-10-11 02:20:17 -04:00
Mike Swanson
02fc812eff iwad: Search Steam-on-Linux paths for WAD files
Windows games can now be installed via the Linux version of Steam,
so let’s automatically find any installed copies of the games.
2018-10-06 01:34:02 -07:00
Fabian Greffrath
3bf06ab27b video: explicitly check for aspect_ratio_correct's value being 1
This doesn't make any factual change for Choco but allows forks to
assign different values to this variable.
2018-10-04 13:43:00 +02:00
Mike Swanson
b9416dc6f9 Merge branch 'master' of gh:mfrancis95/chocolate-doom 2018-10-02 14:04:12 -07:00
mfrancis95
cb49854d10 Make sure SDL_HINT_NO_SIGNAL_HANDLERS is only set if using SDL >= 2.0.4 2018-10-02 16:31:50 -04:00
mfrancis95
28e6533feb Format the previous commit according to Chocolate Doom's coding style guidelines 2018-10-02 09:47:11 -04:00
mfrancis95
09f9ffb63f Fix SIGINT being ignored when Dehacked SHA1 warning dialog open 2018-10-02 01:51:06 -04:00
mfrancis95
3e21ed71a3 Gracefully error out when player starts are missing 2018-10-01 18:27:50 -04:00
Simon Howard
560cdc3e45 configure: add AM_PROG_AR macro.
Some platforms (eg. Emscripten) have their own version of the ar tool,
so it is important to pick one that matches the target architecture.
Without this macro we always use the default system-installed version
of ar.
2018-09-30 23:34:52 -04:00
Simon Howard
0a7d77c2a7
Merge pull request #1081 from hifi/wipe-refactor
doom: Refactor wipe to advance once per frame
2018-09-30 22:53:44 -04:00
Mike Swanson
54a2c31efc video: remove errant code for the -width and -height parameters
This prevented either paramater from working properly, since they
would be incorrectly trying to set the other dimension and immediately
switching video modes.  Now works like -geometry does.

Resolves #1086
2018-09-18 20:48:20 -07:00
Simon Howard
50d2f52b21
travis: Remove sdl2-branch
This work is now complete.
2018-09-16 20:32:21 -04:00
Simon Howard
b69888222b
Merge pull request #1084 from chungy/win32_html_docs
Use pandoc to generate HTML documentation files in win32 packages
2018-09-16 20:29:52 -04:00
Mike Swanson
5d629db9be pkg/win32: Use pandoc to create HTML versions of the docs
While plain-text versions generally worked, they have been slightly
littered recently with Markdown syntax.  We should be able to assume
every Windows user has a web browser and can view these documents
in nicely-formatted HTML pages instead of opening Notepad.
2018-09-16 05:28:28 -07:00
Mike Swanson
aa72812ca7 man: Generate Markdown versions of CMDLINE 2018-09-16 05:28:25 -07:00
Mike Swanson
eccaa5aace docgen: add Markdown output mode 2018-09-16 05:14:16 -07:00
Mike Swanson
aff22a2eaa INSTALL: Convert document to Markdown format 2018-09-16 04:53:38 -07:00
Simon Howard
3e0dc2d65c Fix warnings introduced by previous commits. 2018-09-09 18:54:20 -04:00
Simon Howard
b695b71233 iwad: Check executable location for IWADs.
This adds an additional search path when looking for IWADs - in addition
to checking the current working directory, also look in the directory
where the program executable is located.

To give some context for why I'm adding this: apparently there's a small
number of users who do something very unpleasant that I'd really prefer
they didn't: they "install" Chocolate Doom into Steam by replacing
dosbox.exe from their Steam installation of Doom with a renamed version
of `chocolate-doom.exe`. Yuck, I don't approve - it's a grotesque hack.

This works but it has a bug: Chocolate Doom picks up the Steam IWADs
from Windows registry keys. This means that it always starts doom2.wad,
and launching "Ultimate Doom" will actually launch Doom II. This solves
that problem, and while I don't approve of dumb Steam hacks, the change
itself is reasonable and it's an eminently sensible place to look for an
IWAD file.
2018-09-09 18:45:23 -04:00
Simon Howard
b34edc6d3e Convert various bits of code to M_{Dir,Base}Name.
The new functions significantly improve readability and I'm pretty
sure that most of these changes produce logic that is equivalent to
the existing logic.
2018-09-09 18:44:18 -04:00
Simon Howard
ae8c1ed2e0 misc: Add M_{Dir,Base}Name utility functions.
These extract the directory / base filename, equivalent to the Unix
`dirname` / `basename` commands. Repeated code throughout the codebase
seems to reimplement this particular functionality.
2018-09-09 18:36:47 -04:00
Fabian Greffrath
de9163ef53 config: let GetDefaultConfigDir() never return NULL
Fixes #1083, thanks @Pickle
2018-09-04 15:32:34 +02:00
Toni Spets
1641969b57 doom: Refactor wipe to advance once per frame 2018-08-24 16:22:52 +03:00
Simon Howard
28e726147a
Merge pull request #1075 from turol/const
More const correctness
2018-08-18 00:48:19 -04:00
Simon Howard
9ea4b024c2
Merge pull request #1079 from hifi/fix-setup-crash
setup: Use proper function signatures for callbacks
2018-08-18 00:47:56 -04:00
Jonathan Dowland
98f4af33f4
Merge pull request #1077 from hifi/fix-joystick-event-skip
doom: Don't skip joy events when menu is closed
2018-08-15 18:21:45 +01:00
Toni Spets
2d68e0791c setup: Use proper function signatures for callbacks
This prevents the setup main menu from crashing when the caller
does not clean the stack.
2018-08-15 19:52:30 +03:00
Toni Spets
078673f730 doom: Don't skip joy events when menu is closed
Fixes #1015.
2018-08-12 12:00:39 +03:00
Simon Howard
dd78c0873e
Merge pull request #1074 from AXDOOMER/master
Heretic: Fix P_FindNextHighestFloor's behavior
2018-08-11 13:02:27 -04:00
Turo Lamminen
3bd1270c48 hexen: Fix constness issues in DrawClassMenu 2018-08-07 18:45:58 +03:00
Turo Lamminen
a901b7a5b6 hexen: Fix constness issue in MN_Drawer 2018-08-07 18:45:11 +03:00
Turo Lamminen
1e71555aa5 hexen: Make QuitEndMsg contents const 2018-08-07 18:45:11 +03:00
Turo Lamminen
dcc753fbfc hexen: Make GammaText contents const 2018-08-07 18:45:11 +03:00