Commit graph

455 commits

Author SHA1 Message Date
Sterling Parker
68bd618aaa Initial "resolution mode selector" implementation 2018-08-01 07:20:35 -06:00
Rachael Alexanderson
d7b7ae06e7 - implement a new vid_scalemode: 5 - this allows the usage of custom absolute scaling modes
- new ccmd: vid_setscale <x> <y> [linear] [fake-mcga-4:3] - sets vid_scalemode to 5 with the absolute scaling parameters. example: vid_scalemode 800 600 allows you to see the screen (stretched) as if it were 800x600. Linear specifies whether to force the scaling to be linear in this mode, and "fake-mcga-4:3" is meant for 320x200-like modes that mimic mode13h scaling.
2018-07-21 21:39:35 -04:00
Christoph Oelckers
a4622e70d0 Merge remote-tracking branch 'remotes/origin/master' into modern 2018-06-23 23:03:51 +02:00
Vitaly Novichkov
ceec12056a Upgrade libADLMIDI and libOPNMIDI
Added ability to switch emulator and it's accuracy level ("enabling of 'run at PCM rate' reduces accuracy, and also reduces CPU usage")
Added draft code for future external banks support (WOPL format for ADLMIDI and WOPN format for OPNMIDI)

ADLMIDI 1.3.3   2018-06-19
 * Fixed an inability to load another custom bank without of library re-initialization
 * Optimizing the MIDI banks management system for MultiBanks (Thanks to [Jean Pierre Cimalando](https://github.com/jpcima) for a work!)
 * Fixed incorrect 4-op counter which is still catch 4-op instruments on 2-op banks
 * Fixed an incorrect processing of auto-flags
 * Fixed incorrect initial MIDI tempo when MIDI file doesn't includes the tempo event
 * Channel and Note Aftertouch features are now supported correctly! Aftertouch is the tremolo / vibrato, NOT A VOLUME!
 * Updated DosBox OPL3 emulator up to r4111 of official DosBox trunk (Thanks to [Jean Pierre Cimalando](https://github.com/jpcima) for a work!)
 * The automatical choosing of 4 operator channels count has been improved (Thanks to [Jean Pierre Cimalando](https://github.com/jpcima) for a work!)
 * Added optional HQ resampler for Nuked OPL3 emulators which does usage of Zita-Resampler library (Thanks to [Jean Pierre Cimalando](https://github.com/jpcima) for a work!)

ADLMIDI 1.3.2   2018-04-24
 * Added ability to disable MUS and XMI converters
 * Added ability to disable embedded MIDI sequencer to use library as RealTime synthesizer only or use any custom MIDI sequencer plugins.
 * Fixed blank instruments fallback in multi-bank support. When using non-zero bank, if instrument is blank, then, instrument will be taken from a root (I.e. zero bank).
 * Added support for real-time switching the emulator
 * Added support for CC-120 - "All sound off" on the MIDI channel
 * Changed logic of CC-74 Brightness to affect sound only between 0 and 64 like real XG synthesizers. Ability to turn on a full-ranged brightness (to use full 0...127 range) is kept.
 * Added support for different output sample formats (PCM8, PCM8U, PCM16, PCM16U, PCM32, PCM32U, Float32, and Float64) (Thanks to [Jean Pierre Cimalando](https://github.com/jpcima) for a work!)
 * Reworked MIDI channels management to avoid any memory reallocations while music processing for a hard real time. (Thanks to [Jean Pierre Cimalando](https://github.com/jpcima) for a work!)

OPNMIDI 1.3.0   2018-06-19
 * Optimizing the MIDI banks management system for MultiBanks (Thanks to [Jean Pierre Cimalando](https://github.com/jpcima) for a work!)
 * Fixed incorrect initial MIDI tempo when MIDI file doesn't includes the tempo event
 * Fixed an incorrect processing of auto-flags
 * MAME YM2612 now results a more accurate sound as internal using of native sample rate makes more correct sound generation
 * Channel and Note Aftertouch features are now supported correctly! Aftertouch is the tremolo / vibrato, NOT A VOLUME!
 * Added optional HQ resampler for Nuked OPL3 emulators which does usage of Zita-Resampler library (Thanks to [Jean Pierre Cimalando](https://github.com/jpcima) for a work!)

OPNMIDI 1.2.0   2018-04-24
 * Added ability to disable MUS and XMI converters
 * Added ability to disable embedded MIDI sequencer to use library as RealTime synthesizer only or use any custom MIDI sequencer plugins.
 * Fixed blank instruments fallback in multi-bank support. When using non-zero bank, if instrument is blank, then, instrument will be taken from a root (I.e. zero bank).
 * Added support for real-time switching the emulator
 * Added support for MAME YM2612 Emulator
 * Added support for CC-120 - "All sound off" on the MIDI channel
 * Changed logic of CC-74 Brightness to affect sound only between 0 and 64 like real XG synthesizers. Ability to turn on a full-ranged brightness (to use full 0...127 range) is kept.
 * Added support for different output sample formats (PCM8, PCM8U, PCM16, PCM16U, PCM32, PCM32U, Float32, and Float64) (Thanks to [Jean Pierre Cimalando](https://github.com/jpcima) for a work!)
 * Reworked MIDI channels management to avoid any memory reallocations while music processing for a hard real time. (Thanks to [Jean Pierre Cimalando](https://github.com/jpcima) for a work!)
2018-06-22 17:30:51 +02:00
Christoph Oelckers
b65b83edb3 - removed the hard screen resolution switch that still was present on Windows and cleaned up the entire video backend code from the remaining support code for this.
Like Linux and macOS this will only support borderless fullscreen in the active desktop resolution now, which is what modern systems need.
The list of discrete resolutions has been removed as it makes no sense anymore with a fixed video mode - all the other scaling options remain active, though.
2018-06-17 20:08:35 +02:00
Magnus Norddahl
85f5f897d7 - enable model rendering in the software renderer 2018-06-09 12:29:33 +02:00
Christoph Oelckers
b197bfc964 - avoid checking for vr_enable_quadbuffered directly.
This option only exists on Windows, so on the other platforms it should not be in the menu and not affect the setup of the VR mode.
2018-05-18 00:12:45 +02:00
Christoph Oelckers
557c8b480b - missed the menu part. 2018-04-25 20:34:28 +02:00
Christoph Oelckers
85300993af - replaced gl_PatchMenu with an MMX 'ifoption' check. 2018-04-25 19:36:48 +02:00
Christoph Oelckers
8a2e52d651 Removed gl_lights_checkside which essentially was just a pointless piece of cruft inherited from ZDoomGL. 2018-04-16 08:45:50 +02:00
Christoph Oelckers
df4f435952 - merged vid_renderer, swtruecolor and r_polyrender into one CVAR to reduce menu clutter.
- with renderers freely switchable, some shortcuts in the 3D floor code had to be removed, because now the hardware renderer can get FF_THISINSIDE-flagged 3D floors.
- changed handling of attenuated lights in the legacy renderer to be adjusted when being rendered instead of when being spawned. For the software renderer the light needs to retain its original values.
2018-04-07 23:30:28 +02:00
Christoph Oelckers
9ba32cb994 - with the new order of things we need the software renderer to be always available. 2018-04-03 20:14:26 +02:00
Christoph Oelckers
e0f1abdf81 - removed SDLFB and cleaned things up a bit. 2018-03-27 11:59:43 +02:00
Vitaly Novichkov
27b9b67d68 ADL&OPN: More setup: Chips count and Volume model!
Notes:
* ADL: The DMX volume model was set as default to unify volumes on all bank. Otherwise, if you will use 'Generic' or 'Win9x', the sound will became too loud than wanted. Each bank has own default volume model which is used when 'Auto' is set.
* ADL: 6 chips is optimal to work with default banks
* OPN: 8 chips are set to provide 48 polyphony channels. (each OPN2 chip has 6 channels only)
* Text files: junk spaces from end of lines are was auto-removed.
2018-03-25 08:14:35 +02:00
Christoph Oelckers
4e012e3765 - fill in the ADL bank menu from the internal table. Some of the names had to be shortened to prevent it from getting too confusing. 2018-03-24 21:19:10 +01:00
Christoph Oelckers
4e8588815b - split up the advanced sound menu because it became a bit too confusing with all the different MIDI players' options lumped together.
There is now a separate MIDI player options menu which is a list of submenus, one for each player (except for OPNMIDI which does not have any options yet.
2018-03-24 20:29:48 +01:00
Rachael Alexanderson
9600cfde3c - put unexplored secret color picker in the menu 2018-03-10 10:55:24 -05:00
Christoph Oelckers
36e8358763 - use submenus for soundfont selection both for better overview and avoiding a music restart for each selection change. 2018-02-26 08:52:40 +01:00
Christoph Oelckers
39f26028aa - reworked the advanced sound menu to take advantage of the new soundfont handling.
The text input field for the configs have been removed. Instead it will now present a list of soundfonts that are found in specific locations.
For that it will look in the 'soundfont' directories of the FileSearch.Directories entry of the config.
Acceptable file formats here are SF2 and zipped GUS patch sets. These zipped patch sets need to have a timidity.cfg at the root and refer to all containing data by relative path. References to outside files are not allowed here.
It is still possible to refer to sound fonts elsewhere on the hard drive by manually entering a path at the console - but these won't show in the menu and will get lost if one cycles through the list of available options.
Of the available softsynths, FluidSynth will only list SF", Wildmidi will only list GUS patch sets and Timidity++ and GUS will list both.

Please note that although the GUS synth can read SF2, the output appears to be broken die to some old bug.
2018-02-23 19:23:39 +01:00
Christoph Oelckers
88f9f0982c - fixed Timidity++ playback. 2018-02-23 18:33:54 +01:00
Magnus Norddahl
4c0dce875f Merge branch 'fuzz_software' into gzdoom 2018-01-25 19:00:14 +01:00
Christoph Oelckers
2d8e394529 Merge branch 'master' into reverbedit
# Conflicts:
#	wadsrc/static/zscript/menu/optionmenuitems.txt
2018-01-20 11:44:42 +01:00
Christoph Oelckers
be82f3ef56 - TapwaveZodiac's submission for:
* Improved French translation, also covers previously missing strings.
* Adds a string for Borderless Windowed.
* Adds option to enable or disable borderless windowed for Windows only.

These commits had to be manually recreated because somehow the files appaarently ended up with CRLF in the repo which can cause problems with Windows Git and line ending normalization on.
2018-01-09 20:30:33 +01:00
Magnus Norddahl
a23e5f49f6 - Add "fuzz software" to GL that renders fuzz like the scaled fuzz mode in the software renderer 2018-01-07 02:29:55 +01:00
alexey.lysiuk
fbb931b759 Improved Advanced Sound Options menu
Added option for FluidSynth chorus
Removed fractional part from FluidSynth voices option
Removed duplicate localized string
2017-12-28 10:21:51 +02:00
Rachael Alexanderson
8fce9d9d2d - added menu option for 'i_soundinbackground' 2017-12-25 05:50:08 -05:00
alexey.lysiuk
de12902d77 Increased limit for automap empty space margin to 90%
https://forum.zdoom.org/viewtopic.php?t=58653
2017-12-14 16:18:27 +02:00
alexey.lysiuk
ebb926e7b0 Added free space margin aka safe frame for automap
am_freespacemargin CVAR and corresponding menu options can set empty space margin for automap in percentage of zoomed out size
https://forum.zdoom.org/viewtopic.php?t=58653
2017-12-09 17:38:34 +02:00
alexey.lysiuk
e3ba9567c9 Fixed English localization issues
https://forum.zdoom.org/viewtopic.php?t=58684
2017-12-09 13:00:03 +02:00
Christoph Oelckers
d5445d7953 - reverb editor complete except for localization and saving to a proper place. 2017-12-03 19:56:03 +01:00
Christoph Oelckers
5e1100096e - work on reverb save menu. 2017-12-03 17:04:10 +01:00
Christoph Oelckers
a069949482 - connected reverb menu with its backing data
- added an entry to the main options menu to open the reverb editor.
2017-11-26 20:11:14 +01:00
Christoph Oelckers
57058ef727 - removed all remains of the old EAX editor. 2017-11-26 15:23:07 +01:00
Christoph Oelckers
1ed1b42c21 Safety commit. 2017-11-26 14:13:56 +01:00
Christoph Oelckers
78184ad6b5 - more work on reverb menu. 2017-11-26 10:16:21 +01:00
Christoph Oelckers
3ae5f8c09f - initial work on a reverb editor based on the menu system.
This is to get rid of some ugly Windows code and make this platform independent.
2017-11-25 22:03:18 +01:00
Rachael Alexanderson
fc0ae896b2 - remove vid_tft and vid_nowidescreen and associated menu option. Their functionality was supersceded and extended by vid_aspect==3 (which has the same effect as setting both to true anyhow), and it was mostly just redundant. 2017-10-10 06:38:07 -04:00
Rachael Alexanderson
69abf095c9 - added vid_cropaspect. This cvar turns vid_aspect into a letterboxing function that will crop the unused sides of the screen away, instead of stretching it. Requires one of the non-legacy OpenGL framebuffers to work. 2017-10-07 20:18:37 -04:00
JimmyZD
abc8e4deac Added four text colors: ice, fire, sapphire, teal
https://forum.zdoom.org/viewtopic.php?t=57942
2017-09-23 11:56:16 +02:00
nashmuhandes
3ff1597640 Change minimum shadowmap quality to 128. 2017-09-10 12:46:55 -04:00
nashmuhandes
ea5cffdc81 Added shadowmap quality setting to the dynamic light options menu. 2017-09-10 12:46:55 -04:00
Rachael Alexanderson
4b82bb50df - removed scale resolutions and added vid_scalefactor to replace them. 2017-09-10 12:29:07 -04:00
Rachael Alexanderson
86a66cd554 - refactored r_videoscale.cpp to use a table.
- reordered vid_scalemode modes to be a little neater, having static modes and scalar modes separate, with a buffer in between so new modes can be added in the future without disrupting the current order.
2017-09-10 09:41:03 -04:00
Chris Robinson
1b1f8d605f Add menu entries for selecting the timidity config 2017-09-10 07:25:29 -04:00
Rachael Alexanderson
3540440bf6 - add 1280x800 scale mode 2017-07-27 12:19:41 -04:00
Magnus Norddahl
e06f87cf10 - Added 0.75x scale mode 2017-07-24 08:35:27 +02:00
Rachael Alexanderson
6c328ec7df - added SSAA menu entry 2017-07-23 11:29:06 -04:00
Magnus Norddahl
c3702ae9e7 Add vid_scalemode support to GL framebuffer 2017-07-23 00:33:56 +02:00
Rachael Alexanderson
d2c8a5c33d Revert "Merge commit 'refs/pull/338/head' of https://github.com/coelckers/gzdoom"
This reverts commit 65bb8a5185, reversing
changes made to 619281de64.
2017-07-10 11:29:58 -04:00
Rachael Alexanderson
a2c9cb8156 - increased menu readability 2017-07-02 16:45:06 -04:00
Rachael Alexanderson
bd02893ce7 - expanded hard limits for saturation to -15.0/15.0
- added menu option for saturation
- tried to get the new saturation shader to consume less GPU power by turning it off when it is 1.0
2017-07-02 16:45:06 -04:00
Rachael Alexanderson
7592e6d5de Merge https://github.com/coelckers/gzdoom 2017-06-25 00:18:19 -04:00
Magnus Norddahl
f34ededdef - Improved fuzz rendering in software renderer by scaling it relative to 320x200 2017-06-25 00:35:15 +02:00
Rachael Alexanderson
a148212215 Merge commit 'f1ad42c' 2017-06-12 00:22:59 -04:00
Christoph Oelckers
ee3d73478a - added blanket protection to all submenus of OptionsMenu, except the player menu.
Sadly, some mods are truly careless enough to modify the engine internal menus to add their own things, which should have no business whatsoever in there.
As an example, in a D4D version released in May, the Display Options menu is showing quite a bit of outdated content and missing important settings.
2017-06-11 09:57:10 +02:00
Rachael Alexanderson
5eaf085d58 - fixed minor menudef mistake 2017-06-04 12:30:35 +02:00
Rachael Alexanderson
68b6f922f7 - Added auto-detection scheme for r_vanillatrans
It now works the following way:
(0) - Force off (ZDoom defaults)
(1) - Force on (Doom defaults)
(2) - Auto off (Prefer ZDoom defaults - if DEHACKED is detected with no ZSCRIPT it will turn on) (default)
(3) - Auto on (Prefer Doom defaults - if DECORATE is detected with no ZSCRIPT it will turn off)
2017-06-04 12:30:35 +02:00
Rachael Alexanderson
e1bb44a9ed - added menu option for r_vanillatrans 2017-06-04 12:30:35 +02:00
Rachael Alexanderson
e5eb173165 - fixed minor menudef mistake 2017-06-04 05:33:37 -04:00
Rachael Alexanderson
deb62ee156 Merge commit 'refs/pull/340/head' of https://github.com/coelckers/gzdoom
# Conflicts:
#	src/gl/scene/gl_sprite.cpp
#	src/polyrenderer/scene/poly_sprite.cpp
#	src/swrenderer/things/r_sprite.cpp
#	wadsrc/static/language.enu
#	wadsrc/static/menudef.txt
2017-06-03 20:06:28 -04:00
Rachael Alexanderson
9af370f51e - Added auto-detection scheme for r_vanillatrans
It now works the following way:
(0) - Force off (ZDoom defaults)
(1) - Force on (Doom defaults)
(2) - Auto off (Prefer ZDoom defaults - if DEHACKED is detected with no ZSCRIPT it will turn on) (default)
(3) - Auto on (Prefer Doom defaults - if DECORATE is detected with no ZSCRIPT it will turn off)
2017-06-03 20:00:53 -04:00
Rachael Alexanderson
9abf866241 - added menu option for r_vanillatrans 2017-06-02 12:37:54 -04:00
Rachael Alexanderson
579febb6f8 - added menu option for r_vanillatrans 2017-06-02 12:36:29 -04:00
Rachael Alexanderson
65bb8a5185 Merge commit 'refs/pull/338/head' of https://github.com/coelckers/gzdoom 2017-05-28 07:13:27 -04:00
Rachael Alexanderson
619281de64 Revert "Merge commit 'refs/pull/336/head' of https://github.com/coelckers/gzdoom"
This reverts commit a05c38fefd, reversing
changes made to 0fb1a0604c.
2017-05-28 07:12:41 -04:00
Christopher Bruns
a49afd5bfc Initial OpenVR mode.
Second attempt: clean up commit, and avoid messing with HDR framebuffer format.
2017-05-28 06:20:32 -04:00
Rachael Alexanderson
a05c38fefd Merge commit 'refs/pull/336/head' of https://github.com/coelckers/gzdoom 2017-05-28 01:33:59 -04:00
Rachael Alexanderson
0fb1a0604c Merge https://github.com/coelckers/gzdoom 2017-05-27 21:52:43 -04:00
Christopher Bruns
c1bacdbf92 Create initial rotation-tracking-only implementation of OpenVR mode for VR headsets. 2017-05-27 19:42:49 -04:00
Rachael Alexanderson
9435a09f1e - Added vid_glswfb to menu on Mac. 2017-05-27 08:01:56 -04:00
Rachael Alexanderson
a7cc6fb1ba - fixed: 'IfOption(Linux)' is actually 'IfOption(unix)' in menudef 2017-05-27 05:12:59 -04:00
Rachael Alexanderson
9ebf1ec9a2 - Update menu to match new vid_glswfb config
- Added vid_glswfb to menu on Linux
2017-05-27 04:58:48 -04:00
Rachael Alexanderson
0941cda7cc Merge https://github.com/coelckers/gzdoom 2017-05-07 05:07:22 -04:00
Chris Robinson
996ce4497d Add a resampler option for the OpenAL backend 2017-05-06 18:07:31 +02:00
Rachael Alexanderson
a59336908c Merge https://github.com/coelckers/gzdoom 2017-05-02 03:13:40 -04:00
Christoph Oelckers
79ef7989fc - moved the software renderer's dynamic light option into the dynamic light menu to avoid confusion.
Todo: Review the other options and make sure they apply to both renderers.
2017-05-01 22:04:54 +02:00
Rachael Alexanderson
ebf33ed24e Merge https://github.com/coelckers/gzdoom
# Conflicts:
#	src/posix/cocoa/i_video.mm
2017-04-30 22:16:01 -04:00
Chris Robinson
6044c876ab Update LASTRUNVERSION to handle the snd_hrtf change
Also snd_hrtf now uses -1 for "auto" and 0 for "off", which makes more sense.
2017-05-01 00:26:28 +02:00
Rachael Alexanderson
588d028499 Merge https://github.com/coelckers/gzdoom 2017-04-30 16:00:52 -04:00
Chris Robinson
49449e623e Make an advanced sound option for snd_hrtf 2017-04-30 18:41:39 +02:00
alexey.lysiuk
79654fa15b Cleanup after mod_dumb CVAR removal
This fixes the following warnings on startup without configuration file:
Script error, "gzdoom.pk3:menudef.txt" line 1727:
Unknown CVar mod_dumb
Script error, "gzdoom.pk3:menudef.txt" line 1728:
Unknown CVar mod_dumb
Script error, "gzdoom.pk3:menudef.txt" line 1729:
Unknown CVar mod_dumb
Script error, "gzdoom.pk3:menudef.txt" line 1731:
Unknown CVar mod_dumb
2017-04-29 10:27:59 +03:00
Rachael Alexanderson
c71d23f519 Merge https://github.com/coelckers/gzdoom 2017-04-22 22:02:20 -04:00
Christoph Oelckers
dc3df4e897 - remove mod_dumb CVAR. This now effectively disabled module playback because the OpenAL backend cannot substitute for it, unlike FMod. 2017-04-22 10:59:52 +02:00
Rachael Alexanderson
11ec35b061 Merge https://github.com/coelckers/gzdoom 2017-04-20 21:04:33 -04:00
Rachael Alexanderson
5d11c9962b Merge commit '8db239d' 2017-04-18 11:33:52 -04:00
Christoph Oelckers
8180d34765 - added user configurable menus where soundfonts, patch sets or Timidity EXEs can be selected from lists being stored in the config file to reduce the hassle of testing MIDIs with different settings. 2017-04-18 16:43:07 +02:00
Christoph Oelckers
c219811a54 - removed FMod as the last remaining piece of code that is not GPL compatible.
Please consider GZDoom as licensed under the GPL starting with this commit, even though the license headers have not been changed yet.
2017-04-17 01:06:54 +02:00
Rachael Alexanderson
bf9edec91a Merge https://github.com/coelckers/gzdoom 2017-03-30 18:04:37 -04:00
Christoph Oelckers
a3ef711d1d - added a special slider type for the scaling options that prints a descriptive text instead of the slider for the special settings.
- fixed the adaptive scale calculation in GetUIScale which had the coordinates mixed up.
2017-03-30 11:30:09 +02:00
Rachael Alexanderson
39826753f9 Merge https://github.com/coelckers/gzdoom 2017-03-30 02:11:03 -04:00
Christoph Oelckers
f95c29ad28 cleaned up the scaling options.
- all 5 settings affected by uiscale have been changed to have the exact same semantics: -1, if supported means special scaling, this is available for HUD and status bar, 0 means to use uiscale, any larger value is a direct scaling factor.
- scaling is cut off when the factor is larger than screenwidth/320 or screenheight/200 because anything larger will definitely not fit.
- a lot of code has been cleaned up and consolidated. Especially the message code had an incredible amount of redundancy.
- all scaling options have been moved into a submenu. This menu is not complete, though - it still requires a special menu widget to convey the intended information without confusing the user.
2017-03-30 02:16:23 +02:00
Rachael Alexanderson
2338fe7e66 Merge commit 'c8eabe5' 2017-03-26 21:57:23 -04:00
Christoph Oelckers
3e67a8bafa - let hud_scale act like an override to uiscale, just like con_scale does.
- better handling of ForceScale for the fullscreen HUD that doesn't mess around with CVARs.
- moved the mug shot into the status bar, because this is global state that needs to be shared between different pieces of code which want to display a mug shot.
- SBARINFO should work off the current status bar settings instead of the ones stored in its script object
2017-03-25 18:32:47 +01:00
Rachael Alexanderson
b747b0c3c6 - made gl_menu_blur into a menu option
- made bluramount also into a gameinfo option
- negative gl_menu_blur cvar now uses gameinfo option, 0 disables it
- removed gl_menu_blur_enabled since gl_menu_blur==0 does that anyway
- made gl_menu_blur default to -1 to use gameinfo option
- add default gameinfo bluramount options
2017-03-24 14:59:25 -04:00
Christoph Oelckers
005e6871f9 - increased the snd_channels default and minimum.
The values were still 8 and 32 respectively which applied to hardware from last decade, but for modern mods these are simply too low. New values are 64 as minimum and 128 as default.

- added script access to a sector's colormap and specialcolors fields. (Writing only through dedicated functions because these fields are render state which may need to trigger some form of refresh if the renderer changes.)
2017-03-16 10:38:56 +01:00
Christoph Oelckers
60fd79ce23 - some menu reorganization:
* dynamic lights also work in the true color software renderer and have been moved out of the OpenGL menu.
* created a separate software renderer menu and moved all relevant options there.
* delete non-applicable options when running in legacy mode.
* moved the OpenGL preferences menu one level up to eliminate a two-entry GL top level menu.
2017-03-13 01:17:46 +01:00
Rachael Alexanderson
d84ba4b953 Merge https://github.com/coelckers/gzdoom 2017-03-02 04:22:32 -05:00
alexey.lysiuk
384accbc86 Fixed name and placement of 'All except doors' localized string 2017-03-02 10:12:11 +02:00
Rachael Alexanderson
4ebd25171c - Implemented a simple graphics switch. This currently affects NVidia Optimus-enabled notebooks only. 2017-03-01 09:58:56 -05:00
Rachael Alexanderson
5aec906031 Merge https://github.com/coelckers/gzdoom
# Conflicts:
#	src/version.h
2017-02-28 04:46:23 -05:00
Christoph Oelckers
ac4074a69a - allow sprites and particles simultaneously for puffs. 2017-02-27 19:51:37 +01:00
Rachael Alexanderson
2a847ca570 Merge https://github.com/coelckers/gzdoom 2017-02-27 01:06:00 -05:00
Christoph Oelckers
346ada76bc - allow blocking controller input in the menu. 2017-02-26 20:59:24 +01:00
Rachael Alexanderson
7a5df2bc28 Merge commit 'b0eb19b' 2017-02-26 13:41:02 -05:00
Christoph Oelckers
a6761463af - added a new showtriggerlines mode that doesn't exclude doors.
- use lambdas for the AM checker functions.
2017-02-26 15:01:55 +01:00
Rachael Alexanderson
d94150f316 Revert "- Added menu option for clipmidtex compatflag"
This reverts commit 4a66621d9f.
2017-02-23 05:57:34 -05:00
Rachael Alexanderson
4a66621d9f - Added menu option for clipmidtex compatflag 2017-02-23 04:57:49 -05:00
Rachael Alexanderson
80f762f8a4 Merge https://github.com/coelckers/gzdoom 2017-02-16 20:40:07 -05:00
Christoph Oelckers
ccb083ed25 - fixed initialization of joystick menu with bogus MENUDEFS 2017-02-16 18:55:36 +01:00
Rachael Alexanderson
2a71ec89de Merge https://github.com/coelckers/gzdoom 2017-02-13 17:02:56 -05:00
Christoph Oelckers
7877bcbdcb - exported more parts of the joystick menus and also exported all strings for them to the string table.
- exported the skeleton definition for list menus.
2017-02-13 17:45:03 +01:00
Rachael Alexanderson
0c101102dc Merge https://github.com/coelckers/gzdoom
# Conflicts:
#	src/r_bsp.cpp
#	src/r_main.cpp
#	src/r_segs.cpp
#	src/r_things.cpp
#	wadsrc/static/language.enu
#	wadsrc/static/menudef.txt
2017-01-28 17:39:55 -05:00
Christoph Oelckers
1d2ae53ecb Revert "- made r_fullbrightignoresectorcolor a MAPINFO option, so far only working on the software renderer. GL still needs a few changes to handle it correctly."
This reverts commit dd03bb1fcb.

Turns out that making this work in GL will create a complete mess so better remove the option as it would only cause problems.
2017-01-28 18:26:52 +01:00
Rachael Alexanderson
d27a152d9b Merge https://github.com/coelckers/gzdoom
# Conflicts:
#	src/r_bsp.cpp
#	src/r_main.cpp
#	src/r_segs.cpp
#	src/r_things.cpp
#	wadsrc/static/language.enu
#	wadsrc/static/menudef.txt
2017-01-28 09:38:10 -05:00
Christoph Oelckers
dd03bb1fcb - made r_fullbrightignoresectorcolor a MAPINFO option, so far only working on the software renderer. GL still needs a few changes to handle it correctly. 2017-01-28 12:20:18 +01:00
Christoph Oelckers
11d93cb030 - removed r_columnmethod 1 because the code was broken and already gone from QZDoom. 2017-01-10 22:28:15 +01:00
Rachael Alexanderson
3e59ebb48d - Removed multithreaded from the menu completely.
# Conflicts:
#	wadsrc/static/menudef.txt
2017-01-02 18:26:45 -05:00
Rachael Alexanderson
338d338e27 - Moved multithreaded option from Truecolor menu to the Display menu since both the palette and truecolor drawer sets now use it. 2017-01-02 17:55:24 -05:00
Magnus Norddahl
b0febec986 Removed r_columnmethod as its performance gains are too insignificant to justify its complexity on the codebase 2016-12-25 05:05:53 +01:00
Rachael Alexanderson
564bfe482c Merge branch 'zdoom-rgb666-take3' of https://github.com/raa-eruanna/qzdoom into qzdoom-rgb666
# Conflicts:
#	src/r_draw.cpp
#	src/r_plane.cpp
#	src/r_things.h
#	src/v_draw.cpp
#	src/v_video.cpp
2016-12-24 19:00:28 -05:00
Rachael Alexanderson
2fa13396f2 - Added r_blendmethod to the menu. 2016-12-24 12:50:17 -05:00
Magnus Norddahl
2bb2395569 Add menu option to enable dynamic lights (independent of the OpenGL setting so that you can have it on in OpenGL and off in Software) 2016-12-23 23:44:52 +01:00
Magnus Norddahl
fabac78ea8 Add poly renderer to the menus 2016-11-21 15:19:24 +01:00
Christoph Oelckers
196986ae6b Merge branch 'master' of https://github.com/rheit/zdoom 2016-11-15 11:25:42 +01:00
Rachael Alexanderson
c6f7848a09 Merge branch 'master' of https://github.com/rheit/zdoom 2016-11-11 11:39:53 -05:00
nashmuhandes
fd31c84745 Added a slider to control the intensity of underwater screen blending. 2016-11-11 17:18:39 +08:00
Rachael Alexanderson
e44f931a7e Merge branch 'master' of https://github.com/coelckers/gzdoom 2016-11-03 20:31:07 -04:00
Christoph Oelckers
747b612860 Merge branch 'master' of https://github.com/rheit/zdoom 2016-11-03 19:42:03 +01:00
Christoph Oelckers
6ef5cdebb2 - slider fixes. 2016-11-03 19:41:51 +01:00
Christoph Oelckers
f619e8ece1 - fixed numeric output precision for a few sliders. 2016-11-01 13:20:59 -04:00
Christoph Oelckers
6e0defdc69 - fixed numeric output precision for a few sliders. 2016-11-01 13:48:56 +01:00
Rachael Alexanderson
08a90a13f4 - Moved renderer menu to options menu. Removed duplicate swtruecolor entry in "Truecolor Options" 2016-10-26 00:38:59 -04:00
Christoph Oelckers
10203afa41 Merge branch 'master' of https://github.com/rheit/zdoom 2016-10-23 18:50:59 +02:00
raa-eruanna
c76431414a - Implemented r_fullbrightignoresectorcolor from QZDoom 2016-10-21 07:06:24 -04:00
Christoph Oelckers
ce80d8157b Merge branch 'master' of https://github.com/rheit/zdoom 2016-10-20 10:24:37 +02:00
Magnus Norddahl
aa199a91c5 Merge remote-tracking branch 'origin/capsky' into qzdoom
# Conflicts:
#	src/r_plane.cpp
#	src/r_sky.cpp
#	wadsrc/static/language.enu
#	wadsrc/static/menudef.txt
2016-10-20 01:05:05 +02:00
Magnus Norddahl
2fe545a4fd Merge r_stretchsky and r_capsky into r_skymode 2016-10-20 00:59:51 +02:00
Magnus Norddahl
0888fc0cde Merge remote-tracking branch 'origin/capsky' into qzdoom 2016-10-20 00:13:58 +02:00
Magnus Norddahl
5de8112578 Add support for capping sky with a solid color 2016-10-19 23:52:09 +02:00
raa-eruanna
3122538006 Added menu entry for "r_fullbrightignoresectorcolor" 2016-10-14 18:16:22 -04:00
raa-eruanna
13271cb967 - Created menus for all this render-switching insanity. 2016-10-11 17:42:46 -04:00
Christoph Oelckers
14a6e7989b Merge branch 'master' of https://github.com/rheit/zdoom
# Conflicts:
#	wadsrc/static/menudef.txt
2016-10-10 11:38:08 +02:00
raa-eruanna
a2551ce95e Merge http://github.com/rheit/zdoom 2016-10-07 08:30:25 -04:00
Christoph Oelckers
ee66d22034 Revert "- added an option to disable the pickup screen flash."
This reverts commit 2d320a2e86.

The feature has been superseded by pickup_fade_scalar and is no longer needed.
2016-10-07 08:46:06 +02:00
raa-eruanna
a4ccbddfd6 - Menudef: Split Truecolor options into their own menu. 2016-10-07 02:38:08 -04:00
raa-eruanna
a80c67c2ca - Backported blood_fade_scalar from Skulltag
- Added new pickup_fade_scalar which works the same way for pickups
- Default for blood_fade_scalar is 1.0 instead of 0.5 from Skulltag.
2016-10-07 00:35:06 -04:00
raa-eruanna
02f66fa34e - Backported blood_fade_scalar from Skulltag
- Added new pickup_fade_scalar which works the same way for pickups
- Default for blood_fade_scalar is 1.0 instead of 0.5 from Skulltag.
2016-10-06 20:01:20 -04:00
Christoph Oelckers
fc246be03e Merge branch 'master' of https://github.com/rheit/zdoom 2016-10-06 21:21:46 +02:00
raa-eruanna
e592473f57 Merge http://github.com/rheit/zdoom 2016-10-05 21:36:23 -04:00
Christoph Oelckers
2d320a2e86 - added an option to disable the pickup screen flash. 2016-10-05 09:59:19 +02:00
raa-eruanna
b9a644e762 Added menu option for Linear sky. 2016-10-03 21:41:37 -04:00
raa-eruanna
2a9e97688d Merge http://github.com/coelckers/gzdoom 2016-09-22 05:23:02 -04:00
Christoph Oelckers
1e6b99cebd Merge branch 'master' of https://github.com/rheit/zdoom 2016-09-22 09:06:34 +02:00
raa-eruanna
780d672b25 Adds user-definable weapon bob speed 2016-09-22 08:42:59 +02:00
raa-eruanna
dede94b7e2 Merge branch 'master' of https://github.com/coelckers/gzdoom
# Conflicts:
#	src/posix/cocoa/i_video.mm
#	src/win32/hardware.cpp
#	wadsrc/static/menudef.txt
2016-09-08 03:26:11 -04:00
raa-eruanna
32f758de41 Merge branch 'truecolor' of https://github.com/dpjudas/zdoom
# Conflicts:
#	src/v_video.cpp
2016-09-08 03:19:08 -04:00
Christoph Oelckers
7e2e3e8768 Merge branch 'master' of https://github.com/rheit/zdoom 2016-09-08 00:48:27 +02:00
Magnus Norddahl
e794e59cd2 Add con_scale for scaling just the console 2016-09-08 00:39:52 +02:00
Magnus Norddahl
6414e01354 Add uiscale slider controlling what scale the On setting uses for hud_scale, hud_althudscale and con_scaletext 2016-09-08 00:39:51 +02:00
Christoph Oelckers
40780ce2dd Merge branch 'master' of https://github.com/rheit/zdoom 2016-08-28 10:10:53 +02:00
Christoph Oelckers
da5cf760b0 - forgot to save this one... 2016-08-28 10:10:32 +02:00
Christoph Oelckers
abafcd5486 Merge branch 'master' of https://github.com/rheit/zdoom
# Conflicts:
#	wadsrc/static/language.enu
2016-08-28 10:00:19 +02:00
Christoph Oelckers
e04055dbb2 - added multiple message levels for 'developer' CVAR so that the important stuff won't get drowned in pointless notification spam that's of no use to anyone.
- made 'developer' CVAR persist across launches and added some menu entries for it.
- added checks for 'developer' to ACS's CheckInventory function.
2016-08-28 09:55:04 +02:00
Christoph Oelckers
36a4352867 Merge branch 'master' of https://github.com/rheit/zdoom 2016-08-09 20:15:35 +02:00
Christoph Oelckers
b4e712ab01 - made disabling the push window check a real compatibility option.
No idea why this was a hidden one, this one definitely needs to be in the menu.

- set some required compatibility options for Super Sonic Doom.
2016-08-09 20:15:13 +02:00
Magnus Norddahl
9953d70eaa Merge remote-tracking branch 'upstream/master' into truecolor 2016-08-06 20:45:35 +02:00
Christoph Oelckers
09e40840b5 Merge branch 'master' of https://github.com/rheit/zdoom 2016-08-05 15:15:11 +02:00
Magnus Norddahl
a893013dbb Adds HUD quadruple scale and a scale slider for the crosshair 2016-08-05 12:20:34 +02:00
Magnus Norddahl
aeb7df09de Added hardware gamma option and improved window handling on Windows 2016-07-27 11:15:19 +02:00
Magnus Norddahl
421cd2f403 Merge remote-tracking branch 'upstream/master' into truecolor 2016-07-17 23:36:35 +02:00
Christoph Oelckers
bce9929c22 Merge branch 'master' of https://github.com/rheit/zdoom 2016-07-16 19:57:09 +02:00
alexey.lysiuk
da9f4cc1dd Added 'ammo display order' item to options menu 2016-07-16 16:15:59 +02:00
Christoph Oelckers
57667c2e0b Merge branch 'master' of https://github.com/rheit/zdoom
# Conflicts:
#	wadsrc/static/language.eng
2016-06-29 14:58:32 +02:00
jayman2000
43e62c4236 Added sliders in the display options menu to control movebob and stillbob. 2016-06-29 13:02:55 +02:00
Magnus Norddahl
7705463966 Improved linear filtering of walls
Fixed some crash bugs
Added mipmap and filtering options to the display menu
2016-06-25 10:33:35 +02:00
Magnus Norddahl
05220a7133 Added IsBgra() to DCanvas
Changed SWRender output format to be decided by IsBgra()
2016-05-31 09:36:18 +02:00
Magnus Norddahl
7080180d47 Added menu option for toggling true color output on and off 2016-05-30 13:32:24 +02:00
Christoph Oelckers
2914cdc939 Merge branch 'master' of https://github.com/rheit/zdoom
# Conflicts:
#	src/r_defs.h
2016-04-24 12:19:07 +02:00
Randy Heit
593f6c29ad Use 2 decimal places for volume sliders, since they move in 0.05 increments 2016-04-23 22:38:55 -05:00
Christoph Oelckers
f4f489b33d Merge branch 'master' of https://github.com/rheit/zdoom 2016-03-14 22:02:58 +01:00
Christoph Oelckers
51ab60178a - added portal overlays to automap. 2016-03-13 12:33:58 +01:00
Christoph Oelckers
0bcbacea53 Merge branch 'master' of https://github.com/rheit/zdoom
# Conflicts:
#	src/posix/sdl/hardware.cpp
2016-03-04 01:21:59 +01:00
Michael Labbe
a28c8091fc UI support for 21:9
- Can specify aspect ratio 21:9 in video menu
 - menu_screenratios cvar can now force 21:9
2016-03-03 17:31:12 -06:00
MaxED
81a5273b58 Added "Miscellaneous Options" -> "Save/Load confirmation" option (defaults to true). When disabled, confirmation dialog won't be shown when performing quicksave/quickload. 2016-03-03 09:59:26 +01:00
Christoph Oelckers
a96d6ab072 Merge remote-tracking branch 'remotes/zdoom/master'
# Conflicts:
#	src/g_level.cpp
#	src/p_3dfloors.cpp
#	src/p_lnspec.cpp
#	src/p_saveg.cpp
#	src/p_spec.cpp
#	src/r_bsp.cpp
#	src/r_data/r_interpolate.cpp
#	src/r_data/r_translate.cpp
#	src/r_data/sprites.cpp
#	src/r_defs.h
#	src/r_sky.h
#	src/stats.h
#	src/textures/texturemanager.cpp
#	src/textures/textures.h
#	src/version.h
#	src/win32/fb_d3d9.cpp
#	src/win32/hardware.cpp
#	src/win32/i_system.cpp
#	wadsrc/static/actors/doom/doomarmor.txt
#	wadsrc/static/compatibility.txt
#	wadsrc/static/language.enu
#	wadsrc/static/mapinfo/common.txt
#	wadsrc/static/menudef.txt
#	wadsrc/static/xlat/eternity.txt
2016-03-01 18:50:45 +01:00
Randy Heit
55142078d8 Normalize line endings 2016-03-01 09:47:10 -06:00
Christoph Oelckers
205bbac411 Merge branch 'master' of https://github.com/rheit/zdoom 2016-02-25 13:01:51 +01:00
Christoph Oelckers
0f871a1d21 - fixed some language issues with the menu. 2016-02-25 09:27:30 +01:00
Christoph Oelckers
43ae0155bd Merge branch 'menudef_fix' of https://github.com/Blue-Shadow/zdoom 2016-02-24 14:12:25 +01:00
Blue-Shadow
81cca69303 Fixed "Detailed save messages" option's value
The value for that option was displayed as "Unknown", instead of "On" or
"Off".
2016-02-24 14:52:29 +03:00
Christoph Oelckers
8362a4516f Merge branch 'master' of https://github.com/rheit/zdoom 2016-02-24 11:26:35 +01:00
Christoph Oelckers
51da78ba29 - added a compatibility option to allow multiple exits to be triggered.
This is required by Daedalus's travel tubes which contain a faulty script with some leftover debug code.
2016-02-24 10:35:29 +01:00
Christoph Oelckers
8f53632317 - externalized the GZDoom-exclusive strings in Menudefs.enu 2016-02-21 11:37:31 +01:00
alexey.lysiuk
939823a141 Restored layout of Video Options menu
Screen size option was missed during the last merge
2016-02-21 10:19:15 +02:00
Christoph Oelckers
dfd7e08307 Merge branch 'master' of https://github.com/rheit/zdoom
# Conflicts:
#	wadsrc/static/menudef.txt
2016-02-21 01:55:15 +01:00
John Palomo Jr
c557c463e4 Converted all of the strings in menudef into language strings. 2016-02-20 20:04:29 +01:00
Christoph Oelckers
87f3a8f0cc Merge branch 'master' of https://github.com/rheit/zdoom 2016-02-03 13:04:16 +01:00
Christoph Oelckers
66f053f131 - on second thought: this shouldn't explode the speakers with too high values. 2016-02-02 15:02:06 +01:00
Christoph Oelckers
e12174ffc1 Merge branch 'master' of https://github.com/rheit/zdoom 2016-02-02 14:53:48 +01:00
Christoph Oelckers
c002c2fde9 - added a mastervolume setting for DUMB because its default volume is far less than all the other music options. 2016-02-02 14:45:32 +01:00