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
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
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
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
Christoph Oelckers
e73e26c15a
Merge branch 'master' of https://github.com/rheit/zdoom
2016-01-31 21:11:21 +01:00
coelckers
c3cc98b5f3
Merge pull request #523 from alexey-lysiuk/osx_fullscreen
...
Final touches to fullscreen mode on OS X
2016-01-31 16:56:35 +01:00
alexey.lysiuk
bb00c9b588
Added menu option to control fullscreen toggle shortcut on OS X
2016-01-31 10:34:17 +02:00
Christoph Oelckers
8bc7a0a24e
Merge branch 'master' of https://github.com/rheit/zdoom
2016-01-30 23:01:36 +01:00
John Palomo Jr
d8f7785ad9
Added dimamount and dimcolor to display options menu.
2016-01-30 16:44:50 -05:00
Christoph Oelckers
afcd755c7a
- changed autoaim menu option to a slider which allows a more precise control of the property.
...
- having a value of 5000 as the default for autoaim makes no sense, since this is an angle value that will always be clamped to [0..35]. So now 35 is both the default and the maximum.
2016-01-30 13:43:39 +01:00
Christoph Oelckers
68501dc784
Merge branch 'master' of https://github.com/rheit/zdoom
2016-01-05 12:23:50 +01:00
John Palomo Jr
b8b81e9809
Added turn180 to the controls menu.
2016-01-01 13:27:44 -05:00
Christoph Oelckers
3bad7f9b55
Merge branch 'master' of https://github.com/rheit/zdoom
2016-01-01 00:46:00 +01: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
86797b419f
Merge branch 'master' of https://github.com/rheit/zdoom
2015-12-30 12:28:55 +01:00
Christoph Oelckers
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
Christoph Oelckers
e0f9a59a9a
- add WildMidi config file CVAR to menu.
2015-12-29 22:14:40 +01:00
Christoph Oelckers
41f91148a1
Merge branch 'master' of https://github.com/rheit/zdoom
2015-12-02 09:31:27 +01:00