summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2014-10-07Allow multiple substitute mappings for music tracks.Simon Howard
For the Hexen substitute mapping configuration file, it's desirable to be able to include two mappings for each music lump: a straight high quality recording of that lump, and the recording that was included on the Hexen CD audio tracks. So allow multiple mappings so that we can fall back to try other filenames if the first choice file doesn't appear to exist.
2014-10-06terminate the destination string in M_StringReplace()Fabian Greffrath
fixes #428
2014-10-01Merge branch 'master' of github.com:chocolate-doom/chocolate-doomSimon Howard
2014-10-01hexen: Add workaround for Mac Hexen IWAD.Simon Howard
The Mac version of hexen.wad is slightly different from the normal DOS one: it contains a bunch of extra lumps but more importantly, the GENMIDI and DMXGUS lumps are missing. This means that Chocolate Hexen would crash on startup with the default settings (as OPL is the default music output). To work around this problem and allow the game to start up properly, detect if the required lump is missing and adjust the music settings, printing a helpful message to stdout to inform the user.
2014-09-24Upstream fix to torpedo weapon changingJames Haley
Use of the wrong enum value as an index into weaponinfo left the torpedo's selectability accidentally relying on you having 30 or more rockets instead of cells. Verified against binary as a choco error.
2014-09-19Upstream fixes to stair building issuesJames Haley
First sector moved instantly for buildDown16 stairs due to neglect of using direction instead of constant 1. Also found that Strife clears the tag of the first stair sector.
2014-09-18Upstream bug fix to teleport beacon allegianceJames Haley
Was not propagating properly from player to beacon to rebels due to mistranslated assembly code; access to wrong structure.
2014-09-15deh_main.c: fix "warning: implicit declaration of function ‘I_Error’"Fabian Greffrath
2014-09-13Update NEWS.Simon Howard
2014-09-13Add vld_ prefix for vldoor_e enum values.Simon Howard
It was pointed out to me recently that vldoor_e has enum values named 'open' and 'close'. These can potentially conflict with POSIX standard functions that have the same names, if the right header files are included. This doesn't currently cause any problems. However, to avoid any possibility of a conflict occurring if a different compiler is used, add a vld_ prefix to all the enum values, to namespace them.
2014-09-13dehacked: Load Freedoom DEHACKED lump on startup.Simon Howard
If using one of the Freedoom IWADs, detect it by checking for the FREEDOOM lump, and then load its DEHACKED lump to apply the cosmetic string changes that it includes. In case we're using an old version of one of the Freedoom IWADs, don't bomb out with an error while parsing the DEHACKED lump.
2014-09-13dehacked: Set stricter scoping for magic comments.Simon Howard
Magic comments allow some of the Vanilla limits to be overridden, but they should only apply to the files in which they were defined. Reset the flag variables that control these overrides before every new Dehacked file is parsed, so that a flag set in one file cannot spill over into other files that are parsed subsequently.
2014-09-13dehacked: Fix BEX string expansions.Simon Howard
The Dehacked code must pass a special flag to DEH_ReadLine() when parsing the [STRINGS] section, so that lines can be escaped onto following lines. However, this flag value was calculated incorrectly. The BEX [STRINGS] section cannot be looked up at the start of parsing a Dehacked file, because GetSectionByName() will return NULL for it (extended strings are not available yet). Instead, simplify the logic to look at the name of the current section and check that way.
2014-09-13Add support for the BEX extended string syntax.Simon Howard
Boom added an alternate method for overriding Dehacked strings, using the [STRINGS] section with special symbolic names for each of the strings that can possibly be replaced. This format is used in the Freedoom DEHACKED lump (deliberately, so that the Freedoom WAD does not include the original text to be replaced). As we want to have support for the Freedoom IWADs with Chocolate Doom, add support for the BEX [STRINGS] section, but protected by a magic comment that must be included in Dehacked/BEX files that use it. Thanks to Fabian Greffrath for implementing this.
2014-09-11simplify and generalize deh_allow_extended_strings usageFabian Greffrath
2014-09-11improvements to the [STRINGS] section parserFabian Greffrath
- restructure DEH_ReadLine() to avoid use of "goto" - bex_string_t type name ends in "_t" - declare constant table as "static const" - add magic comment *allow-extended-strings* and corresponding variable deh_allow_extended_strings - fix logical error when no [STRINGS] section is registered to which corrent_section could be compared
2014-09-08add parser for [STRINGS] sections in BEX filesFabian Greffrath
2014-08-30Merge pull request #429 from Nik1895/patch-1Simon Howard
Update setup.vcproj
2014-08-30Update setup.vcprojNik1895
Need to include the missing files in the setup project: txt_joyaxis.h and txt_joyaxis.c. Without this, setup won't compile, complain about unresolved external symbol.
2014-08-24setup: Add gamepad config for Buffalo Classic Gamepad.Simon Howard
The Buffalo Classic USB Gamepad is a USB gamepad that resembles the classic SNES controller. Thansk to Fabian Greffrath for sending in the report.
2014-08-18setup: Add config for Multilaser JS030 gamepad.Simon Howard
Thanks to "Absolute Zero" for the report with the gamepad settings.
2014-08-17Merge branch 'master' of github.com:chocolate-doom/chocolate-doomSimon Howard
2014-08-17setup: Add gamepad config for XBOX One controller.Simon Howard
The XBOX One controller apparently appears identical to the Xbox 360 controller. Thanks Brad Harding.
2014-08-16Fix finding of voices.wad when -iwad is only hintJames Haley
Somebody broke this by using sizeof() on a malloc'd char *
2014-08-16Warning fixes (23 remain...)James Haley
2014-08-13Merge branch 'master' of github.com:chocolate-doom/chocolate-doomSimon Howard
2014-08-05Merge branch 'master' of https://github.com/chocolate-doom/chocolate-doomFabian Greffrath
2014-08-05call InitializeSections() in DEH_LoadLump()Fabian Greffrath
apparently, this has been forgotten before, so DEH_PointerInit() was not executed which meant that *some* DEHACKED patches would not work when loaded from within a PWAD but would work when extracted from that WAD and loaded via -deh. fixes #421
2014-07-15free() some allocated bytesFabian Greffrath
Thanks valgrind!
2014-06-18Move extern definitions for p_map.c to p_local.hFabian Greffrath
This fixes conflicting array sizes for the variable "spechit" as reported in https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=748393. Fixes #414
2014-06-13Merge pull request #411 from chungy/ignoreSimon Howard
Ignore some more autogenerated files
2014-06-13Merge pull request #410 from chungy/desktopSimon Howard
Add desktop entries for all the games, make the Setup launch generic
2014-06-12Ignore some more autogenerated filesMike Swanson
2014-06-12Add desktop entries for all the games, make the Setup launch genericMike Swanson
The same icon is used for all four games, even though it's designed to resemble Doom's logo and looks a bit silly with all of them lined up. Also the Setup Desktop Entry now only launches chocolate-setup, which then prompts for the game to configure. This avoids cluttering up a DE's Preferences menu, control panel, or however it will be displayed.
2014-06-05Make vcproj release settings consistentJames Haley
Max optimization settings for release that were derived from Eternity are now effective for all 4 games. In addition, generate map files for debugging purposes.
2014-05-26setup: Add default config for Xbox360 on Linux.Simon Howard
The Xbox360 controller is handled differently by different operating systems, and the layout is different on Linux to Windows. Detect the Linux layout and set some appropriate defaults.
2014-05-17setup: Tweak joystick axis widget.Simon Howard
Reduce the width slightly (the previous size was excessively wide) and tweak "none" string to match the joystick button widget.
2014-05-16setup: Don't leave joystick subsystem running.Simon Howard
Only init the joystick subsystem when we need to call the joystick API functions, and quit the subsystem when we are finished. This avoids conflicts with the joystick widgets that quit the subsystem while the main code relies on it running. This fixes a bug where trying to calibrate the joystick twice would fail on the second attempt.
2014-05-16setup: Factor out axis configuration to widget.Simon Howard
Move code for configuring joystick axes into a separate widget, and add axis widgets to the configuration window for all possible movement.
2014-05-12PHILOSOPHY: Add section on compatibility.Simon Howard
Add a section that discusses the different ways in which Chocolate Doom aims for Vanilla compatibility (expanded version of the brief description in README). Perform some minor rewording of the existing text and add a reference to the philosophy file in README.
2014-05-12NEWS: Tweak text for next version.Simon Howard
Add reference to PHILOSOPHY file.
2014-05-12opl: Handle negative time division values.Simon Howard
A negative time division file indicates the MIDI file uses SMPTE time rather than the normal time system. This is not supported yet, but for the time being, return a sensible time division value that doesn't cause the sound to stutter and the game to become unplayable. This fixes #352, although the affected MIDIs do not yet play properly.
2014-05-11NEWS: Add preliminary notes for next version.Simon Howard
This is a summary of changes since v2.0.0.
2014-05-11Merge pull request #405 from alexey-lysiuk/fix_msvc_buildSimon Howard
Fix build with MSVC2008
2014-05-11Update MSVC2008 projects and solutionalexey.lysiuk
2014-05-11Fix compilation with MSVC2008alexey.lysiuk
2014-05-11Merge pull request #401 from alexey-lysiuk/clang_build_fixSimon Howard
Fix compilation error with Clang
2014-05-11Merge pull request #403 from alexey-lysiuk/hexen_demo1_desyncSimon Howard
hexen: Fix desync of demo1 on some platforms/compilers
2014-05-11Merge branch 'master' of github.com:chocolate-doom/chocolate-doomSimon Howard
2014-05-11opl: Change library to use us instead of ms.Simon Howard
Multi-track MIDI files are played back using separate callback chains for each track, and this introduces the possibility of one track becoming out of sync with the others. This was noticeable in WADs that use multi-track MIDIs, such as Alien Vendetta. Increase the timing resolution to microsecond precision to fix this.