zdoom
/
qzdoom
mirror of https://github.com/ZDoom/qzdoom.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
14,106 Commits 86 Branches 139 Tags 124 MiB
Commit Graph

229 Commits

Author SHA1 Message Date
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 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 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
Christoph Oelckers 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
Magnus Norddahl 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
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 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 404b326812 Merge https://github.com/coelckers/gzdoom 2017-02-25 18:32:06 -05:00
Christoph Oelckers 5ea8ad54a4 - added tags to all ammo types. 2017-02-25 19:56:22 +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 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 942f90a759 Merge remote-tracking branch 'gzdoom/master' 2017-02-05 16:07:48 -05:00
Christoph Oelckers 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
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
Rachael Alexanderson a04699ec1c Merge https://github.com/coelckers/gzdoom 2017-01-24 18:15:39 -05:00
Rachael Alexanderson 9a777f719b - Added "gl_bandedswlight" to reduce the software light emulation gradient to 32 levels. 2017-01-24 22:24:53 +01:00
Rachael Alexanderson 84d2a89f49 Merge https://github.com/coelckers/gzdoom 
# Conflicts:
#	wadsrc/static/language.enu
 2017-01-24 12:03:57 -05:00
Rachael Alexanderson 6263704741 - Added menu options for pal tonemap tweaks. 
# Conflicts:
#	wadsrc/static/language.enu
 2017-01-24 17:57:03 +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
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 057060022a Merge remote-tracking branch 'gzdoom/master' into ssao 2016-11-27 09:59:57 +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 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
Magnus Norddahl be2c50f11c Merge remote-tracking branch 'gzdoom/master' into ssao 2016-10-21 23:48:30 +02:00
raa-eruanna 9cf9cc1318 Merge http://github.com/rheit/zdoom 
# Conflicts:
#	wadsrc/static/language.enu
 2016-10-21 13:37:12 -04:00
raa-eruanna 513f8312b3 - Renamed menu option for r_fullbrightignoresectorcolor 2016-10-21 08:36:20 -04: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
raa-eruanna 2a7b902a0a Merge http://github.com/coelckers/gzdoom 
# Conflicts:
#	src/gl/renderer/gl_renderer.cpp
 2016-10-10 10:39:07 -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
Christopher Bruns 779e6acb7b Create "final" two non-VR 3D modes: Column-interleaved and checkerboard. 2016-10-09 13:05:50 -04: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 e75cf42756 - Forgot to add language entries. 2016-10-07 00:35:06 -04:00
raa-eruanna 3ccc85876c - Forgot to add language entries. 2016-10-06 20:05:30 -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 4d1ea5c477 Added language entry for Linear skies. (oops) 2016-10-03 21:52:25 -04:00
Magnus Norddahl 51f867bc6c Merge branch 'ssao' into qzdoom 
# Conflicts:
#	src/gl/renderer/gl_renderer.cpp
#	wadsrc/static/language.enu
#	wadsrc/static/menudef.zz
#	wadsrc/static/shaders/glsl/main.fp
 2016-10-04 00:16:05 +02:00
Magnus Norddahl ecb57d6cd9 Merge remote-tracking branch 'gzdoom/master' into ssao 
# Conflicts:
#	src/gl/renderer/gl_renderer.cpp
#	src/gl/scene/gl_scene.cpp
#	src/gl/shaders/gl_shader.cpp
#	wadsrc/static/language.enu
#	wadsrc/static/menudef.zz
 2016-10-04 00:01:03 +02:00
Magnus Norddahl bcb64a3445 Merge branch 'ssao' into qzdoom 
# Conflicts:
#	src/gl/renderer/gl_postprocess.cpp
#	src/gl/renderer/gl_renderer.cpp
#	src/gl/scene/gl_scene.cpp
#	src/gl/shaders/gl_ambientshader.cpp
#	src/gl/shaders/gl_ambientshader.h
#	src/gl/system/gl_cvars.h
#	wadsrc/static/language.enu
#	wadsrc/static/menudef.zz
 2016-10-03 23:47:09 +02:00
raa-eruanna c6408e92e2 Merge http://github.com/coelckers/gzdoom 
# Conflicts:
#	src/gl/renderer/gl_postprocess.cpp
#	src/gl/renderer/gl_renderer.cpp
#	src/gl/scene/gl_scene.cpp
#	wadsrc/static/language.enu
#	wadsrc/static/menudef.zz
 2016-10-02 23:10:07 -04:00
alexey.lysiuk c68aa2b241 Added FXAA post-processing 
Implementation of Fast Approximate Anti-Aliasing is based on nVidia sample:
https://github.com/NVIDIAGameWorks/GraphicsSamples/tree/master/samples/es3-kepler/FXAA
 2016-10-03 00:15:45 +02:00
Christopher Bruns 960d4d6755 Create TopBottom3D mode and begin sketching RowInterleaved3D mode. 2016-10-02 16:09:02 -04:00
Magnus Norddahl 979e70ca8f Add gl_ssao_portals for controlling how many portals gets SSAO 2016-09-25 00:22:38 +02:00
Magnus Norddahl 3f11c0562c Add ssao quality setting 2016-09-25 00:22:38 +02:00
Magnus Norddahl 9076d46261 Added SSAO pass 2016-09-25 00:19:15 +02:00
Magnus Norddahl c21090333f Merge remote-tracking branch 'qzdoom/master' into dpdoom 2016-09-24 08:17:49 +02:00
Magnus Norddahl d126e91ded Merge remote-tracking branch 'gzdoom/master' into lightmath 
# Conflicts:
#	src/gl/renderer/gl_renderbuffers.cpp
#	src/gl/renderer/gl_renderbuffers.h
#	src/gl/renderer/gl_renderer.h
#	src/gl/scene/gl_scene.cpp
 2016-09-24 08:12:12 +02:00
raa-eruanna 2a9e97688d Merge http://github.com/coelckers/gzdoom 2016-09-22 05:23:02 -04:00
Christopher Bruns 1f79e23d5b Implement wide side-by-side mode, using adjusted aspect ratio in projection matrix. 
Use optimal framebuffer size for side-by-side modes.
 2016-09-22 09:25:46 +02:00
Christopher Bruns 9a257ac158 Implement side-by-side narrow 3D mode. 2016-09-22 09:25:46 +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
Magnus Norddahl f6bede8374 Merge remote-tracking branch 'gzdoom_upstream/master' into lightmath 
# Conflicts:
#	src/gl/renderer/gl_renderbuffers.cpp
#	src/gl/renderer/gl_renderbuffers.h
#	src/gl/renderer/gl_renderer.h
#	src/gl/scene/gl_scene.cpp
#	wadsrc/static/language.enu
#	wadsrc/static/menudef.z
 2016-09-09 09:31:30 +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 d2ead39bcc - force framebuffers for camera textures on GL 3+ hardware. With all the postprocessing stuff added I don't think it's ok to use the screenbuffer for this anymore. 
- disable framebuffers for camera textures in legacy mode entirely. This depends on a GL_DEPTH24_STENCIL8 surface which most of these old chipsets do not support, and I really see no point to invest any work here. The worst that can happen is that oversized camera textures won't be processed, which, due to general performance issues, might even be a good thing.
 2016-09-04 14:16:05 +02:00
Magnus Norddahl 737e700774 Added SSAO pass 2016-08-29 13:10:22 +02:00
Magnus Norddahl a1d90e1229 Merge remote-tracking branch 'gzdoom_upstream/master' into lightmath 2016-08-29 12:58:20 +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
Magnus Norddahl 9525d3690f Added gl_light_math and changed pixelpos + lights to be in eye space 2016-08-25 06:25:05 +02:00
Magnus Norddahl 25645d901e Add Palette LUT tonemap mode 2016-08-23 09:18:18 +02:00
Christoph Oelckers 5c267a2169 Merge branch 'master' of https://github.com/rheit/zdoom 
# Conflicts:
#	wadsrc/static/language.eng
 2016-08-21 08:42:06 +02:00
Christoph Oelckers ca8ef7f3f3 - moved bobbing menu strings into the correct file. 2016-08-16 11:20:22 +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