Commit Graph

7008 Commits

Author SHA1 Message Date
coelckers d7501a1414 Merge pull request #457 from j-palomo/turn180_controlmenu
Added turn180 to the controls menu.
2016-01-05 10:09:40 +01:00
coelckers 6be82cc149 Merge pull request #463 from DaZombieKiller/pufftid
Added "pufftid" parameter for LineAttack.
2016-01-05 09:59:59 +01:00
Benjamin Moir c9afb199ca Added "pufftid" parameter for LineAttack. 2016-01-05 13:58:00 +10:00
Braden Obrzut a1e0ac0b71 Merge branch 'osx_start_wnd' of git://github.com/alexey-lysiuk/gzdoom into osx_start_wnd 2016-01-04 22:11:46 -05:00
Christoph Oelckers d68c97b42a Merge branch 'zmaster' 2016-01-04 21:06:54 +01:00
Christoph Oelckers 111479063f - fixed a potential overflow issue with calculating a portal's origin point.
- fixed: Sector_SetPortal's Eternity translation was not correct.

The ZDoom variant allows specifying the plane as part of the portal, Eternity does not. Added a new 'plane' type 3 which just means 'any'.
2016-01-04 21:05:09 +01:00
Christoph Oelckers 0e9eb2f305 Merge branch 'master' of https://github.com/rheit/zdoom 2016-01-04 11:55:07 +01:00
Christoph Oelckers 824801ae6b Merge branch 'master' of https://github.com/rheit/zdoom 2016-01-04 11:52:29 +01:00
Christoph Oelckers 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
coelckers a83d189a9c Merge pull request #461 from alexey-lysiuk/fix_zerodiv_random
Fixed division by zero in RNG
2016-01-04 11:25:04 +01:00
alexey.lysiuk 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
coelckers f1cd22ef34 Merge pull request #460 from alexey-lysiuk/fix_center_cursor
[OSX] Fixed mouse cursor centering in fullscreen mode
2016-01-04 10:16:34 +01:00
alexey.lysiuk 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
Christoph Oelckers 1197df828c Merge branch 'master' of https://github.com/rheit/zdoom 2016-01-04 00:46:57 +01:00
Christoph Oelckers cc10fe9bc3 - fixed: The stereo3D code accessed the global 'viewsector' variable at a place where it no longer contained a correct value.
- fixed: The same code did not exclude camera texture views from drawing the 2D overlay.
2016-01-04 00:45:44 +01:00
Christoph Oelckers 772a572431 Merge branch 'master' of https://github.com/rheit/zdoom 2016-01-03 11:32:39 +01:00
Christoph Oelckers a75e65a3d8 - added BLOCKF_SOUND to flag list supported by Line_SetBlocking, 2016-01-03 11:32:23 +01:00
coelckers bb45a7162a Merge pull request #459 from MajorCooke/WeaponReadyFix
A_WeaponReady Fix
2016-01-02 19:40:26 +01:00
MajorCooke 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
John Palomo Jr b8b81e9809 Added turn180 to the controls menu. 2016-01-01 13:27:44 -05:00
Christoph Oelckers bb355b3a78 Merge branch 'master' of https://github.com/rheit/zdoom 2016-01-01 13:40:24 +01:00
Christoph Oelckers f2c890272f - FRenderState::Apply does not need to call ApplyColorMask. 2016-01-01 10:59:34 +01:00
Randy Heit bb10a10458 Merge branch 'crimsondusk-master' 2015-12-31 20:20:58 -06:00
Randy Heit 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
Christoph Oelckers 3bad7f9b55 Merge branch 'master' of https://github.com/rheit/zdoom 2016-01-01 00:46:00 +01:00
Randy Heit 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
Randy Heit afbf88cc63 Remove WRF_ALLUSER. 2015-12-31 16:46:18 -06:00
Randy Heit 4931c90839 Bump save version for bigger WeaponState property 2015-12-31 16:46:18 -06:00
MajorCooke 3566d3157a Use | instead of +. 2015-12-31 16:46:17 -06:00
MajorCooke 6478b98eea Update serialization to BYTE from WORD for older save games. 2015-12-31 16:46:17 -06:00
MajorCooke 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
MajorCooke 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
Christoph Oelckers addd059410 Merge branch 'master' of https://github.com/rheit/zdoom 2015-12-31 23:05:13 +01:00
Christoph Oelckers 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
Randy Heit d8af2e558f Fix potentiol buffer overrun in MUSSong2::Precache() 2015-12-31 15:28:18 -06:00
Christopher Bruns ac6e2f4979 Use gl_RenderState to manipulate OpenGL color mask for anaglyph modes, to avoid glGet... 2015-12-31 11:57:21 -05:00
alexey.lysiuk 262580c92f Updated LZMA SDK to version 15.14
Enabled support for PPMD compression method
2015-12-31 17:25:49 +02:00
Christopher Bruns 95f4134630 Refactor stereo3d classes to use TArray instead of std::vector. 2015-12-31 09:36:37 -05:00
Christopher Bruns 5b7f9b04cd Add license headers to stereo3d source files. 2015-12-31 09:06:44 -05:00
Christoph Oelckers 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
alexey.lysiuk 94fec26cb6 Fixed runtime warning on OS X 10.4 Tiger
The 'invalid pixel format attribute' warning was introduced with automated graphics switching control
2015-12-31 11:00:05 +02:00
Christopher Bruns 655defed28 Avoid compile errors on Linux. Fixes #107. 2015-12-30 17:54:54 -05:00
Christopher Bruns 8e237e6146 Merge branch 'master' of https://github.com/coelckers/gzdoom into stereo3d 2015-12-30 17:41:49 -05:00
Christoph Oelckers c88ed426a8 - oops, this somehow lost the shift operator... 2015-12-30 20:39:38 +01:00
Christoph Oelckers 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
Christoph Oelckers 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
alexey.lysiuk 63993dee96 Hid resize indicator on OS X startup window
The resize indicator overlapped with progress bar and Quit/Cancel button on 10.6 and older versions
OS X 10.7 and newer don't have this indicator at all
2015-12-30 16:05:16 +02:00
Christoph Oelckers 86797b419f Merge branch 'master' of https://github.com/rheit/zdoom 2015-12-30 12:28:55 +01:00
coelckers 8f149d9048 Merge pull request #455 from edward-san/more_wildmidi_fixes
- Fixed Clang errors/warnings on wildMIDI code.
2015-12-30 12:27:56 +01:00
alexey.lysiuk 3466a8c7a9 Disabled miniaturization for OS X startup window
Old versions of OS X don't support changing of window style mask
2015-12-30 12:19:50 +02:00