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

181 commits

Author SHA1 Message Date
nashmuhandes
9e39b7d695 Merge branch 'master' of https://github.com/coelckers/gzdoom 2017-02-14 08:06:01 +08: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
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
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
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
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
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
6e0defdc69 - fixed numeric output precision for a few sliders. 2016-11-01 13:48:56 +01: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
Christoph Oelckers
ce80d8157b Merge branch 'master' of https://github.com/rheit/zdoom 2016-10-20 10:24:37 +02:00
Magnus Norddahl
2fe545a4fd Merge r_stretchsky and r_capsky into r_skymode 2016-10-20 00:59:51 +02:00
Magnus Norddahl
5de8112578 Add support for capping sky with a solid color 2016-10-19 23:52:09 +02:00
nashmuhandes
378de3c109 Merge branch 'master' of https://github.com/coelckers/gzdoom 
# Conflicts:
#	src/r_things.cpp
 2016-10-14 14:26:29 +08: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
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
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
Christoph Oelckers
2d320a2e86 - added an option to disable the pickup screen flash. 2016-10-05 09:59:19 +02:00
nashmuhandes
35b1c18c97 Merge branch 'master' of https://github.com/coelckers/gzdoom 2016-09-22 16:38:46 +08: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
nashmuhandes
9472f09b7a Merge branch 'master' of https://github.com/coelckers/gzdoom 
# Conflicts:
#	src/r_main.cpp
 2016-09-11 13:14:10 +08: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
nashmuhandes
4dfc4fb468 Merge branch 'master' of https://github.com/coelckers/gzdoom 
# Conflicts:
#	src/r_things.cpp
#	src/sound/fmod_wrap.h
#	src/sound/fmodsound.cpp
#	src/sound/fmodsound.h
 2016-08-29 17:28:07 +08:00
Christoph Oelckers
40780ce2dd Merge branch 'master' of https://github.com/rheit/zdoom 2016-08-28 10:10:53 +02:00
Christoph Oelckers
da5cf760b0 - forgot to save this one... 2016-08-28 10:10:32 +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
nashmuhandes
6abb6d8d51 Merge branch 'master' of https://github.com/coelckers/gzdoom 2016-08-12 01:46:42 +08: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
Christoph Oelckers
09e40840b5 Merge branch 'master' of https://github.com/rheit/zdoom 2016-08-05 15:15:11 +02:00
Magnus Norddahl
a893013dbb Adds HUD quadruple scale and a scale slider for the crosshair 2016-08-05 12:20:34 +02:00
nashmuhandes
c2fb7706d6 Merge branch 'master' of https://github.com/coelckers/gzdoom 
# Conflicts:
#	src/r_things.cpp
 2016-07-28 17:50:47 +08:00
Magnus Norddahl
aeb7df09de Added hardware gamma option and improved window handling on Windows 2016-07-27 11:15:19 +02:00
nashmuhandes
1f400a604d Merge branch 'master' of https://github.com/coelckers/gzdoom 2016-07-18 13:28:10 +08:00
Christoph Oelckers
bce9929c22 Merge branch 'master' of https://github.com/rheit/zdoom 2016-07-16 19:57:09 +02:00
alexey.lysiuk
da9f4cc1dd Added 'ammo display order' item to options menu 2016-07-16 16:15:59 +02:00
nashmuhandes
4292311f53 Merge branch 'master' of https://github.com/coelckers/gzdoom 
# Conflicts:
#	src/r_things.cpp
#	src/r_things.h
 2016-07-05 21:52:38 +08:00