zdoom/qzdoom-gpl
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom-gpl.git synced 2024-12-03 17:02:12 +00:00
Code Issues Projects Releases Packages Wiki Activity
12300 commits 2 branches 66 tags 53 MiB
Commit graph

230 commits

Author SHA1 Message Date
Rachael Alexanderson
0f1b39f138 Merge ../qzdoom 
# Conflicts:
#	CMakeLists.txt
#	src/CMakeLists.txt
#	src/posix/sdl/hardware.cpp
#	src/r_3dfloors.cpp
#	src/r_3dfloors.h
#	src/r_bsp.cpp
#	src/r_bsp.h
#	src/r_draw.cpp
#	src/r_draw.h
#	src/r_local.h
#	src/r_main.cpp
#	src/r_main.h
#	src/r_plane.cpp
#	src/r_plane.h
#	src/r_segs.cpp
#	src/r_segs.h
#	src/r_swrenderer.cpp
#	src/r_swrenderer.h
#	src/r_things.cpp
#	src/r_things.h
#	src/win32/fb_d3d9.cpp
#	src/win32/hardware.cpp
#	src/win32/zdoom.rc
 2017-03-06 22:25:22 -05:00
nashmuhandes
d298cc7414 Merge branch 'master' of https://github.com/coelckers/gzdoom 2017-03-02 22:15:28 +08: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
nashmuhandes
13c3e512d7 Merge branch 'master' of https://github.com/coelckers/gzdoom 2017-02-27 08:25:07 +08:00
Christoph Oelckers
346ada76bc - allow blocking controller input in the menu. 2017-02-26 20:59:24 +01:00
nashmuhandes
d1463535ba Merge branch 'master' of https://github.com/coelckers/gzdoom 2017-02-27 03:19:33 +08: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
nashmuhandes
58c08d5e65 Merge branch 'master' of https://github.com/coelckers/gzdoom 
# Conflicts:
#	src/CMakeLists.txt
 2017-02-17 18:33:16 +08: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
nashmuhandes
9e39b7d695 Merge branch 'master' of https://github.com/coelckers/gzdoom 2017-02-14 08:06:01 +08: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
nashmuhandes
4521f9eabc Merge tag 'g2.3.2' 
# Conflicts:
#	src/p_effect.cpp
#	src/p_secnodes.cpp
#	src/r_draw.cpp
#	src/r_things.cpp
#	src/win32/win32video.cpp
 2017-02-05 18:34:29 +08: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
5ec33de8a7 - removed r_columnmethod 1 because the code was broken and already gone from QZDoom. 2017-01-11 01:14:26 +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
nashmuhandes
4358c00c73 Merge branch 'master' of https://github.com/coelckers/gzdoom 
# Conflicts:
#	src/CMakeLists.txt
#	src/r_things.cpp
#	src/win32/fb_d3d9.cpp
#	src/win32/win32video.cpp
 2016-11-19 08:00:49 +08: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
nashmuhandes
e3df34845d Merge branch 'master' of https://github.com/coelckers/gzdoom 
# Conflicts:
#	src/CMakeLists.txt
#	src/asm_ia32/tmap2.asm
#	src/r_draw.h
#	src/r_drawt.cpp
#	src/r_main.cpp
#	src/r_things.cpp
#	src/r_things.h
#	src/win32/fb_d3d9.cpp
 2016-11-04 12:22: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
nashmuhandes
e39fd186ea Merge branch 'master' of https://github.com/coelckers/gzdoom 
# Conflicts:
#	src/r_bsp.cpp
#	src/r_main.cpp
#	src/r_things.cpp
 2016-10-25 19:36:09 +08:00
Christoph Oelckers
10203afa41 Merge branch 'master' of https://github.com/rheit/zdoom 2016-10-23 18:50:59 +02:00
nashmuhandes
dcc9a1ca6e Merge branch 'master' of https://github.com/coelckers/gzdoom 
# Conflicts:
#	src/r_draw.cpp
#	src/r_draw.h
 2016-10-22 15:06:09 +08:00
raa-eruanna
c76431414a - Implemented r_fullbrightignoresectorcolor from QZDoom 2016-10-21 07:06:24 -04:00