zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-12-11 13:11:07 +00:00
Code Issues Projects Releases Packages Wiki Activity
18605 commits 86 branches 139 tags 124 MiB
Commit graph

3867 commits

Author SHA1 Message Date
Christoph Oelckers
5df8919b90 Merge branch 'master' into userlights 2019-07-07 08:11:09 +02:00
Major Cooke
b66b4ae0ec 'Fixed' spacing. 2019-07-03 18:01:45 +02:00
Major Cooke
7b698b4a0e Added RenderUnderlay. 
- Works exactly like RenderOverlay, but is drawn behind the status bar/huds instead.
 2019-07-03 18:01:45 +02:00
Christoph Oelckers
1dcbe43d95 - User definable dynamic lights 
This hasn't been tested yet!
 2019-06-28 12:35:42 +02:00
Christoph Oelckers
20b6395cf0 - give UMAPINFO the ability to disable cluster-based exit texts. 2019-06-18 20:40:41 +02:00
alexey.lysiuk
44f896174a - restored indication of console scrolling 
https://forum.zdoom.org/viewtopic.php?t=65070
 2019-06-17 10:32:13 +03:00
alexey.lysiuk
459fe74a1f - made console cursor fill whole character box 
https://forum.zdoom.org/viewtopic.php?t=64962
 2019-06-17 09:46:57 +03:00
alexey.lysiuk
d5d509ea10 - switched to unconditional level exit in scriptified actors 
Action special may not work properly in a very specific setup
E.g., exit to the next level within a hub via boss brain death was broken
 2019-06-16 15:05:36 +02:00
alexey.lysiuk
cc5bff6c9c - exported unconditional level exit to ZScript 
Exit_Normal and Exit_Secret specials imply addition conditions to make a decision about proceeding to the next map
A few scriptified actors require a bypass of these conditions in order to work properly
 2019-06-16 15:05:36 +02:00
Rachael Alexanderson
764e95f34f - compat_pointonline for doom2 map14 2019-06-15 04:57:03 -04:00
Alexander
c161635cca localize custom menu titles in option search results 2019-06-12 17:37:29 +02:00
alexey.lysiuk
b6ada166fc - fixed compilation of FXAA shader by macOS OpenGL 
Compile Shader 'shaders/glsl/fxaa.fp':
ERROR: 0:250: '' : syntax error: incorrect preprocessor directive
ERROR: 0:250: '' : syntax error: unexpected tokens following #if preprocessor directive - expected a newline
ERROR: 0:265: '' : syntax error: incorrect preprocessor directive
ERROR: 0:265: '' : syntax error: unexpected tokens following #if preprocessor directive - expected a newline
ERROR: 0:266: '' :   Macro Redefined lumaM
ERROR: 0:301: '' : syntax error: incorrect preprocessor directive
ERROR: 0:301: '' : syntax error: unexpected tokens following #if preprocessor directive - expected a newline
ERROR: 0:599: '' : syntax error: incorrect preprocessor directive
ERROR: 0:599: '' : syntax error: unexpected tokens following #if preprocessor directive - expected a newline

https://forum.zdoom.org/viewtopic.php?t=65003
 2019-06-11 08:20:24 +03:00
Gutawer
324a720d56 - added a linear transformation system to Shape2D so that things like rotations and scales can be changed without having to clear and push a large amount of data 2019-06-08 14:05:32 +02:00
Rachael Alexanderson
0e6d30f671 - language update 2019-06-07 09:11:28 -04:00
alexey.lysiuk
5c0562ca7a - check for presence of fonts in message box menu 
https://forum.zdoom.org/viewtopic.php?t=64958
 2019-06-07 11:49:01 +03:00
Blue Shadow
b026b7a880 - fixed PlaySpawnSound call in A_ThrowGrenade 2019-06-05 11:28:59 +03:00
alexey.lysiuk
addcad8ac0 - disabled discard in FXAA shader with Vulkan backend 
Discard caused graphical corruptions on AMD hardware with Vulkan backend enabled

https://forum.zdoom.org/viewtopic.php?t=64230
 2019-06-04 11:32:00 +03:00
alexey.lysiuk
da2d0e47e6 - removed array length() function from shadowmap shader 
Array's length() function is not yet supported by SPIRV-cross and MoltenVK
Its usage was replaced by explicit nodes count value passed as uniform
 2019-05-24 14:29:37 +03:00
Christoph Oelckers
61ead74492 - made the colorset names and the texts in the color picker localizable. 2019-05-19 18:57:39 +02:00
Christoph Oelckers
04334aa0fe - implemented subtitle display for Blackbird's voiceover messages. 2019-05-19 12:16:42 +02:00
alexey.lysiuk
270f8fb381 - added missing quotation mark in menu definition 
Script error, "gzdoom.pk3:menudef.txt" line 1472:
Insufficient parameters for OptionMenuItemOption
 2019-05-19 13:01:09 +03:00
Christoph Oelckers
2c226afff1 - implemented subtitles for intermission slideshows. 2019-05-19 10:28:07 +02:00
Christoph Oelckers
35e25a8aea - language update. 2019-05-19 08:11:11 +02:00
Christoph Oelckers
7a8defd76f - added European Portuguese to the menu. 
This is sufficiently complete with only some intermission texts and the Strife dialogues falling back to the Brazilian version.
 2019-05-18 18:46:07 +02:00
Alexander
7540de4027 added a crosshair on/off toggle 2019-05-18 11:32:48 +02:00
Rachael Alexanderson
a40c7821a1 - language update 2019-05-14 14:06:53 -04:00
Magnus Norddahl
f3cb5e09e4 - SIMPLE is never ever defined for main.fp 2019-05-13 22:38:16 +02:00
Magnus Norddahl
bab5862383 - fix some vulkan warnings 2019-05-13 21:15:10 +02:00
alexey.lysiuk
7298ba2707 - do not show par time when it's zero 
https://forum.zdoom.org/viewtopic.php?t=64551
 2019-05-13 11:04:55 +03:00
Magnus Norddahl
5f12191c05 - fix validation error for shader input not declared by main.vp 2019-05-12 23:15:49 +02:00
Magnus Norddahl
e75ab8ed09 - fix wrong fog color used for ssao when using multisampling 2019-05-05 23:23:47 +02:00
player701
32109a75a7 - Fixed random generation of friendly obituaries 2019-05-04 21:06:09 +02:00
Magnus Norddahl
1973001834 - use the exact sRGB->linear transfer function in HDR mode as the 2.2 gamma approximation is visibly inaccurate in this case 2019-05-01 00:55:31 +02:00
Rachael Alexanderson
777a4c600a - bump zscript version to 4.2 - if this gets feature updates it should give warnings ahead of time, this time 2019-04-29 00:14:03 -04:00
alexey.lysiuk
6d1a85af3c - fixed deprecation warnings in core scripts 
Script warning, "gzdoom.pk3:zscript/ui/statscreen/statscreen.zs" line 24:
Call to deprecated function CharAt
Script warning, "gzdoom.pk3:zscript/ui/statscreen/statscreen.zs" line 24:
Accessing deprecated function CharAt - deprecated since 4.1.0
Script warning, "gzdoom.pk3:zscript/ui/menu/search/query.zs" line 64:
Call to deprecated function ToLower
Script warning, "gzdoom.pk3:zscript/ui/menu/search/query.zs" line 64:
Accessing deprecated function ToLower - deprecated since 4.1.0
Script warning, "gzdoom.pk3:zscript/ui/menu/search/query.zs" line 65:
Call to deprecated function ToLower
Script warning, "gzdoom.pk3:zscript/ui/menu/search/query.zs" line 65:
Accessing deprecated function ToLower - deprecated since 4.1.0
Script warning, "gzdoom.pk3:zscript/ui/menu/conversationmenu.zs" line 202:
Call to deprecated function CharAt
Script warning, "gzdoom.pk3:zscript/ui/menu/conversationmenu.zs" line 202:
Accessing deprecated function CharAt - deprecated since 4.1.0
Script warning, "gzdoom.pk3:zscript/ui/menu/conversationmenu.zs" line 235:
Call to deprecated function CharAt
Script warning, "gzdoom.pk3:zscript/ui/menu/conversationmenu.zs" line 235:
Accessing deprecated function CharAt - deprecated since 4.1.0
 2019-04-28 11:26:01 +03:00
alexey.lysiuk
63d30e27a6 - bump versions to match the latest release 
we don't want to miss deprecation warnings
 2019-04-28 11:24:24 +03:00
Christoph Oelckers
5f871b7aa0 - mark NewPlayerMenu as protected. 2019-04-26 12:54:57 +02:00
Christoph Oelckers
03828bb759 - removed the leftovers of the removed savedamount variable. 2019-04-26 12:00:58 +02:00
Christoph Oelckers
3bb42aaff7 - removed the MaxAmount fudging from MaxHealth. 2019-04-26 09:58:58 +02:00
Christoph Oelckers
933ff805f1 - another text update. 2019-04-25 09:40:52 +02:00
Christoph Oelckers
23e2b1c0c0 - use Obituary for both Demon and Spectre. 2019-04-23 10:49:18 +02:00
Christoph Oelckers
cbb3e17267 - minor text update. 2019-04-23 10:42:41 +02:00
Christoph Oelckers
5122aa0571 - fixed the internal name of the original SmallFont to be different from the real SmallFont. This necessitated creating a separate font object, even if it has the same contents. 
- added an OriginalBigFont as well.
 2019-04-23 09:34:28 +02:00
Christoph Oelckers
e0d57e5464 - added smarter font replacement logic to the confirmation screen. 2019-04-23 08:47:06 +02:00
Nemrtvi
4a33f4f85b Sort language options 
Reorders the languages to appear in alphabetical order, adds an English keyword, and adds an accent mark to Portuguese.
 2019-04-22 19:20:45 +02:00
Christoph Oelckers
8357f2b16b - re-enabled code block commented out for testing. 2019-04-22 18:52:21 +02:00
Christoph Oelckers
e53fc83ef2 - text update. 2019-04-22 12:07:28 +02:00
Christoph Oelckers
ec13d0e4c1 Merge remote-tracking branch 'remotes/origin/vulkan2' 2019-04-22 10:45:32 +02:00
Christoph Oelckers
6f3982865f - refinement of font substitution logic. 2019-04-22 10:23:28 +02:00
Christoph Oelckers
e0a0be4f7b - added a CanPrint function to FFont and used that to handle the statistics display on the automap HUD to only replace the font when actually needed, not based on the language. 2019-04-22 09:08:43 +02:00
Christoph Oelckers
5b6bae409e - automated the SmallFont selection based on a filter string in the language table. 2019-04-21 12:38:43 +02:00
Christoph Oelckers
13841655aa - add color remapping for NewSmallFont as well. 2019-04-21 10:49:27 +02:00
Christoph Oelckers
fcbde757c9 - do not mix game-specified fonts with the extensions for the stock version. 
This generally doesn't look good when different colors are mixed or the mismatch in color ranges causes bad translations to be generated.
 2019-04-21 08:09:31 +02:00
Christoph Oelckers
cbc3bc500f - fixed inverted logic for displaying the generic log in Strife. 2019-04-20 09:04:31 +02:00
Magnus Norddahl
62fa74485d Merge remote-tracking branch 'origin/master' into vulkan2 2019-04-19 18:49:00 +02:00
Christoph Oelckers
ec8e57c61e - text update. 2019-04-19 10:57:58 +02:00
Christoph Oelckers
4e23d543ef - re-added the menu option for wipetype which got lost in a recent menu reorganization. 2019-04-19 09:35:03 +02:00
Christoph Oelckers
23412a4f28 - fixed a few developer warnings. 2019-04-19 09:08:31 +02:00
Christoph Oelckers
a5d743cc3b - fixed: The color sliders in the player setup menu may not be selected when inactive. 2019-04-19 07:50:52 +02:00
Christoph Oelckers
68597da75d - removed debug output. 2019-04-19 07:24:23 +02:00
Christoph Oelckers
35186e9fd7 - adjustments to the player menu so that the display isn't cut off on the smallest screen sizes. 2019-04-18 00:16:09 +02:00
Christoph Oelckers
2a329950f6 - fixed menu caption for languages which use the VGA font. 2019-04-17 23:40:05 +02:00
Magnus Norddahl
d63513ec14 - fix normal vectors on models 2019-04-17 20:42:00 +02:00
Magnus Norddahl
15dae4cfe6 - rewrite depthblur.fp to workaround what seemed to be a bug in the NVidia driver 2019-04-16 16:17:23 +02:00
Rachael Alexanderson
5913f72c9f Merge remote-tracking branch 'origin/master' into vulkan2 2019-04-16 08:11:53 -04:00
Rachael Alexanderson
09a2b53b21 - rename vid_backend to vid_enablevulkan. Also changed the CVAR from a 0-state enable to 1-state. So vid_enablevulkan==1 enables vulkan now. This should be less confusing. 2019-04-16 08:10:57 -04:00
Christoph Oelckers
89a11d1a9d - added Korean and Portuguese to the language menu 
Also add an English name in parentheses to Russian and Korean so that people not fluent in these scripts know what they selected.
 2019-04-16 10:27:47 +02:00
Magnus Norddahl
9d29a460de - simplify depthblur.fp into a single function 2019-04-16 08:59:29 +02:00
Magnus Norddahl
67490d13cb - add gl_ssao_debug mode showing the depth 2019-04-16 05:29:32 +02:00
Magnus Norddahl
558760c090 - fix the gl_ssao_debug cvar 2019-04-16 03:32:54 +02:00
Rachael Alexanderson
73efe707ac Merge remote-tracking branch 'origin/master' into vulkan2 2019-04-15 01:34:22 -04:00
Christoph Oelckers
a8c47408fa - implemented 'deletelumps' feature and add Chex Quest 3 texts. 
The episode titles required a workaround because the CQ3 episodes do not contain names in text form: If this is the case, the patch name will be used as a string table identifier to get a matching text for localization.
 2019-04-14 22:46:03 +02:00
Christoph Oelckers
c45c7cdb4b - reimplemented as an OptionsMenu. 
This is both for consistency and better localizability. The old code is retained to ensure that mods inheriting from the old menu continue to work.
 2019-04-14 14:03:24 +02:00
Rachael Alexanderson
b8dfb3c136 Merge remote-tracking branch 'origin/master' into vulkan2 2019-04-14 06:12:32 -04:00
Player701
ad23726cb6 - Fixed conditions tested for when checking whether "Force respawn" or "Respawn protection" dmflags are enabled 2019-04-14 05:40:23 -04:00
Player701
8ab6747d77 - Added "const" qualifiers to the new UTF-8-aware string methods 2019-04-13 22:13:52 +02:00
Player701
747906730c Added support for monospacing alignment modes to HUDFont / BaseStatusBar.DrawString (#810) 
* - Added support for monospacing alignment modes to HUDFont / BaseStatusBar.DrawString

* - added underlying type declaration for EMonospacing

* - replaced "#include v_video.h" with a declaration of EMonospacing
 2019-04-13 18:10:58 +02:00
Christoph Oelckers
d73f8faafa - added monospacing support to Screen.DrawText and its native counterparts. 2019-04-13 12:17:38 +02:00
Christoph Oelckers
3938119192 - added CharUpper and CharLower functions to ZScript. 
These, like MakeUpper and MakeLower, use the internal Unicode case conversion tables.
 2019-04-13 10:26:55 +02:00
Christoph Oelckers
f7561f25d6 - added Unicode aware MakeUpper/MakeLower functions to FString and ZScript's String and deprecated ToUpper/ToLower because their semantics did not allow fixing them. 2019-04-13 10:12:33 +02:00
Christoph Oelckers
bcf7bc8d34 - added some UTF-8 utilities to FString. 
This deprecated CharAt and CharCodeAt for being unsuitable for text processing and in the case of CharCodeAt also for being buggy.
A new replacement, ByteAt has been added that reads a string byte by byte, as well as CodePointCount, which counts the amount of Unicode code points in a string and GetNextCodePoint which reads the string code point by code point.
Note that while this woll work as intended with the currently supported languages as a means to read single characters, there is no guarantee that this will remain so if Unicode support gets extended to things which break the "one code point == one character" assumption.
 2019-04-13 09:31:36 +02:00
Christoph Oelckers
c0b322c51a - make the switch between game and generic fonts automatic by adding a key value to the language table 2019-04-12 00:20:42 +02:00
Rachael Alexanderson
3deda0efd2 Merge remote-tracking branch 'origin/master' into vulkan2 2019-04-11 17:45:35 -04:00
Christoph Oelckers
1090c4b345 - added generic font support to the dialogue system. 2019-04-11 18:56:13 +02:00
Rachael Alexanderson
aeb63321ad - add optional hacx_gzdoom_stuff.pk3 to HacX's IWADINFO 2019-04-11 12:28:54 -04:00
Magnus Norddahl
db4310ca6b - prevent excessively bright pixels as this is actually visible on a HDR monitor 2019-04-11 03:34:34 +02:00
Christoph Oelckers
b1ca746af3 - added a "DeleteLumps" list to IWADINFO 
This is for IWADs that contain content which clashes with the engine and must be removed. The primary reason are the unimplemented characters in Raven's BigFont.
 2019-04-11 03:02:23 +02:00
Christoph Oelckers
9f5b0001fe - handle generic fonts on the summary screen. 2019-04-11 02:00:51 +02:00
Christoph Oelckers
9fddc38030 - allow all list menu items to fall back on the Unicode font for languages which are not supported by the bitmap font. 
This allows the primary menus to display Korean text without any further special handling.
 2019-04-10 22:25:31 +02:00
Christoph Oelckers
b423caa8d6 - removed the rather pointless hud_althudfont CVAR and the tiny piece of code it activated. 
This was meant for using the VGA font in the alternative HUD but this never went beyond the Kill/Item/Secret display which isn't useful for localization.
 2019-04-10 21:57:24 +02:00
Christoph Oelckers
4bd01de4db - updated strings. 2019-04-10 21:33:06 +02:00
Christoph Oelckers
5e5780dd65 - allow using the VGA font for map name display on the alternative HUD. 2019-04-10 21:21:33 +02:00
Christoph Oelckers
31d1f8ba50 - fixed redundant map name display on alternative HUD's automap HUD. 2019-04-10 20:56:24 +02:00
Christoph Oelckers
1b077c560d - removed unused mSmallFont. 2019-04-10 20:43:00 +02:00
Christoph Oelckers
9e096c62fd - allow the automap HUD to use the VGA font. 2019-04-10 20:39:15 +02:00
Rachael Alexanderson
7b06fbe28e Merge remote-tracking branch 'origin/master' into vulkan2 2019-04-10 04:02:42 -04:00
Christoph Oelckers
939815d6bf - added VGA font support to the MessageBoxMenu class 
This is optional, of course.
 2019-04-10 01:33:02 +02:00
Christoph Oelckers
f1105f2e13 - further work on generic HUD 
Some reorganization to avoid code duplication plus making the log screen capable of using the generic font. This also means that the popup for the log in Strife's status bar will be disabled when in generic mode - this popup with its special font would be a bit problematic.
 2019-04-10 00:45:32 +02:00
Christoph Oelckers
8b0dd1376f - changed the filter name for Doom IWADs 
It's "doom.id.doom1/2" instead of "doom.doom1/2" now.
The config file's content will be renamed and for lump filtering a fallback has been added - note that you cannot combine both naming schemes! The old one has to be considered deprecated now.

This also removes the duplicated content necessitated by the old naming scheme.
 2019-04-10 00:15:16 +02:00
Christoph Oelckers
7a01b6b0d4 - use Unicode font for deathmatch summary screen to bring it in line with the coop version. 2019-04-09 20:15:40 +02:00
Rachael Alexanderson
536aa98e87 Merge remote-tracking branch 'origin/master' into vulkan2 2019-04-09 02:01:29 -04:00
Christopher Bruns
263842169e Fix typo: add missing dollar sign in new stereo 3D submenu. 2019-04-08 19:45:48 +02:00
Magnus Norddahl
c28e56f9e8 - workaround buggy preprocessor in old AMD OpenGL drivers 2019-04-07 19:42:32 +02:00
Rachael Alexanderson
06c0aa911d Merge branch 'master' of https://github.com/coelckers/gzdoom into vulkan2 2019-04-07 07:03:43 -04:00
Rachael Alexanderson
1096c14a3a - remove 320x240 from the list of resolution presets 
- enforce a minimum CleanXfac scaling in the menu to prevent accidental divide by 0's
 2019-04-07 06:02:36 -04:00
Rachael Alexanderson
e6dab46b90 - remove 320x240 from the list of resolution presets 
- enforce a minimum CleanXfac scaling in the menu to prevent accidental divide by 0's
 2019-04-07 06:01:47 -04:00
Christoph Oelckers
a166af82f8 - added layout adjustment to the skill menu as well and shortened the Italian text for "I'm too young to die" because it did not fit the minimum available space. 2019-04-07 09:11:16 +02:00
Christoph Oelckers
6afe9d09f3 Merge branch 'master' into vulkan2 2019-04-07 08:17:12 +02:00
Rachael Alexanderson
8dc7190fb3 - don't autoload nerve.wad with regular Doom 2. 2019-04-06 08:21:42 -04:00
Christoph Oelckers
b01529f473 - removed a few unnecessary abbreviations in the Spanish menu texts. 2019-04-06 09:59:32 +02:00
Christoph Oelckers
6928e019ca - language update. 2019-04-06 09:28:22 +02:00
Christoph Oelckers
aed9c458db Revert "- initial layout for new player setup menu." 
This reverts commit 1567bc5911.
 2019-04-05 12:25:16 +02:00
Christoph Oelckers
2a6cdc7a6a Merge branch 'master' of https://github.com/coelckers/gzdoom 2019-04-04 17:40:52 +02:00
Rachael Alexanderson
655b0c27de Merge branch 'master' of https://github.com/coelckers/gzdoom into vulkan2 2019-04-03 10:58:12 -04:00
Christoph Oelckers
55e00f350b - use a more reliable menu check for the player menu items. 
This needs to ensure that it only allows modification from within a menu's event handlers and nowhere else.
 2019-04-01 00:27:43 +02:00
Nemrtvi
a6593e1400 Update language list in MENUDEF 
The file renames “enu” to “default” for consistency and only contains languages that are complete/up to date, i.e. American English, British English, German, Castilian Spanish, Latin American Spanish, French, and Russian. Italian, while not 100% complete, contains a full engine translation, so it has enough material to make it here.
 2019-04-01 00:12:04 +02:00
Christoph Oelckers
1567bc5911 - initial layout for new player setup menu. 2019-03-31 13:34:55 +02:00
Christoph Oelckers
4b40e266f1 - use the proper virtual methods for setting and retrieving the string in OptionMenuItemTextField. 
Without this the class cannot be properly subclassed.
 2019-03-31 10:33:46 +02:00
Christoph Oelckers
a08cc2b477 - switched the input grid to the new font. Also use the same scale as the rest of the menus. 2019-03-31 10:08:09 +02:00
Marisa Kirisame
659de5d2d8 Silence "truncation of floating point value" warnings in gzdoom.pk3. 2019-03-31 09:50:59 +02:00
Rachael Alexanderson
ead3695844 Merge branch 'master' of https://github.com/coelckers/gzdoom into vulkan2 
# Conflicts:
#	src/posix/sdl/gl_sysfb.h
 2019-03-31 03:49:08 -04:00
Christoph Oelckers
8919a991a7 - fixed: The on-screen keyboard did not properly delete the last character of the input string. 2019-03-31 09:48:15 +02:00
Rachael Alexanderson
3fd449378c - replace the lost 320x200 resolution with 960x600 2019-03-31 03:38:15 -04:00
Christoph Oelckers
ab16d3cd72 - limit minimum screen size to 640x400. 
The current menu system simply does not work that well with 320x200, rendering the game hard to use at that tiny screen size. This is a clear case where the work required to keep it operational stands in no relation to the benefit.
 2019-03-31 09:13:22 +02:00
Christoph Oelckers
a768500afa - do not use CalcIndent for 320x200. 2019-03-31 09:02:11 +02:00
Nemrtvi
282cce765d MENUDEF change for new strings in Russian 
This is to accomodate the grammatical gender system.
 2019-03-30 21:26:15 +01:00
Christoph Oelckers
f5ad144934 - fixed: air_finished was sometimes checked against level.time, sometimes against level.maptime. 
For a per-level effect it needs to always check against level.maptime.
 2019-03-30 18:52:32 +01:00
Christoph Oelckers
f48e0280d8 - fixed: OptionMenuItemSafeCommand did not allow unsafe commands. 2019-03-30 09:25:48 +01:00
Christoph Oelckers
4619fc5622 - removed unused (now always active) gl_trimsprites option from the menu. 2019-03-29 19:10:10 +01:00
Rachael Alexanderson
bd284cf337 Merge branch 'master' of https://github.com/coelckers/gzdoom into vulkan2 2019-03-29 04:53:10 -04:00
player701
2766b5ab2b - Fixed misplaced vertex on Community Chest MAP16 2019-03-28 18:55:32 +01:00
alexey.lysiuk
c4ef8ce465 - fixed level progression of titan-426 map on easy skill 
https://www.doomworld.com/idgames/levels/doom2/Ports/s-u/titan426
 2019-03-27 13:18:33 +02:00
Rachael Alexanderson
1dd0909ec2 - fix a missing texture in strife map21 2019-03-27 06:57:41 -04:00
Christoph Oelckers
f4401d1525 - this option was in the wrong menu 2019-03-26 17:30:44 +01:00
Magnus Norddahl
4cc9880f50 Merge remote-tracking branch 'origin/master' into vulkan2 2019-03-26 13:08:59 +01:00
Christoph Oelckers
0341a3d75b - made the gross railing hack for Strife a compatibility option and restricted it to MAP04 
The side effects here broke other maps and this is really too glitchy to be turned on unless really necesasary.
 2019-03-26 00:38:54 +01:00
Rachael Alexanderson
ddc67fb1bc - fix missing texture in Strife MAP15 2019-03-25 23:54:01 -04:00
Magnus Norddahl
2d8516b2ca - make shaderClipDistance optional 2019-03-25 19:44:46 +01:00
alexey.lysiuk
6c91d15b0a - fixed adjustment of options menu slider with mouse 
https://forum.zdoom.org/viewtopic.php?t=64063
 2019-03-25 12:59:36 +02:00
Rachael Alexanderson
91dfebd211 Merge branch 'master' of https://github.com/coelckers/gzdoom into vulkan2 
# Conflicts:
#	wadsrc/static/menudef.txt
 2019-03-24 09:08:55 -04:00
Christoph Oelckers
10b25110c4 - restored some accidentally deleted parts of the Display Options menu. 2019-03-24 13:41:43 +01:00
Rachael Alexanderson
26ec0f6f17 - fixed: VideoOptions was renamed to DisplayOptions, but its menu reference was not updated, causing a VM abort 2019-03-24 08:18:44 -04:00
Christoph Oelckers
48cff0a617 - fixed the label for "Master Volume". 
The text already existed, just with a different name.
 2019-03-24 12:56:38 +01:00
Christoph Oelckers
92586e6c17 - did a bit of cleanup on the option menus by regrouping some settings, especially splitting out of the Hardware Rendering Options menu into submenus. 2019-03-24 12:42:57 +01:00
Christoph Oelckers
dc67355e95 - added A_Explode compatibility options. 
There are two options here - one only disables the vertical thrust and the other goes back fully to the original non-z-aware code.
Both options are settable through MAPINFO.
For the compatibility presets, the normal ones only disable the vertical thrust, the strict ones force use of the old code entirely.
 2019-03-24 12:42:57 +01:00
Christoph Oelckers
d9ac337d7a - fixed string table references for "No Rest for the Living." 2019-03-24 12:42:56 +01:00
Player701
456c1eb926 - Added Unholy Realms MAP27 to the node rebuild compatibility list 2019-03-23 15:28:27 +01:00
Christoph Oelckers
4fff8a41b7 Merge branch 'master' into vulkan2 2019-03-23 09:49:57 +01:00
Christoph Oelckers
6ba8067499 - language update. 2019-03-23 09:49:15 +01:00
Christoph Oelckers
4aef99632d Merge branch 'master' into vulkan2 2019-03-21 18:56:06 +01:00
Christoph Oelckers
6d82e6f5f5 - fix some holes the player can fall in for darken2 MAP12. 
This map went a bit too far with lighting hacks depending on holes in the floor.
 2019-03-20 21:50:27 +01:00
Christoph Oelckers
0b84d6b204 - added a compatibility handler for a badly constructed crossbeam bridge in Unholy Realms MAP17. 2019-03-20 21:39:53 +01:00
Christoph Oelckers
9f6b8cd323 - fixed spacing of Strife's merchant's texts. 2019-03-20 00:49:00 +01:00
Christoph Oelckers
cdc109fbc0 - fixed space calculations for option menu sliders. 2019-03-20 00:01:12 +01:00
Rachael Alexanderson
4fae7ad4a9 - implement a menu for Vulkan. todo: Implement a way to select a Vulkan renderer directly, also todo: Hide Vulkan menu if the system doesn't support it. 2019-03-19 15:38:34 -04:00
Rachael Alexanderson
3c594c6c93 Merge remote-tracking branch 'origin/master' into vulkan2 2019-03-19 15:12:18 -04:00
Christoph Oelckers
6e0e221804 - give Hexen's PoisonCloud the OLDRADIUSDMG flag. 
This actor has such oddball semantics that it's better not subjected to the revised radius damage code.
 2019-03-19 19:54:46 +01:00
Christoph Oelckers
0abd9d4aec - fixed slider scaling. 2019-03-19 18:50:38 +01:00
Christoph Oelckers
a1acc4adc4 - fixed layout issues with Strife's dialogues. 
They were using some settings from the option menu which they never should have used to begin with.
 2019-03-19 17:46:59 +01:00
Christoph Oelckers
cda248df66 - localized some user-facing texts that were still string literals. 2019-03-19 00:37:43 +01:00
Christoph Oelckers
d86dd902fb Merge branch 'master' into vulkan2 2019-03-18 13:31:04 +01:00
Christoph Oelckers
8f93dcc884 - fixed the option menu indentation. 
This was yet another piece of code that essentially was unworkable thanks to the limited screen space with the old bitmap fonts.
With the new font there is enough screen space to do this properly.
 2019-03-18 10:54:26 +01:00
Christoph Oelckers
86f9824c2a - updated the text data to the content of the Google spreadsheet. 2019-03-18 10:18:31 +01:00
Rachael Alexanderson
dd4ef010ab Merge remote-tracking branch 'origin/master' into vulkan2 2019-03-18 04:05:19 -04:00
Christoph Oelckers
54f5076b0f - fixed option menu selector and slider bar positioning. 2019-03-17 22:00:28 +01:00
Christoph Oelckers
13f3bf2331 - add an option to print the kill, item and secret stats on the alternative HUD with the NewSmallFont. 
This has to be set in the console, the default is still the regular small font. Mainly added because some mods have really hard to read fonts where it is not easy to decipher the numbers.
 2019-03-17 21:35:33 +01:00
Christoph Oelckers
b839da45ec - Found two more unlocalized texts in the color picker. Due to space constraints a proper localization is not possible so these were replaced by a non-text. 2019-03-17 20:56:49 +01:00
Alexander
dbb93d6c08 option search improvements 
1. Top-level menu names are now properly handled.
2. Changing "Any or All terms" option now immediately updates the results.
3. Reformatted menu.zs to have tabs instead of spaces.
 2019-03-17 20:28:38 +01:00
Christoph Oelckers
b515ac662e - cleaned up the coop summary screen. 
This was one of the pieces that suffered badly from the proportions of the game provided SmallFonts, so now it uses the NewSmallFont.
 2019-03-17 20:28:12 +01:00
Christoph Oelckers
478eef5628 - fixed positioning of "no files" message on load game screen. 2019-03-17 19:10:25 +01:00
Christoph Oelckers
95adbc58a8 - fixed the spacing for the sliders. 
- moved the scroll indicators in the menu to the right and use a brighter color for them - the old ones were only barely visible.
 2019-03-17 18:32:55 +01:00
Christoph Oelckers
1beaa8da58 - deleted obsolete and broken font characters. 2019-03-17 18:32:49 +01:00
Christoph Oelckers
a6051c8231 - moved the flag display in the gameplay and compatibility menus down below the headline. 2019-03-17 18:32:48 +01:00
Christoph Oelckers
59f0a377d4 - consolidate the dependencies on the font in the option menu. 2019-03-17 18:32:48 +01:00
Christoph Oelckers
2227c15010 - create a second font based on the VGA glyphs that is stylistically more similar to the SmallFont and use that for the option menus. 2019-03-17 18:32:48 +01:00
Christoph Oelckers
2e260c6367 - use the new console font for the options menu to gain space and better character support. 
So far this is just an experiment, this needs a bit of work to become viable.
 2019-03-17 18:32:47 +01:00
Christoph Oelckers
0ff703c361 - fixed: Doom's episode names were not translatable. 2019-03-17 10:11:02 +01:00
Christoph Oelckers
ba13a540e4 - changed default graphics substitution rules to be more localization friendly. 
The default was changed to replace graphics if only known content is affected.
This also required blocking the feature for Hacx, Harmony and Action Doom 2 which have no localization yet and would fall back on Doom's texts if not blocked.
 2019-03-17 09:27:40 +01:00
Alexander
aa9c484b3b automap options readability changes 2019-03-16 20:01:26 +01:00
Christoph Oelckers
9b76c47dbe - added some placeholder strings to language.def. 
This is in preparation for the spreadsheet based text handling.
 2019-03-16 18:56:20 +01:00
Alexander
73d81d3983 added option search menu 2019-03-16 18:40:13 +01:00
Christoph Oelckers
04281d4a0b - fixed positoning issues in the load/save menu. 2019-03-15 20:22:40 +01:00
Magnus Norddahl
cce96ca87a - implement shadow maps 2019-03-15 07:54:34 +01:00
Magnus Norddahl
dca0b75038 - change the images to be upside down until presentation to increase compatibility with shaders designed for OpenGL 
- clamp scissors fully to avoid NVidia's awful drivers locking up the entire system if they end up out of bounds
- perform buffer clears as part of the render pass. this puts some restrictions on how FRenderState.Clear can be used
- add an offset uniform to the present shaders so the vulkan target can flip the image during presentation
 2019-03-12 23:53:20 +01:00
Magnus Norddahl
0620041228 - remove screenquadscale.vp 2019-03-12 16:24:55 +01:00
Rachael Alexanderson
879aae1bd3 Merge branch 'master' of https://github.com/coelckers/gzdoom into vulkan2 2019-03-11 22:07:46 -04:00
Rachael Alexanderson
fd4295b38c - add some /0 guards in the load/save menu to prevent VM aborts 2019-03-11 20:19:40 -04:00
Christoph Oelckers
c0d333ee56 - adjusted the script-side MidPrint calls to honor the con_midconsolefont CVAR. 2019-03-11 22:44:28 +01:00
Christoph Oelckers
8b4690bc44 - use international date format for all places that print a date. 
The most important one is the autosave tagging. This was done because the old printout was missing the year and printed the month as a 3 character English string, sabotaging any attempt to sort the autosaves by anything meaningful.
 2019-03-11 21:21:37 +01:00
Christoph Oelckers
22cf35c1c7 - reworked the load/save menu to use the new console font. 
Parts of this menu suffered badly from lack of screen space to convey the intended information due to the oversized fonts. With the new font this is a lot less problematic (unless using 320x200, of course)
 2019-03-11 20:59:43 +01:00
Christoph Oelckers
0884057ae1 - use a higher resolution console font with better Unicode support. 2019-03-10 17:54:03 +01:00
Christoph Oelckers
5a891f3b0a - fixed color of status screen text. 2019-03-09 17:50:23 +01:00
alexey.lysiuk
02ed758447 Merge branch 'master' into vulkan2 
# Conflicts:
#	src/posix/cocoa/i_video.mm
 2019-03-09 16:45:49 +02:00
Christoph Oelckers
392ba7ed2e - properly construct the reply texts for Strife's merchants. 2019-03-09 13:34:47 +01:00
Christoph Oelckers
99c8ba1288 - use uAddColor instead of uObjectColor2 for the ending color of a special colormap range. 
Unlike uObjectColor2, this is more global state. uObjectColor2 is part of gradient calculation which may later be offloaded to a secondary buffer which already resulted in only conditionally setting it, resulting in broken special colormap application for the software renderer.
 2019-03-09 12:12:33 +01:00
Christoph Oelckers
54efbf3edd Merge remote-tracking branch 'remotes/origin/master' into vulkan2 2019-03-09 08:55:40 +01:00
Sterling Parker
cabe0c583e Add LookScale property 
As requested by @coelckers.
 2019-03-07 21:22:33 +01:00
Sterling Parker
ae1a1df02d Add LookScale variable on weapon 
This variable allows a weapon to set a custom look sensitivity multiplier without fiddling with FOVScale / DesiredFOV hacks.
 2019-03-07 21:22:33 +01:00
Magnus Norddahl
b313f91ab0 - add layout location decl to all postprocess shaders 2019-03-05 18:55:31 +01:00
Magnus Norddahl
319099fee9 Merge remote-tracking branch 'origin/master' into vulkan2 2019-03-05 03:07:30 +01:00
Alexander
77cb9ae866 added MakeScreenShot and MakeAutoSave functions to FLevelLocals 2019-03-04 19:16:51 +01:00
Major Cooke
6327734659 Added CanTouchItem virtual. 
- Allows an actor with +PICKUP flag to determine if it can pick up specific items or not.
 2019-03-04 13:15:27 +01:00
Magnus Norddahl
56afcd210b - fix: gl_PointSize is required in Vulkan when drawing points 
- fix: add depthstencil attachment when stencil is active while depth is not
 2019-03-03 23:30:36 +01:00
Christoph Oelckers
43ec2cf8f2 . added the missing Cyrillic letters to the console font. 2019-03-03 20:09:25 +01:00
Nemrtvi
864b99a5a0 Split “Linear” option value into three 
This option value is used for 4 different options, and splitting it up into three will allow for languages based on grammatical gender systems to have different endings. Necessary for e.g. Russian in order to sound correctly.

The corresponding strings are already in the language spreadsheet.
 2019-03-03 16:12:46 +01:00
Magnus Norddahl
7d56aa4b0b Merge remote-tracking branch 'origin/master' into vulkan2 2019-03-03 13:45:22 +01:00
Christoph Oelckers
735e1d1a44 - allow localization of the fallback string "Person". 
The corresponding text is in the translation spreadsheet which isn't part of the repo yet.
 2019-03-03 09:16:21 +01:00
Christoph Oelckers
f15e3c871d - did a bit more tweaking to the menu dims. 
Red on red in Doom was still not good, so the colors were darkened more and made more opaque.
 2019-03-03 09:08:19 +01:00
Christoph Oelckers
af3b100b81 - split up the compatibility menu by making each subsection its own submenu. 
This one, even more than the gameplay options has devolved into an overwhelming wall of text.
 2019-03-03 08:58:49 +01:00
Christoph Oelckers
be0f2f3b74 - split up the automap colors menu. 
The cheat and overlay settings are now in submenus. Like the gameplay menu, this was simply too long.
 2019-03-03 08:47:05 +01:00
Christoph Oelckers
83fce134f2 - split out the deathmatch and coop gameplay settings into their own submenus. 2019-03-03 08:41:20 +01:00
Christoph Oelckers
cac032cb1c - made the menu dim darker and a bit more opaque. 
The recent localization work has made it apparent that on many images the menu was extremely hard to read because its colors often clash with the background.
The choice of a bright overlay color with extremely low opacity is simply not enough to make the menus comfortable to navigate. Chex Quest was particularly bad but the problem existed in many Doom mods as well.
This also changes the CQ dim color to something a bit more green to better fit with the theme.
 2019-03-03 08:29:10 +01:00
Christoph Oelckers
1c828b98c2 - fixed incorrect flag keyword in IWADINFO. 2019-03-03 08:16:41 +01:00
Christoph Oelckers
f3813c036f - filter out the BIGFONT lump in Chex Quest, now that we have a more complete font internally. 2019-03-03 07:50:10 +01:00
Christoph Oelckers
6ba8fee5c2 Merge branch 'master' into vulkan2 2019-03-03 00:04:19 +01:00
Christoph Oelckers
3903d957bd - moved the weapon bobbing options from the Display Options to the HUD Options menu. 2019-03-03 00:03:22 +01:00
Rachael Alexanderson
580c55f8a5 - moved language changer to miscellaneous menu 
- removed spacing gaps in the customize controls menu
 2019-03-02 13:59:42 -05:00
Christoph Oelckers
5682b1b5bb -corrected text placement on load+save menu. 2019-03-02 16:03:56 +01:00
Magnus Norddahl
f8aa48d053 - fix blinking caused by uninitialized clipping planes 2019-03-02 14:16:11 +01:00
Christoph Oelckers
0febe20a08 - fixed: Unmorphing a monster did not clear its UNMORPHED flag. 2019-03-02 13:15:38 +01:00
Christoph Oelckers
805cf6c098 - moved the sprite box on the player menu up a bit because this was badly overlapping with some long texts in most languages. 2019-03-02 12:20:58 +01:00
Magnus Norddahl
05a6896d4f - Pass vertex color and normal via uniform buffer when the attribute isn't available 2019-03-02 01:56:08 +01:00
Magnus Norddahl
d86a56086c Merge remote-tracking branch 'origin/master' into vulkan2 2019-03-01 21:50:06 +01:00
Magnus Norddahl
d4118a755c - load all the shaders and use the right one for each renderpass 2019-03-01 02:40:02 +01:00
Christoph Oelckers
cad2f49ceb - use BigUpper font for option menu captions. 2019-02-28 22:19:53 +01:00
Major Cooke
b48f7da43e Renamed to musplaying. 2019-02-28 18:47:28 +01:00
Major Cooke
210af0d414 Exported MusPlayingInfo to ZScript. 
- Allows grabbing the currently playing song, base order, and loop properties.
 2019-02-28 18:47:28 +01:00
Magnus Norddahl
2e0b34ca72 - hook up enough of renderstate to enable all of main.vp and main.fp 2019-02-28 00:26:49 +01:00
Rachael Alexanderson
612f198fcf - separate/group out the volume sliders, make them look slightly hierarchal in order to denote their importance 2019-02-27 14:56:12 -05:00
nashmuhandes
407983749a Added a master volume setting. 2019-02-27 14:17:45 -05:00
Rachael Alexanderson
baf5ebd1ce - fixed: menu language selection would not save on exit (this was due to CVAR protections from the menu) 
- moved language entry up a bit in the menu
- converted the language entry into a proper CVAR string list selection, instead of a separate menu with said list.
 2019-02-27 14:07:49 -05:00
Magnus Norddahl
fe67a2c24f - fix enough bugs to finally get some visuals 2019-02-26 20:19:54 +01:00
Rachael Alexanderson
e719b9cf00 - merge the options menu properly - the language entry was separated in its own section 2019-02-26 13:39:42 -05:00
Christoph Oelckers
e8f690116b - removed unused gl_spritebrightfog CVAR. 2019-02-26 00:07:30 +01:00
Christoph Oelckers
413412f603 Merge branch 'master' into vulkan2 2019-02-23 19:53:38 +01:00
Christoph Oelckers
b542d1371d - reorganized the ZScript content in gzdoom.pk3 and changed the files' extensions to something unique for easier syntax highlighting. 2019-02-23 12:08:27 +01:00
Christoph Oelckers
2874a36fbe - added the final missing piece of localization support, i.e. forcing text based menus. 
Now a localization mod can disable the graphics patches containing text entirely so that it can properly localize the text based menu variant.
If this flag gets set in MAPINFO, it will override all user settings.
 2019-02-23 10:40:07 +01:00
Magnus Norddahl
52460d53d9 - compile main.vp and main.fp for vulkan 2019-02-22 11:30:48 +01:00
Nemrtvi
7060f9cc05 Add language menu to Options 
In this menu, all languages supported by GZDoom are selectable with one simple click! Credits to @PROPHESSOR for making it!

(This only edits the English and French languages because they are the only languages currently up to date with GZDoom’s development. A Russian translation will follow suit at a later date.)
 2019-02-21 17:54:13 +01:00
Christoph Oelckers
48fcdacf06 - more work on graphics substitutiion 
* added a CVAR that sets how localizable graphics need to be dealt with.
* pass the substitution string to OkForLocalization so that proper checks can be performed.
* increased item spacing on Doom's list menus to 18 from 16 pixels, because otherwise the diacritic letters would not fit. 20 would have been more ideal but 18 was the limit without compromising its visual style
* added a second text-only main menu because here the spacing cannot be changed. Doing so would render any single-patch main menu non-functional. So here the rules are that if substitution takes place, it will swap out the entire menu class.
* fixed some issues with the summary screen's "entering" and "finished" graphics.
 2019-02-21 00:35:27 +01:00
Christoph Oelckers
a0c10df387 - made some adjustments so that the BigFont works as intended. 
The auto-calculated height of 24 is too tall, this requires a manual setting here. Also fix the space calculations for the "finished" graphic.
 2019-02-21 01:13:42 +01:00
Christoph Oelckers
22781e3cb9 - BigFont update. 2019-02-21 00:43:58 +01:00
Christoph Oelckers
f580d85da6 - fixed typo in menu texts. 2019-02-21 00:24:09 +01:00
Christoph Oelckers
7ea2f135df - did not save the latest changes. 2019-02-21 00:23:49 +01:00
Christoph Oelckers
8bdbd2e915 - fixed layout of summary screen. 2019-02-21 00:16:48 +01:00
Christoph Oelckers
6a742f8d34 - changed all places which used a localized string as a format template for printf, String.Format et.al. 
Passing something non-constant at compile time here is extremely dangerous, especially when users can replace those strings if they like.
It now uses FString::Substitute in all cases where something needs to be inserted into a template string.
 2019-02-20 20:20:06 +01:00
Christoph Oelckers
74f5211046 - fixed accidental commit of incomplete test code. 2019-02-20 18:54:29 +01:00
Christoph Oelckers
a6a091c83a - reworked summary screen to use consistent contents, either all patches or all text but not mixed 2019-02-20 00:44:17 +01:00
Christoph Oelckers
9f59a84a37 - allow text substitution for StaticPatch items in ListMenus 2019-02-20 00:43:31 +01:00
Christoph Oelckers
5e288ef2d4 - fixed: Doom used Chex Quest's default settings for menu fonts. 2019-02-20 00:01:20 +01:00