Commit Graph

8606 Commits

Author SHA1 Message Date
Christoph Oelckers ef9f50aa12 - extracted all original combat macro texts from the original games.
Unlike EDuke32 the new config system can handle them per game. Usefulness is another matter, though.
2019-10-27 00:48:07 +02:00
Christoph Oelckers 7023e1e992 - store game vars in the new config file. 2019-10-27 00:29:46 +02:00
Christoph Oelckers 249f6e9d62 - consolidated the joystick and mouse setup code. 2019-10-26 23:45:55 +02:00
Christoph Oelckers b2d7179dbe - consolidated the 4 sets of mouse and joystick configuration variables. 2019-10-26 21:50:49 +02:00
Christoph Oelckers 70a7d1bd82 - save all bound keys, not only the one with commands that have both slots assigned. 2019-10-26 21:16:23 +02:00
Christoph Oelckers db1a9a9363 - the config finally get saved.
Still with a few errors, though.
2019-10-26 20:47:37 +02:00
ny00123 731671c401 Make the secondary backslash key of the standard 102-keys PC keyboard layout, also known as a "less than" key, usable. This is the key generally sitting in-between the left shift and Z keys, for the 102-keys QWERTY layout.
git-svn-id: https://svn.eduke32.com/eduke32@8265 1a8010ca-5511-0410-912e-c29ae57300e0
2019-10-26 19:29:13 +02:00
Christoph Oelckers f53c9f6947 - save stuff to the new config. 2019-10-26 19:24:46 +02:00
Christoph Oelckers 288b230ab8 - only let the CON script access the defaults of CVARs, not their actual value.
That allows using them for initialization but not for messing around with user settings.
2019-10-26 18:39:52 +02:00
Christoph Oelckers cd47582632 - disabled the settings.cfg console script so that the newly added config code can take over its duties.
- write the console log to the folder returned by M_GetDocumentsPath and not to the root game directory.
- removed G_ExtPreInit because it has become redundant. The search path setup will have to be redone anyway.
2019-10-26 13:41:42 +02:00
Christoph Oelckers 1e0d49f947 - game starts again. 2019-10-26 13:16:32 +02:00
Christoph Oelckers f1cdaf6054 - changed mismatching names in the binding files. 2019-10-26 11:32:39 +02:00
CommonLoon102 bcf3385ddf randomize ejecting brass and shell angle on the ground (#230) 2019-10-26 10:35:15 +02:00
Grind Core 3cd44c89f5 Commented system message in OperateSprite() 2019-10-26 10:35:14 +02:00
Grind Core b6ad64ee54 Refactor: xsector, xwall and xsprite structs
- Added QAV scene player (playing user animation instead of weapon)
- Added trigger event intiator for sprites (WIP and experimental)

# Conflicts:
#	source/blood/src/actor.h
#	source/blood/src/player.h
2019-10-26 10:35:13 +02:00
Christoph Oelckers 1c29169492 -perform a proper exit, i.e. make sure that the deinit code can run, by throwing a special exception and actually catching it in the main function. 2019-10-26 10:30:08 +02:00
Christoph Oelckers 0d878a8604 - some needed cleanup on the control code before testing can start. 2019-10-26 10:16:39 +02:00
Christoph Oelckers 5abc034540 - added a set of left handed key bindings because neither of the offerings is really good for that. 2019-10-26 09:22:49 +02:00
Christoph Oelckers 47acdae8e6 - moved binding files to subdirectory
- fixed search/replace error.
2019-10-26 09:05:17 +02:00
Christoph Oelckers cfaafcede7 - everything compiles again (not tested yet.) 2019-10-26 00:32:49 +02:00
Christoph Oelckers c3dc4f35be - cleanup and license added. 2019-10-25 19:07:14 +02:00
Christoph Oelckers 6f6c850d80 - fixed some search&replace errors 2019-10-25 19:02:27 +02:00
Christoph Oelckers 918d121d99 - fixed missing include paths 2019-10-25 02:07:46 +02:00
Christoph Oelckers 5cf5c74695 - let kopenFileReader have a look into demolition.pk3 if nothing else is found.
This should help as long as the old resource management is still in place.
2019-10-25 02:01:52 +02:00
Christoph Oelckers 60fc828a89 - converted the 3 new CVARs in the audio code. 2019-10-25 02:01:36 +02:00
Christoph Oelckers e8cf6c3d32 - fixed mus_device CVar and reenabled WinMM device. 2019-10-24 21:02:07 +02:00
Christoph Oelckers 9648c026a9 - small adjustments 2019-10-24 20:36:18 +02:00
Christoph Oelckers 8730ce552b - make things compile again.
Let's hope it still works...
2019-10-24 20:28:46 +02:00
Christoph Oelckers 082fcfeef0 - manual update of audiolib 2019-10-24 19:59:09 +02:00
nukeykt df415605ae Use gameHandleEvents for time updating
# Conflicts:
#	source/blood/src/gui.cpp
2019-10-24 19:49:57 +02:00
nukeykt 01d63d19e9 Fix crash with WinMM driver 2019-10-24 19:49:51 +02:00
nukeykt 7f094d3a73 Fix music init code
# Conflicts:
#	source/blood/src/config.cpp
#	source/blood/src/menu.cpp
#	source/blood/src/osdcmd.cpp
2019-10-24 19:49:50 +02:00
nukeykt e6f53f7c30 Resolve merge issues
# Conflicts:
#	GNUmakefile
#	platform/Windows/eduke32.sln
#	platform/Windows/props/build_common.props
#	source/audiolib/include/music.h
#	source/blood/src/blood.cpp
#	source/blood/src/gui.cpp
#	source/blood/src/mapedit.cpp
#	source/blood/src/sound.cpp
#	source/build/include/vfs.h
#	source/build/src/vfs.cpp
2019-10-24 19:48:11 +02:00
hendricks266 4ca1af72c3 SW: Load swtimbr.tmb
git-svn-id: https://svn.eduke32.com/eduke32@8262 1a8010ca-5511-0410-912e-c29ae57300e0

# Conflicts:
#	source/sw/src/sounds.cpp
2019-10-24 19:46:29 +02:00
hendricks266 c6c7c91d7c Add MIDI_GetDevice and use it so that the default driver value doesn't show as "Custom" in the menu
git-svn-id: https://svn.eduke32.com/eduke32@8261 1a8010ca-5511-0410-912e-c29ae57300e0
2019-10-24 19:44:22 +02:00
hendricks266 7650cbe592 Fix calls to FX_ErrorString and MUSIC_ErrorString
git-svn-id: https://svn.eduke32.com/eduke32@8260 1a8010ca-5511-0410-912e-c29ae57300e0

# Conflicts:
#	source/duke3d/src/sounds.cpp
#	source/duke3d/src/sounds_mapster32.cpp
#	source/sw/src/sounds.cpp
2019-10-24 19:44:21 +02:00
hendricks266 553dfb3544 Prefer early return on error in sound and MIDI init functions
git-svn-id: https://svn.eduke32.com/eduke32@8259 1a8010ca-5511-0410-912e-c29ae57300e0

# Conflicts:
#	source/duke3d/src/sounds.cpp
#	source/duke3d/src/sounds_mapster32.cpp
#	source/sw/src/sounds.cpp
2019-10-24 19:43:51 +02:00
hendricks266 14996d930b Prefer "MIDI driver" to "Music device"
git-svn-id: https://svn.eduke32.com/eduke32@8258 1a8010ca-5511-0410-912e-c29ae57300e0

# Conflicts:
#	source/duke3d/src/sounds_mapster32.cpp
#	source/sw/src/sounds.cpp
2019-10-24 19:42:54 +02:00
hendricks266 55744eff09 Remove second EMIDICard / ForceEMIDI parameter from MUSIC_Init which only served to clobber the value entered using the cvar
git-svn-id: https://svn.eduke32.com/eduke32@8257 1a8010ca-5511-0410-912e-c29ae57300e0
2019-10-24 19:41:50 +02:00
hendricks266 9215812ed6 Remove obsolete comments now that the MIDI objects are back in their rightful location
git-svn-id: https://svn.eduke32.com/eduke32@8254 1a8010ca-5511-0410-912e-c29ae57300e0
2019-10-24 19:41:34 +02:00
terminx d1ccbab5ea Boost OPL3 output to about the level of WinMM
git-svn-id: https://svn.eduke32.com/eduke32@8240 1a8010ca-5511-0410-912e-c29ae57300e0
2019-10-24 19:28:16 +02:00
terminx 8827a0e84b Retain friendly names for audiolib drivers disabled at compile time
git-svn-id: https://svn.eduke32.com/eduke32@8239 1a8010ca-5511-0410-912e-c29ae57300e0
2019-10-24 19:28:15 +02:00
terminx dafd71c72f Add mus_al_additive to control the behavior mentioned in r8232 and rename mus_adlibstereo to mus_al_stereo
git-svn-id: https://svn.eduke32.com/eduke32@8238 1a8010ca-5511-0410-912e-c29ae57300e0
2019-10-24 19:28:14 +02:00
terminx e82ddb23d3 Better stereo suppport in OPL3 emulator
Patch from Nuke.YKT

git-svn-id: https://svn.eduke32.com/eduke32@8237 1a8010ca-5511-0410-912e-c29ae57300e0

# Conflicts:
#	source/audiolib/include/opl3.h
#	source/audiolib/src/opl3.cpp
2019-10-24 19:28:13 +02:00
terminx 9b97f504bb Fix issue with tempo when changing back and forth between OPL3 and WinMM MIDI output
git-svn-id: https://svn.eduke32.com/eduke32@8236 1a8010ca-5511-0410-912e-c29ae57300e0
2019-10-24 19:27:57 +02:00
terminx 5de8dad179 Fix mus_adlibstereo
git-svn-id: https://svn.eduke32.com/eduke32@8233 1a8010ca-5511-0410-912e-c29ae57300e0

# Conflicts:
#	source/audiolib/include/al_midi.h
2019-10-24 19:27:22 +02:00
terminx 247e6bcc26 Revert a copy/paste error fix in the AdLib code because the fixed version doesn't work right with the timbres Blood ships with
git-svn-id: https://svn.eduke32.com/eduke32@8232 1a8010ca-5511-0410-912e-c29ae57300e0
2019-10-24 19:27:17 +02:00
terminx f0acbc1ca5 Fix AdLib timbre loading
git-svn-id: https://svn.eduke32.com/eduke32@8231 1a8010ca-5511-0410-912e-c29ae57300e0
2019-10-24 19:27:16 +02:00
terminx 47942db0a3 Fix min/max values for audiolib cvars
git-svn-id: https://svn.eduke32.com/eduke32@8230 1a8010ca-5511-0410-912e-c29ae57300e0

# Conflicts:
#	source/audiolib/include/al_midi.h
2019-10-24 19:27:15 +02:00
terminx 5853fe1cc6 Prefer uint32_t over unsigned int
git-svn-id: https://svn.eduke32.com/eduke32@8225 1a8010ca-5511-0410-912e-c29ae57300e0

# Conflicts:
#	source/audiolib/src/_al_midi.h
2019-10-24 19:26:30 +02:00