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
|
6e0defdc69
|
- fixed numeric output precision for a few sliders.
|
2016-11-01 13:48:56 +01: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
|
2fe545a4fd
|
Merge r_stretchsky and r_capsky into r_skymode
|
2016-10-20 00:59:51 +02:00 |
|
Magnus Norddahl
|
5de8112578
|
Add support for capping sky with a solid color
|
2016-10-19 23:52:09 +02: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 |
|
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
|
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 |
|
Christoph Oelckers
|
2d320a2e86
|
- added an option to disable the pickup screen flash.
|
2016-10-05 09:59:19 +02: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 |
|
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 |
|
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 |
|