Commit graph

15375 commits

Author SHA1 Message Date
Magnus Norddahl
095ea3ce76 - apply vk_hdr immediately and delay initial swapchain creation until first image needs to be acquired 2019-04-11 04:26:43 +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
0200edd392 - added a few more character fallbacks and fixed the StringWidth function
This checked character size without substituting missing characters, resulting in bad return values.
2019-04-11 02:01:41 +02:00
Christoph Oelckers
772cb276ee - changed text scaling for intermission screen to ensure that long texts are not cut off.
22 lines of text need to fit and to avoid packing the text too tightly onto the screen and have a little headroom, a virtual size of 400x250 is needed.
2019-04-11 01:28:47 +02:00
Christoph Oelckers
28c8bb47fb - added generic font support for intermission text screen. 2019-04-11 00:14:53 +02:00
Christoph Oelckers
2747eef0e0 - enable Unicode font on cast call. 2019-04-10 22:32:58 +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
6acfbf8e02 - cleaned out the unneeded scaling hacks from the HUD messages. 2019-04-10 21:23:27 +02:00
Christoph Oelckers
9e096c62fd - allow the automap HUD to use the VGA font. 2019-04-10 20:39:15 +02:00
Magnus Norddahl
5f70ce2148 - fix SubmitCommands bug if it no swapchain image was acquired 2019-04-10 16:39:33 +02:00
Christoph Oelckers
85a762f294 Merge branch 'master' of https://github.com/coelckers/gzdoom 2019-04-10 15:58:11 +02:00
Rachael Alexanderson
ab6ed0949f - fixed: PlayerEntered for bots should occur after Level->DoReborn 2019-04-10 06:24:57 -04:00
Rachael Alexanderson
7b06fbe28e Merge remote-tracking branch 'origin/master' into vulkan2 2019-04-10 04:02:42 -04: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
fe37c3bc4f - allow all DHUDMessage calls to substitute SmallFont
This is a preparation for setting a generic HUD mode where all these should be able to use the VGA font instead, and not just C_MidPrint.
2019-04-10 00:28:40 +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
8182c80f1e - use the Unicode font for the scoreboard. 2019-04-10 00:16:03 +02:00
Magnus Norddahl
85b754b9ca - fix model rendering glitch 2019-04-09 18:19:14 +02:00
Magnus Norddahl
d413581ee2 - fix model shutdown crash 2019-04-09 17:06:54 +02:00
Magnus Norddahl
eb9f6ec313 - remove the 6 layer texture descriptor set limitation 2019-04-09 16:30:49 +02:00
Magnus Norddahl
c9dbb589e2 - once the Vulkan backend booted all the remaining vulkan calls are unrecoverable (unless the code calling it gets actively involved, which means that particular action is not exceptional in nature and shouldn't be done as an exception) 2019-04-09 14:25:18 +02:00
Magnus Norddahl
d47891d20a - allocate new texture descriptor pool if it is full 2019-04-09 14:06:24 +02:00
Magnus Norddahl
2cbd1c4736 - Fix inverted check in last commit 2019-04-09 12:41:05 +02:00
Magnus Norddahl
d3dacfc2cb - improve error handling during vulkan initialization 2019-04-09 12:28:25 +02:00
Rachael Alexanderson
536aa98e87 Merge remote-tracking branch 'origin/master' into vulkan2 2019-04-09 02:01:29 -04:00
Christoph Oelckers
f1408bfb5b - allow retroactive substitution of cluster texts
This is needed to localize Harmony without swapping out the MAPINFO.
2019-04-09 00:21:06 +02:00
Christoph Oelckers
ab256945aa - use I_Error for throwing errors in the Vulkan backend and print the message if one gets thrown during init. 2019-04-08 23:48:46 +02:00
Christoph Oelckers
c788da46fb - Localization helper code for level names that haven't been exported to the string table. 2019-04-08 22:07:09 +02:00
Christoph Oelckers
d308a1223b - fixed the calculations which decide whether to use an options menu for skills and episodes. 2019-04-08 22:04:47 +02:00
Magnus Norddahl
2694b0a167 - workaround for drivers that bug by never acquiring an image 2019-04-08 21:01:40 +02:00
Magnus Norddahl
c98dfd1790 - improve swap chain resize and handle the edge cases for the swap chain 2019-04-08 19:23:37 +02:00
Magnus Norddahl
20fde9f8be - clean up swapchain class 2019-04-08 18:14:07 +02:00
Rachael Alexanderson
b0bd8f800c Merge remote-tracking branch 'origin/master' into vulkan2 2019-04-08 08:45:29 -04:00
Rachael Alexanderson
1e3425910c Merge branch 'vulkan2' of https://github.com/coelckers/gzdoom into vulkan2 2019-04-08 08:40:47 -04:00
Magnus Norddahl
b9900450c7 - remove unused function declaration 2019-04-08 05:31:20 +02:00
Magnus Norddahl
afbd45e1b1 - fix uniform aligment bug for vec3 2019-04-08 05:27:35 +02:00
Rachael Alexanderson
55a4927b7c Merge branch 'vulkan2' of https://github.com/coelckers/gzdoom into vulkan2 2019-04-07 22:59:24 -04:00
Magnus Norddahl
a488034065 - fix null pointer crash 2019-04-08 04:57:46 +02:00
Rachael Alexanderson
c6a308c73d Merge branch 'vulkan2' of https://github.com/coelckers/gzdoom into vulkan2 2019-04-07 21:49:59 -04:00
Magnus Norddahl
b30ed99672 - remove the old OpenGL postprocess custom shader implementation 2019-04-08 01:31:22 +02:00
Magnus Norddahl
d114575bd1 - implement custom post process shaders for vulkan backend 2019-04-08 00:47:55 +02:00
Christoph Oelckers
3c07485d11 - fixed: Replacing a text image with actual text may only happen if the text comes from the string table. 2019-04-07 23:54:39 +02:00
Christoph Oelckers
f6d3de76cf - fixed: ACS's APROP_ViewHeight needs to check if a real player is attached to a PlayerPawn. 2019-04-07 23:45:08 +02:00
Magnus Norddahl
d1378364b5 - fix bloom pass regression 2019-04-07 20:52:04 +02:00
Rachael Alexanderson
b444cbd950 Merge branch 'master' of https://github.com/coelckers/gzdoom into vulkan2 2019-04-07 14:19:56 -04:00
alexey.lysiuk
fb51b5d137 - fixed compilation of SDL backend
src/posix/sdl/sdlglvideo.cpp:358:10: error: ‘MIN_WIDTH’ is not a member of ‘Priv’
src/posix/sdl/sdlglvideo.cpp:358:33: error: ‘MIN_HEIGHT’ is not a member of ‘Priv’
src/posix/sdl/sdlglvideo.cpp:360:7: error: ‘MIN_WIDTH’ is not a member of ‘Priv’
src/posix/sdl/sdlglvideo.cpp:361:7: error: ‘MIN_HEIGHT’ is not a member of ‘Priv’
2019-04-07 17:26:32 +03:00
Christoph Oelckers
f4f1c4abbf - fixed scale calculations for option menus. 2019-04-07 13:34:00 +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
c3b927e502 - complete the changes from the previous commit for the SDL backend 2019-04-07 06:59:34 -04:00
Rachael Alexanderson
f4ea44b760 - consolidate minimum screen resolution so that it's easier to change 2019-04-07 06:56:06 -04:00
Rachael Alexanderson
efa9284141 - consolidate minimum screen resolution so that it's easier to change 2019-04-07 06:49:54 -04:00
Christoph Oelckers
b60024b9c8 - fixed: The WideString conversion function was missing a null check. 2019-04-07 12:06:03 +02: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
45c3558692 - 4.1pre 2019-04-07 09:31:32 +02: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
Christoph Oelckers
f2d1126ff0 - changed menu scale to better fit the screen size and added some coordinate tweaking for the episode menu to shift long names to the left. 2019-04-06 14:36:57 +02:00
Rachael Alexanderson
6cc5ddd129 - fixed: Bots did not trigger PlayerEntered events 2019-04-06 08:14:34 -04:00
Christoph Oelckers
47a52e6a7b - changed printlevel for console output of centered messages. 2019-04-06 11:23:19 +02:00
Christoph Oelckers
0b09c2b20a - do not call OnRegister when saving a game. 2019-04-06 09:29:49 +02:00
Christoph Oelckers
af6e2a430a - fixed OnUnregister for Event handlers was called from a dead event manager instance. 2019-04-06 09:06:41 +02:00
Christoph Oelckers
c65ecbc807 - added a font.inf for Strife's small font because its automatically calculated height is not a good match for displaying the dialogues. 2019-04-06 07:44:09 +02:00
Rachael Alexanderson
e48d2105ef Merge branch 'master' of https://github.com/coelckers/gzdoom into vulkan2 2019-04-06 00:27:18 -04:00
drfrag
1ef4c2d0f6 - Hopefully fixed MinGW compilation for real. 2019-04-06 00:07:24 -04:00
Christoph Oelckers
0ed847b51b - the resuming of the conversation interrupted by a slideshow must be performed by the game action handler
If this is done within the intermission code, both intermission and menu will write to the same global variables and destroy their data, this became very apparent when it altered the screen scale for the conversation.
2019-04-05 00:59:32 +02:00
Christoph Oelckers
0153c2aefa - use the Unicode version of GetCommandLine for the crash log. 2019-04-04 17:49:53 +02:00
Magnus Norddahl
f7069c4ddc - there is no need to track a transfer family - yet another pointless detour thanks to vulkan-tutorial.. 2019-04-04 15:58:48 +02:00
alexey.lysiuk
025e50219f - fixed missing command line in crash reports
https://forum.zdoom.org/viewtopic.php?t=64149
2019-04-04 16:37:51 +03:00
pkubaj
2886f22b8f Remove bad BigLong variants 2019-04-04 13:23:53 +02:00
pkubaj
a3541f853c Fix build on big-endian platforms
GCC 8 complains that it can't find relevant functions:
/wrkdirs/usr/ports/games/gzdoom/work/gzdoom-g3.7.2/src/m_png.cpp:669:42: error: call of overloaded 'BigLong(uint32_t)' is ambiguous
     chunklen = BigLong((unsigned int)x[1]);
                                          ^
In file included from /wrkdirs/usr/ports/games/gzdoom/work/gzdoom-g3.7.2/src/m_png.cpp:44:
/wrkdirs/usr/ports/games/gzdoom/work/gzdoom-g3.7.2/src/m_swap.h:212:15: note: candidate: 'long unsigned int BigLong(long unsigned int)' <deleted>
 unsigned long BigLong(unsigned long) = delete;
               ^~~~~~~
/wrkdirs/usr/ports/games/gzdoom/work/gzdoom-g3.7.2/src/m_swap.h:213:6: note: candidate: 'long int BigLong(long int)' <deleted>
 long BigLong(long) = delete;

This is on FreeBSD/powerpc64.
2019-04-04 13:23:53 +02:00
alexey.lysiuk
5c86a1e6b5 - fixed crash with push/insert to null dynarray when JIT is on
https://forum.zdoom.org/viewtopic.php?t=64148
2019-04-04 13:23:08 +03: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
alexey.lysiuk
5310ecc2c3 - removed obsolete hack for Hexen main menu dimming
https://forum.zdoom.org/viewtopic.php?t=64122
2019-03-31 17:35:12 +03: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
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
2dc12aef71 - removed the NetUpdate calls from the software renderer.
These can cause highly dangerous recursions and execute play code deep inside the renderer and since the hardware renderer does not have these, there is very little point for the software renderer to retain them.
2019-03-31 09:02:11 +02: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
8a243cf084 - fixed: Sound sequences must be serialized after the sounds.
Otherwise their data gets reset by the sound initialization.
2019-03-30 18:41:38 +01:00
Christoph Oelckers
d40ed5c587 - reverted D_GenderToInt to check full words instead of merely initial letters. 2019-03-30 18:12:33 +01:00
alexey.lysiuk
71caf27039 - made gender string to integer conversion case insensitive
https://forum.zdoom.org/viewtopic.php?t=64109
2019-03-30 12:47:34 +02:00
alexey.lysiuk
df8fa90a34 - fixed compilation warnings reported by Clang
src/rendering/vulkan/renderer/vk_renderpass.cpp:44:22: warning: comparison of integers of different signs: 'std::__1::vector<FVertexBufferAttribute, std::__1::allocator<FVertexBufferAttribute> >::size_type' (aka 'unsigned long') and 'int' [-Wsign-compare]
src/rendering/vulkan/system/vk_framebuffer.cpp:860:55: warning: format specifies type 'int' but the argument has type 'VkDeviceSize' (aka 'unsigned long long') [-Wformat]
src/rendering/vulkan/system/vk_objects.h:471:23: warning: suggest braces around initialization of subobject [-Wmissing-braces]
2019-03-30 11:15:49 +02:00
Christoph Oelckers
4619fc5622 - removed unused (now always active) gl_trimsprites option from the menu. 2019-03-29 19:10:10 +01:00
Magnus Norddahl
4cc9880f50 Merge remote-tracking branch 'origin/master' into vulkan2 2019-03-26 13:08:59 +01:00
Magnus Norddahl
9f0f659db0 - remove old vid_maxfps implementations as they were garbage anyway and the new one works on all the platforms 2019-03-26 11:10:17 +01:00
Magnus Norddahl
6078428b84 - fix typo in sleep 2019-03-26 10:46:31 +01:00
Magnus Norddahl
9f758b0032 - implement vid_maxfps 2019-03-26 10:40:43 +01:00
Christoph Oelckers
b40983be61 - fixed bad Printf formatter. 2019-03-26 08:48:10 +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
Christoph Oelckers
0422f40d80 - restored calling OnRegister for event handlers after loading a savegame
It should be said in no uncertain terms that OnRegister operates on an uninitialized level so it should only be used for setting up the registering process of the event handler itself and nothing else - not even the event handler's data!!!
2019-03-26 17:02:40 +01:00
usernameak
95bcc46acc Fixed postprocess shaders with 2 or more textures 2019-03-25 22:12:00 +01:00
Magnus Norddahl
1c9bf262e6 - hook up VMA_ALLOCATOR_CREATE_KHR_DEDICATED_ALLOCATION_BIT 2019-03-25 21:30:03 +01:00
Magnus Norddahl
7256af0b32 - fix sort bug 2019-03-25 20:41:53 +01:00
Magnus Norddahl
2d8516b2ca - make shaderClipDistance optional 2019-03-25 19:44:46 +01:00
Magnus Norddahl
be74675e5e - change vk_hdr default to false 2019-03-25 01:41:16 +01:00
Magnus Norddahl
c010c5e818 - fully enable vk_hdr as a feature since it works now after the queue family selection was improved 2019-03-25 01:39:27 +01:00
Magnus Norddahl
954b72915c - improve the queue family selection process to pick first entry in the list over later ones 2019-03-24 18:33:59 +01:00
Magnus Norddahl
0be5cc7d1d - initialize array 2019-03-24 18:32:36 +01:00