d962a7810d
- deleted unused headers
2019-10-27 22:15:21 +01:00
cee194fd05
- removed the MACT scriplib after completing the config transition.
2019-10-27 17:31:23 +01:00
aebd22eea8
This makes more sense
2019-10-27 16:54:25 +01:00
5a087b1768
Add gModernMap guard
2019-10-27 16:54:24 +01:00
bfea07570a
- mapped the remaining Shadow Warrior options to the CVARs.
2019-10-27 16:53:00 +01:00
2e7ba30068
- a bit more config cleanup.
2019-10-27 14:09:56 +01:00
5386366ec4
- fix for last commit.
2019-10-27 13:48:03 +01:00
441bd25ca5
feature: option to show voxels instead of sprites for showing weapon ( #233 )
...
# Conflicts:
# source/blood/src/controls.cpp
# source/blood/src/menu.cpp
# source/blood/src/osdcmd.cpp
2019-10-27 13:47:01 +01:00
c0d5ca8ab8
- Config work almost done.
...
The only thing still referencing the old config file is Shadow Warrior's config read function.
2019-10-27 13:40:24 +01:00
038c1ba4ba
- more CVARs.
2019-10-27 09:53:09 +01:00
cdc5044f07
- converted noautoload and forcesetup flags to CVARs.
2019-10-27 09:38:55 +01:00
4b5ec2aabb
- transitioned the combat macros to the new config and made them independent for all games, so that everything can use the original text. (But considering that they are a multiplayer feature I'm not sure how much that is worth.)
...
- sort the config output alphabetically.
- do not use [=] as key names for the bindings.
2019-10-27 08:14:58 +01:00
7023e1e992
- store game vars in the new config file.
2019-10-27 00:29:46 +02:00
249f6e9d62
- consolidated the joystick and mouse setup code.
2019-10-26 23:45:55 +02:00
b2d7179dbe
- consolidated the 4 sets of mouse and joystick configuration variables.
2019-10-26 21:50:49 +02:00
70a7d1bd82
- save all bound keys, not only the one with commands that have both slots assigned.
2019-10-26 21:16:23 +02:00
db1a9a9363
- the config finally get saved.
...
Still with a few errors, though.
2019-10-26 20:47:37 +02:00
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
f53c9f6947
- save stuff to the new config.
2019-10-26 19:24:46 +02:00
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
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
1e0d49f947
- game starts again.
2019-10-26 13:16:32 +02:00
bcf3385ddf
randomize ejecting brass and shell angle on the ground ( #230 )
2019-10-26 10:35:15 +02:00
3cd44c89f5
Commented system message in OperateSprite()
2019-10-26 10:35:14 +02:00
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
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
0d878a8604
- some needed cleanup on the control code before testing can start.
2019-10-26 10:16:39 +02:00
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
47acdae8e6
- moved binding files to subdirectory
...
- fixed search/replace error.
2019-10-26 09:05:17 +02:00
cfaafcede7
- everything compiles again (not tested yet.)
2019-10-26 00:32:49 +02:00
c3dc4f35be
- cleanup and license added.
2019-10-25 19:07:14 +02:00
6f6c850d80
- fixed some search&replace errors
2019-10-25 19:02:27 +02:00
918d121d99
- fixed missing include paths
2019-10-25 02:07:46 +02:00
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
60fc828a89
- converted the 3 new CVARs in the audio code.
2019-10-25 02:01:36 +02:00
e8cf6c3d32
- fixed mus_device CVar and reenabled WinMM device.
2019-10-24 21:02:07 +02:00
9648c026a9
- small adjustments
2019-10-24 20:36:18 +02:00
8730ce552b
- make things compile again.
...
Let's hope it still works...
2019-10-24 20:28:46 +02:00
082fcfeef0
- manual update of audiolib
2019-10-24 19:59:09 +02:00
df415605ae
Use gameHandleEvents for time updating
...
# Conflicts:
# source/blood/src/gui.cpp
2019-10-24 19:49:57 +02:00
01d63d19e9
Fix crash with WinMM driver
2019-10-24 19:49:51 +02:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
4ff4fddf62
The constening
...
git-svn-id: https://svn.eduke32.com/eduke32@8224 1a8010ca-5511-0410-912e-c29ae57300e0
# Conflicts:
# source/audiolib/include/al_midi.h
2019-10-24 19:26:23 +02:00
ff10fdf929
Add mus_adlibstereo cvar to enable and disable AdLib stereo mode
...
git-svn-id: https://svn.eduke32.com/eduke32@8223 1a8010ca-5511-0410-912e-c29ae57300e0
2019-10-24 19:26:16 +02:00
8a61ceeb36
Add a cvar array for audiolib
...
git-svn-id: https://svn.eduke32.com/eduke32@8222 1a8010ca-5511-0410-912e-c29ae57300e0
2019-10-24 19:26:15 +02:00
a2ab5492cc
Further small midi cleanup changes--nothing functional
...
git-svn-id: https://svn.eduke32.com/eduke32@8221 1a8010ca-5511-0410-912e-c29ae57300e0
# Conflicts:
# source/audiolib/include/al_midi.h
# source/audiolib/src/_al_midi.h
2019-10-24 19:26:14 +02:00
6fa287c767
Further AdLib cleanup... leaving this in a separate commit in case I fucked something up
...
git-svn-id: https://svn.eduke32.com/eduke32@8220 1a8010ca-5511-0410-912e-c29ae57300e0
2019-10-24 19:25:49 +02:00
8eb5233232
Further audiolib work... I think this is almost done!
...
git-svn-id: https://svn.eduke32.com/eduke32@8219 1a8010ca-5511-0410-912e-c29ae57300e0
# Conflicts:
# GNUmakefile
# platform/Windows/audiolib.vcxproj
# platform/Windows/audiolib.vcxproj.filters
# platform/Windows/build.vcxproj
# platform/Windows/build.vcxproj.filters
# source/audiolib/include/al_midi.h
# source/audiolib/src/_al_midi.h
# source/duke3d/src/osdcmds.cpp
# source/duke3d/src/sounds.cpp
2019-10-24 19:25:48 +02:00
8a1681fb5a
More audiolib work
...
git-svn-id: https://svn.eduke32.com/eduke32@8218 1a8010ca-5511-0410-912e-c29ae57300e0
# Conflicts:
# source/audiolib/src/music.cpp
# Conflicts:
# GNUmakefile
# platform/Windows/audiolib.vcxproj
# platform/Windows/audiolib.vcxproj.filters
# source/duke3d/src/menus.cpp
2019-10-24 19:25:09 +02:00
8b20118026
Audiolib rework WIP
...
This attempts to rectify the differences between versions of JFAudiolib created after we forked the code, and the extra features contained in Nuke.YKT's fork of our version.
git-svn-id: https://svn.eduke32.com/eduke32@8216 1a8010ca-5511-0410-912e-c29ae57300e0
# Conflicts:
# GNUmakefile
# platform/Windows/audiolib.vcxproj
# platform/Windows/audiolib.vcxproj.filters
# platform/Windows/eduke32.vcxproj
# platform/Windows/eduke32.vcxproj.filters
# source/audiolib/include/fx_man.h
# source/audiolib/include/multivoc.h
# source/audiolib/src/flac.cpp
# source/audiolib/src/formats.cpp
# source/audiolib/src/fx_man.cpp
# source/audiolib/src/vorbis.cpp
# source/audiolib/src/xa.cpp
# source/audiolib/src/xmp.cpp
# source/duke3d/src/sounds_mapster32.cpp
# Conflicts:
# Common.mak
# GNUmakefile
# platform/Windows/audiolib.vcxproj
# platform/Windows/audiolib.vcxproj.filters
# platform/Windows/eduke32.vcxproj
# platform/Windows/eduke32.vcxproj.filters
# source/audiolib/include/multivoc.h
# source/audiolib/src/vorbis.cpp
# source/duke3d/src/config.cpp
# source/duke3d/src/game.h
# source/duke3d/src/osdcmds.cpp
# source/duke3d/src/sounds_mapster32.cpp
2019-10-24 19:24:31 +02:00
a1f08f2465
New files for audiolib
...
This is in a separate commit just to make the changes to existing files easier to go through.
git-svn-id: https://svn.eduke32.com/eduke32@8215 1a8010ca-5511-0410-912e-c29ae57300e0
# Conflicts:
# source/audiolib/include/midi.h
# source/audiolib/src/_midi.h
# source/audiolib/src/al_midi.cpp
# source/audiolib/src/midi.cpp
# source/audiolib/src/music.cpp
# source/audiolib/src/oplmidi.cpp
# source/duke3d/src/midi.cpp
# Conflicts:
# source/audiolib/src/al_midi.cpp
# source/audiolib/src/midi.cpp
# source/audiolib/src/music.cpp
2019-10-24 19:22:49 +02:00
d6e52ed526
Use SDL audiolib driver on Windows
...
This shitcans the SDL_mixer requirement but leaves platforms other than Windows without built-in MIDI playback capability until Nuke.YKT's OPL3 emulator is merged. This also reworks sdlmusic.cpp into music_external.cpp, including an untested port of the code to Windows.
git-svn-id: https://svn.eduke32.com/eduke32@8214 1a8010ca-5511-0410-912e-c29ae57300e0
# Conflicts:
# GNUmakefile
# platform/Windows/eduke32.vcxproj
# platform/Windows/props/build_common.props
# source/audiolib/src/sdlmusic.cpp
# Conflicts:
# Common.mak
# GNUmakefile
# platform/Windows/audiolib.vcxproj
# platform/Windows/eduke32.vcxproj
# platform/Windows/eduke32.vcxproj.filters
# platform/Windows/props/build_common.props
# source/audiolib/src/driver_sdl.cpp
# source/audiolib/src/sdlmusic.cpp
# source/build/include/vfs.h
# source/build/include/winbits.h
# source/build/src/winbits.cpp
2019-10-24 19:22:06 +02:00
c0b7745013
Misc audiolib cleanups
...
git-svn-id: https://svn.eduke32.com/eduke32@8213 1a8010ca-5511-0410-912e-c29ae57300e0
# Conflicts:
# source/audiolib/src/fx_man.cpp
# source/audiolib/src/multivoc.cpp
# Conflicts:
# source/audiolib/include/multivoc.h
# source/audiolib/src/multivoc.cpp
# source/audiolib/src/vorbis.cpp
2019-10-24 19:20:33 +02:00
89cd122d14
Initialize sound before music
...
git-svn-id: https://svn.eduke32.com/eduke32@8255 1a8010ca-5511-0410-912e-c29ae57300e0
2019-10-24 19:06:04 +02:00
3ed87f449e
- and the last 2 hud CVARS for Blood…
2019-10-24 01:41:55 +02:00
3efb54e167
- ported most of the remaining HUD CVars
2019-10-24 01:30:33 +02:00
966751b7e8
- added GZDoom's font code and some dependencies.
2019-10-24 01:20:58 +02:00
2fa5e339fc
- added GZDoom's 2D drawer to the project.
...
So that for anything new I don't have to bother with the awful 2D interface Build provides.
2019-10-23 22:51:11 +02:00
20df360778
- converted the Polymost CVARs.
2019-10-23 21:11:37 +02:00
c1041a9c37
- removed the unused DN3D menu code from the Blood subproject.
2019-10-23 19:08:41 +02:00
ee5f0a7cf6
- cleaned out the remains of the frontends' CVAR definitions.
2019-10-23 18:58:34 +02:00
20a393871b
fix compiler error: storage size of weaponQAV isn't known ( #226 )
2019-10-23 18:38:00 +02:00
c419fae31b
Fix compiling without OpenGL
2019-10-23 18:37:56 +02:00
0f67b74a53
SEQFRAME big endian fix
2019-10-23 18:37:55 +02:00
21d90fd08b
- fixed compilation.
2019-10-23 18:36:48 +02:00
02fff2df06
- refactored wchoice and sensitivity CVARS
...
This is all that's needed for now, the remaining ones can wait.
2019-10-23 17:21:14 +02:00
18430c6c9f
- refactored r_fpslimit
...
Also removed the entire cruft related to this - the pointless offsetting value and the precalculation of the timer value (as if we could not afford a single division for something that WAITS!
Unfortunately this required removal of the menu option for the time being.
2019-10-23 17:07:29 +02:00
7fd05edbba
- missed one
2019-10-23 14:39:46 +02:00
43413e4dff
- r_useprecache
2019-10-23 14:39:33 +02:00
63f020996e
- a few more CVARs
2019-10-23 01:30:43 +02:00
5dec4736ce
- r_drawweapon, r_showfps, r_showfpsperiod
2019-10-23 01:04:07 +02:00
e5d38b2d30
- in_mouseflip and in_mousesmoothing
...
in_mousemode removed from persistent state because of how it is used.
Saving it makes no sense.
2019-10-23 00:59:01 +02:00
b73cf76f05
- in_mousebias and in_mousedeadzone
...
Actually, two totally useless options being preserved for historical significance.
Urgh.
2019-10-23 00:55:48 +02:00
c0c62fe367
- in_mouseaiming
2019-10-23 00:51:49 +02:00
7501120dc8
- in_mouse and in_joystick
2019-10-23 00:41:28 +02:00
8f06f0748d
- minor CVAR cleanup and refactoring of one more
2019-10-23 00:30:51 +02:00
713250cc64
- refactored a few more CVARs.
2019-10-23 00:20:27 +02:00
d476037f45
- hooked up hud_custom.
2019-10-22 23:43:16 +02:00
fe2bb036b7
- fixed bad parameter.
2019-10-22 23:32:15 +02:00
e5aa6c5df0
- refactored the HUD scaling into something manageable.
...
Blood was fine, albeit with an inverted scale, but the EDuke implementation was something very special - and not in a good way, using 4 CVARs to store the scaling state instead of one.
2019-10-22 23:31:46 +02:00
b6c16abf6f
Refactor:
...
- PLAYER.H structs
- ACTOR.H structs
# Conflicts:
# source/blood/src/db.h
# source/blood/src/player.h
2019-10-22 17:49:59 +02:00
a829f1cb52
- fixed all compile errors.
2019-10-22 17:47:24 +02:00
Christoph Oelckers
nukeykt
CommonLoon102
ny00123
Grind Core
hendricks266
terminx
Szilárd Biró