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

166 commits

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