bd95c5eadf
- fixed: the ambient sound things need both the args from the DoomEdNum mapping and the actual map.
2016-01-04 11:52:07 +01:00
02ff3291bd
Fixed division by zero in RNG
...
Random number generator now returns zero for range [0, 0)
2016-01-04 12:16:09 +02:00
699f274b06
Fixed mouse cursor centering in fullscreen mode
...
Native OS X backed didn't center mouse cursor in fullscreen mode with Retina/HiDPI support enabled
Incorrect size of content view led to placement of cursor in upper right corner of the screen upon releasing of mouse capture
When some action is assigned to this corner using system Hot Corners feature, the given action was triggered on acquiring mouse capture
2016-01-04 10:51:54 +02:00
772a572431
Merge branch 'master' of https://github.com/rheit/zdoom
2016-01-03 11:32:39 +01:00
a75e65a3d8
- added BLOCKF_SOUND to flag list supported by Line_SetBlocking,
2016-01-03 11:32:23 +01:00
77013877d1
A_WeaponReady Fix
...
- Zoom and Reload keys triggered the other states instead of themselves (i.e. zoom keybind triggered reload states instead of zoom)
2016-01-02 11:27:02 -06:00
c86cd53753
Merge branch 'master' of https://github.com/crimsondusk/zdoom into crimsondusk-master
...
Conflicts:
src/am_map.cpp
2015-12-31 20:18:54 -06:00
1d759283c0
Cleanup the zoom/reload/userX handling for A_WeaponReady
...
- There was lots of code duplication. Consolidated it.
- Renamed WRF_UserX to WRF_AllowUserX for consistancy.
2015-12-31 16:46:19 -06:00
4931c90839
Bump save version for bigger WeaponState property
2015-12-31 16:46:18 -06:00
3566d3157a
Use | instead of +.
2015-12-31 16:46:17 -06:00
6478b98eea
Update serialization to BYTE from WORD for older save games.
2015-12-31 16:46:17 -06:00
b09a81126f
- Changed WeaponState from 8-bit to 16-bit integer.
...
- Because the flags for WF_USER#OK are 256 on up, this is required in order to work.
2015-12-31 16:46:17 -06:00
eed6680a67
Added support for weapon states User#.
...
- Added keybinds for the user state triggering.
- Added WRF_USER# flags which must be specified in order to use.
- # can be 1-4.
2015-12-31 16:46:16 -06:00
addd059410
Merge branch 'master' of https://github.com/rheit/zdoom
2015-12-31 23:05:13 +01:00
5e975ac9f6
- extended $mididevice to add an optional parameter, which has the following meaning for the different MIDI devices:
...
* OPL: specify the core to use for playing this song
* FluidSynth: specify a soundfont that should be used for playing the song.
* WildMidi: specify a config file that should be used for playing the song.
* Timidity++: specify an executable that should be used for playing the song. At least under Windows this allows using Timidity++ with different configs if the executable and each single config are placed in different directories.
* GUS: currently not operational, but should later also specify the config. This will need some work, because right now this is initialized only when the sound system is initialized.
* all other: no function.
These options should mainly be for end users who want to fine-tune how to play the music.
2015-12-31 23:03:53 +01:00
d8af2e558f
Fix potentiol buffer overrun in MUSSong2::Precache()
2015-12-31 15:28:18 -06:00
1316120fe4
- fixed: The MUS precacher did not handle invalid patches well.
...
- increased the valid range of patch values for MUS. According to the original MIDI2MUS code it can handle numbers up to 188, not 181, and at least one track from Eternal Doom uses #183 .
2015-12-31 14:35:34 +01:00
c88ed426a8
- oops, this somehow lost the shift operator...
2015-12-30 20:39:38 +01:00
3c40d71c20
- hopefully fixed the MUS precaching for good.
...
According to blzut3, it looks like it is a byte followed by a variable length field. It can be any value 0-15 and will be followed by that many bytes one for each bank used. If the bank count is 0 then it is shorthand for using one bank (bank 0).
2015-12-30 20:32:19 +01:00
be6daf5d78
- changed instrument lookup in MUS files.
...
Based on evidence from several songs in Eternal Doom the description in all known documents is wrong. The instruments are not stored in a 16-bit word but in an 8-bit byte, followed by some variable size data.
Known variations are:
* second byte is 0 - no additional data follows
* second byte is 1 - a third byte for the 'bank' value follows.
2015-12-30 19:13:28 +01:00
a2b377c580
- Fixed Clang errors/warnings on wildMIDI code.
2015-12-30 10:58:52 +01:00
aff42a6186
- don't look up a lump name in PathExpander if we are only looking for real files.
2015-12-30 10:21:17 +01:00
1def61e3e3
- allow changing the reverb and resampling mode setting for WildMidi.
...
- fixed: WildMidi did not initialize the reverb data structures.
- removed the menu option for midi_timiditylike.
2015-12-30 10:14:18 +01:00
6c13ba40ac
Fix for __unix__ compilation -- section not changed with the rest of fe2dcfd588
2015-12-30 01:09:11 -06:00
3ec6ad5018
Add SysEx retrieval to the MIDI file reader
2015-12-29 22:39:38 -06:00
92e0bbeee9
Handle WildMidi's supported SysEx messages
2015-12-29 18:25:13 -06:00
6d2e93254f
Fix CreateSMF's SysEx writing
...
- It was wrong before. It might still be wrong, but at least it doesn't
look obviously wrong anymore.
2015-12-29 17:55:20 -06:00
545e2f7c69
Slap WildMidi onto snd_listmididevices's output for Windows
2015-12-29 17:55:20 -06:00
900937929e
Use critical sections for WildMidi locking
...
...because when you're trying to be thread-safe, it's generally a good
idea to use mechanisms that work across multiple processor cores.
2015-12-29 17:55:19 -06:00
14361d9313
Remove midi_timiditylike
...
- Did anybody actually use this? Use WildMidi instead if you want
something that sounds more like Timidity++ without actually being
Timidity++, since not even the old Timidity manages that.
2015-12-29 17:51:08 -06:00
0cc4bd56d1
- removed the original WildMidi loader and the main playback function because none of those is actually being used anymore.
2015-12-29 23:18:39 +01:00
c3862d9101
- use PathExpander class for WildMidi's file access functions so that it can find Timdity's data on its own.
2015-12-29 21:18:46 +01:00
fe2dcfd588
- refactored the GUS/Timidity player's path building code so that it can also be used by WildMidi.
...
- fixed crash during sound reset - in this case I_ShutdownMusic should not close the WildMidi player.
2015-12-29 20:38:08 +01:00
0634205d7f
- let WildMidi tokenizer handle quoted strings.
2015-12-29 18:01:15 +01:00
7fa289109b
- removed all uses of __builtin_expect from WildMidi code.
2015-12-29 11:36:56 +01:00
944360557f
- removed unused header stuff.
2015-12-29 11:23:43 +01:00
7c82c576a3
- Fixed Linux compiler errors and snd_mididevice.
...
-- errno.h is required for 'errno';
-- don't use str(n)casecmp and rely on ZDoom CMake handling;
-- add a missing parenthesis around a 'signed char' cast;
-- remove an unneeded GNU_SOURCE redefinition;
-- the non-MSVC side of snd_mididevice was not adapted to the new code, making wildmidi unavailable through the menu.
2015-12-29 10:33:20 +01:00
afc36544b7
Add a WildMidi softsynth device
...
- This removes the preceding psuedo MIDI device for WildMidi.
2015-12-28 22:16:35 -06:00
ee46799d9e
Fix WM_DoGetOutput for big-endian machines
...
- Besides being little-endian centric, this bit shifting madness
was unneccessary since the values were already clamped to a 16-bit
range, so all we need to do is cast them to a short.
2015-12-28 20:51:53 -06:00
b1405921bf
Merged WM_GetOutput_Linear and WM_GetOutput_Gauss into WM_DoGetOutput
...
- With mixing moved into separate functions, these two functions became
identical except for the function they called to do mixing.
2015-12-28 20:44:10 -06:00
635b496165
Separate WildMidi mixing from event handling
...
- In order to use ZDoom's own MIDI sequencer event handling must be
completely separate from mixing, but WildMidi had them intertwined
because it wasn't designed for external sequencers.
- Also remove all 'long's defining the output buffers to avoid having
something that's 32 bits wide on Windows and 64 bits wide on Linux.
2015-12-28 20:33:41 -06:00
a2ebf771d3
Remove '\r' character from beginning of WildMidi error messages
2015-12-28 19:13:34 -06:00
9d48c84ee3
Merge branch 'master' of https://github.com/rheit/zdoom
2015-12-28 21:24:41 +01:00
060a6b2ff2
- shut down WildMidi when exiting.
...
The pointless error message in WildMidi_Shutdown was removed to keep the rest of the code simple and allowing to call this even when the device never was used.
2015-12-28 21:23:21 +01:00
a94120b6a4
Merge branch 'master' into WildMidi
2015-12-28 21:01:17 +01:00
5346b813da
Re-do GTK2_LIBARY_DIRS inclusion on a separate branch
2015-12-27 09:48:22 -06:00
1070bd9beb
- fixed: APlayerPawn::ViewHeight wasn't stored in savegames.
2015-12-26 16:17:56 +01:00
05b8e275cd
Merge branch 'master' of https://github.com/rheit/zdoom
2015-12-26 15:33:11 +01:00
400038643c
- fixed: Strife dialogues could crash on invalid links.
2015-12-26 15:31:59 +01:00
c51abb0161
Added GetMaxInventory ACS function
2015-12-22 19:01:09 +03:00
03ccf03b8f
- fixed: UDMF with Doom format specials used the line's ID, not the first arg as the tag parameter for its special.
2015-12-21 01:13:21 +01:00
792d3906fd
- fixed: line activation checks for monster activation could be skipped if the lines also were flagged for player activation.
2015-12-19 20:32:41 +01:00
9176d75580
Fix incorrect small font rendering with Hexen Mac IWAD
...
Unused high resolution font lumps broke composite font logic
Small font had doubled height because of that, at least alternate HUD and inter-hub text messages had noticeable visual issues
2015-12-14 11:47:46 +02:00
7c6237e134
<stdlib.h> has replaced <malloc.h> on FreeBSD as well
2015-12-10 21:24:37 -06:00
94c397b868
Merge pull request #435 from Edward850/pauseext-fix
...
Fix lost focus loosing network data
2015-12-07 12:52:23 +01:00
964ee6bb23
- Worked around issue where stat doesn't work in v140_xp. Even though the bug was supposedly fixed for awhile now it didn't make it into Update 1.
2015-12-07 04:49:40 -05:00
72d4c33453
- Removed GetAspectRatio as the implementation was highly fragile. Even if converted to giving the ratio, I have strong concerns about having this function built in without ZDoom supporting arbitrary aspect ratios as the odds of people checking against the hard coded constants seems high. The existing ACS version of this function returns fixed point ratios (because why not) and I fully expected people to use a switch statement when writing it.
2015-12-07 01:18:56 -05:00
62d41a58a8
Merge branch 'DecProx3' of git://github.com/MajorCooke/zdoom into master
2015-12-07 00:53:06 -05:00
a0d6b05707
Merge branch 'master' of https://github.com/rheit/zdoom
2015-12-06 09:59:41 +01:00
ad0e71942d
- added GetAspectRatio function to ACS.
...
- added a sixth parameter for SetHUDClipRect so that the forced aspect ratio fudging this function performs can be disabled.
2015-12-06 09:59:02 +01:00
542a108914
3D floor support for check switch range
2015-12-05 00:26:39 +01:00
f90ce1308e
Fix lost focus loosing network data
...
- Prevented focus loss from dropping network data during level
transitions
- Fixed delay counter underflows
2015-12-03 16:40:47 +13:00
81f521fe56
- fixed: Texture precaching from MAPINFO was broken
...
The code assumed that it had access to the texture manager but that gets initialized after MAPINFO, which means that MAPINFO can only store the texture names and let the precaching code resolve the actual textures.
2015-12-02 22:31:27 +01:00
4adf421513
Fix incomplete assignment operator of FSkillInfo
...
See http://forum.zdoom.org/viewtopic.php?t=50026
2015-12-01 14:30:57 +02:00
724445354c
- add the WildMidiMIDIDevice CPP file.
2015-12-01 10:39:22 +01:00
8594bfaa8b
A_CustomPunch Extension
...
- Added Melee/Miss parameters just like A_CustomMeleeAttack.
2015-11-30 11:42:08 -06:00
f4a60f29f3
- added missing sc.MustGetString() to 'optional' case of decal parser.
2015-11-30 09:21:45 +01:00
c9e4f120e7
- forgot to save this before committing.
2015-11-29 15:27:20 +01:00
f7cdb28eac
- added a HealthFactor skill property.
2015-11-29 12:58:17 +01:00
106886a9bb
- allow setting the ice translation with Thing_SetTranslation.
...
This requires passing a magic value because this translation is defined differently than all the rest which can be used in ACS.
2015-11-29 12:30:50 +01:00
1ad02a6ce8
- allow specifying infighting through skills.
2015-11-29 12:10:12 +01:00
1a0faf4761
- allow optional decal generator definitions.
2015-11-29 11:41:14 +01:00
5515cb02a6
- fixed incorrect error method call in decal parser.
2015-11-29 11:35:12 +01:00
9bfd676783
- allow setting the FloatbobPhase through UDMF.
2015-11-29 11:28:26 +01:00
3682924249
- removed redundant parameter
2015-11-29 11:27:08 +01:00
a03b947729
- WildMidi generally working, some cleanup left to do...
2015-11-28 20:58:14 +01:00
4fb48b332b
Added A_CheckProximity.
...
- Checks to see if a certain actor class, in numbers, is close to the actor/pointer via distance, based upon count. Can check for ancestry, disable Z searching, perform less than or equal to instead of greater or equal to, exact counts, check a pointer instead of itself and differentiate between live monsters and dead.
2015-11-28 10:53:34 -06:00
eff2286bc9
- added WildMidi library sources - all converted to C++ so that they can later interface with ZDoom's own MIDI code. Also redid the file loading function to use ZDoom's FileReader instead of low level IO.
2015-11-28 17:38:40 +01:00
888f356e58
- use the recently added text input menu item to add the config file for GUS, the patch set for Fluidsynth and the timidity.exe path for Timidity++ to the menu. Even though there is no proper file select box, this is still better than nothing.
...
- changed the text input item so that it realigns itself to show the entire text when in text input mode.
2015-11-28 12:43:01 +01:00
3fadfec77d
- fixed typo in SendToCommunicator enhancement.
2015-11-28 00:43:39 +01:00
a55d85c51c
- do not wait infinitely for termination of the Timidity++ process. This can lock up the engine indefinitely if the child process fails to exit.
2015-11-27 12:12:08 +01:00
7e87216878
- fixed: r_visibility values >= 205 appear to cause fixed point overflows at least on 5:4 aspect ratio so they should be blocked.
2015-11-27 10:44:37 +01:00
fca469b053
- moved the notification messages for SendToCommunicator into LANGUAGE.
...
As a side effect this will now allow using custom messages with this function as well by using the arg2 parameter as part of the message's name (arg2=0 will use TXT_COMM0, arg1 TXT_COMM1 and so on.)
2015-11-26 10:25:05 +01:00
6efc2a0ec7
- fixed positioning of map name on Hexen automap.
2015-11-25 13:47:04 +01:00
78deb70a00
- fixed: ConfigSections were not properly deallocated
2015-11-25 13:40:18 +01:00
355f70986a
- fixed: 'give' inventory functions ignored an items MaxAmount setting.
2015-11-25 13:36:42 +01:00
f4ab6074fa
- today's 'GCC sucks' fix.
...
(Yet again some overtly anal type issues with the '? :' operator...)
2015-11-25 13:30:12 +01:00
1e0366f98f
- fixed: $musicalias must be resolved before comparing for equality with the currently playing music.
2015-11-25 13:27:35 +01:00
43dff3021b
- fixed: The OpenAL backend ignored PlaySound's 'volume' parameter.
2015-11-25 13:00:56 +01:00
cd110f67df
Merge branch 'master' of https://github.com/rheit/zdoom
2015-11-25 12:28:05 +01:00
da39c86967
Merge pull request #401 from MajorCooke/RadiusGiveMinRange
...
A_RadiusGive Mindist Parameter + RGF_OBJECTS Fix
2015-11-25 12:27:54 +01:00
4a18a28448
- fixed: am_showtriggerlines will now ignore any non-activatable linedef types.
2015-11-25 12:20:35 +01:00
99fbb55296
Merge branch 'master' of https://github.com/rheit/zdoom
2015-11-25 11:50:03 +01:00
7b017f472a
- fixed: Due to the default skybox being moved to the global level data, there was insufficient information to distinguish between using the default skybox or the regular sky. Fixed by adding two new sector flags which get set by a 0-tid SkyPicker.
2015-11-25 11:49:34 +01:00
ab85319fbf
Merge pull request #425 from j-palomo/pickactor2
...
Backport RETURNTID and FORCETID flags for PickActor from GLOOME.
2015-11-22 16:04:08 +01:00
20bf4d6c8e
Fixed crash on finishgame CCMD in non-game modes
...
http://forum.zdoom.org/viewtopic.php?t=49943
2015-11-21 17:43:49 +02:00
2612fad326
Backport RETURNTID and FORCETID flags for PickActor from GLOOME. Renamed prefix to avoid confusion with Pain Attack flags. Fixed broken enum.
2015-11-21 06:05:16 -05:00
a8ac748123
Merge commit 'e2d874e343da34df6edfad0bb47370cbe10f4bae'
2015-10-25 15:00:43 -04:00
117783a785
Merge pull request #419 from alexey-lysiuk/spawnspot_nomonsters
...
'no monsters' option is no longer ignored in ACS Spawn functions
2015-10-18 21:03:48 +02:00
27135d5c5d
Fixed crash on loading map with corrupt linedefs and/or sectors
...
See http://forum.zdoom.org/viewtopic.php?t=49276
2015-10-18 16:28:42 +03:00
Christoph Oelckers
alexey.lysiuk
MajorCooke
Randy Heit
Edoardo Prezioso
Kyle Evans
Blue-Shadow
coelckers
Braden Obrzut
Gaerzi
Edward Richardson
John Palomo Jr