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
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
9abf866241
- added menu option for r_vanillatrans
2017-06-02 12:37:54 -04:00
579febb6f8
- added menu option for r_vanillatrans
2017-06-02 12:36:29 -04:00
65bb8a5185
Merge commit 'refs/pull/338/head' of https://github.com/coelckers/gzdoom
2017-05-28 07:13:27 -04:00
619281de64
Revert "Merge commit 'refs/pull/336/head' of https://github.com/coelckers/gzdoom "
...
This reverts commit a05c38fefd0fb1a0604c
2017-05-28 07:12:41 -04:00
a49afd5bfc
Initial OpenVR mode.
...
Second attempt: clean up commit, and avoid messing with HDR framebuffer format.
2017-05-28 06:20:32 -04:00
a05c38fefd
Merge commit 'refs/pull/336/head' of https://github.com/coelckers/gzdoom
2017-05-28 01:33:59 -04:00
0fb1a0604c
Merge https://github.com/coelckers/gzdoom
2017-05-27 21:52:43 -04:00
c1bacdbf92
Create initial rotation-tracking-only implementation of OpenVR mode for VR headsets.
2017-05-27 19:42:49 -04:00
9435a09f1e
- Added vid_glswfb to menu on Mac.
2017-05-27 08:01:56 -04:00
9ebf1ec9a2
- Update menu to match new vid_glswfb config
...
- Added vid_glswfb to menu on Linux
2017-05-27 04:58:48 -04:00
0941cda7cc
Merge https://github.com/coelckers/gzdoom
2017-05-07 05:07:22 -04:00
996ce4497d
Add a resampler option for the OpenAL backend
2017-05-06 18:07:31 +02:00
a59336908c
Merge https://github.com/coelckers/gzdoom
2017-05-02 03:13:40 -04:00
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
050acc9271
- added rudimentary support for SVE.wad from the Strife Veteran edition so that the extended single player campaign is usable:
...
* all new things got either an sctor definition or are explicitly deleted through the 'doomednums' section in MAPINFO. CTC related actors are non-functional!
* added a 'noskillflags' option to 'doomednums' so that the lightmap definition things in the maps can be repurposed as dynamic lights.
* added the new dagger powerup.
* added MAPINFO entries for the added maps.
2017-05-01 21:25:54 +02:00
588d028499
Merge https://github.com/coelckers/gzdoom
2017-04-30 16:00:52 -04:00
49449e623e
Make an advanced sound option for snd_hrtf
2017-04-30 18:41:39 +02:00
11ec35b061
Merge https://github.com/coelckers/gzdoom
2017-04-20 21:04:33 -04:00
5d11c9962b
Merge commit '8db239d'
2017-04-18 11:33:52 -04:00
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
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
bf9edec91a
Merge https://github.com/coelckers/gzdoom
2017-03-30 18:04:37 -04:00
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
39826753f9
Merge https://github.com/coelckers/gzdoom
2017-03-30 02:11:03 -04:00
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
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
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
9eae422dab
Merge branch 'shadowmaps' of https://github.com/raa-eruanna/qzdoom into 3.0_work
...
# Conflicts:
# src/CMakeLists.txt
# wadsrc/static/language.enu
2017-03-11 19:55:43 +01:00
b660493051
Add menu option for disabling shadow maps and detecting if storage buffers are available or not
2017-03-10 19:10:40 +01:00
d84ba4b953
Merge https://github.com/coelckers/gzdoom
2017-03-02 04:22:32 -05:00
384accbc86
Fixed name and placement of 'All except doors' localized string
2017-03-02 10:12:11 +02:00
4ebd25171c
- Implemented a simple graphics switch. This currently affects NVidia Optimus-enabled notebooks only.
2017-03-01 09:58:56 -05:00
2a847ca570
Merge https://github.com/coelckers/gzdoom
2017-02-27 01:06:00 -05:00
346ada76bc
- allow blocking controller input in the menu.
2017-02-26 20:59:24 +01:00
404b326812
Merge https://github.com/coelckers/gzdoom
2017-02-25 18:32:06 -05:00
5ea8ad54a4
- added tags to all ammo types.
2017-02-25 19:56:22 +01:00
d94150f316
Revert "- Added menu option for clipmidtex compatflag"
...
This reverts commit 4a66621d9f
2017-02-23 05:57:34 -05:00
4a66621d9f
- Added menu option for clipmidtex compatflag
2017-02-23 04:57:49 -05:00
2a71ec89de
Merge https://github.com/coelckers/gzdoom
2017-02-13 17:02:56 -05:00
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
942f90a759
Merge remote-tracking branch 'gzdoom/master'
2017-02-05 16:07:48 -05:00
b570d0819b
- streamlined font handling for scripts a bit.
...
- moved the two 'you raised the alarm' messages for Strife to the string table
2017-02-05 13:14:22 +01:00
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
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
2017-01-28 18:26:52 +01:00
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
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
a04699ec1c
Merge https://github.com/coelckers/gzdoom
2017-01-24 18:15:39 -05:00
9a777f719b
- Added "gl_bandedswlight" to reduce the software light emulation gradient to 32 levels.
2017-01-24 22:24:53 +01:00
Rachael Alexanderson
Christopher Bruns
Chris Robinson
Christoph Oelckers
Magnus Norddahl
alexey.lysiuk