zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2024-11-16 09:31:14 +00:00
Code Issues Projects Releases Packages Wiki Activity
14416 commits 6 branches 6 tags 107 MiB
Commit graph

295 commits

Author SHA1 Message Date
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