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

16999 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
04c103811c - changed Strife dialogue setup so that STRIFE00 is being processed and the random texts explicitly excluded. 
This fixes the stray "Peasant" in this file.
 2019-03-24 12:52:03 +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
Nemrtvi
4db94d12b1 Russian quotation marks for Strife smallfont 2 2019-03-24 11:47:17 +01:00
alexey.lysiuk
48a5476ec4 - fixed compilation with older macOS SDK like 10.9 
src/posix/cocoa/i_video.mm:564:23: error: property 'layer' not found on object of type 'id'
 2019-03-23 17:27:47 +02:00
Player701
456c1eb926 - Added Unholy Realms MAP27 to the node rebuild compatibility list 2019-03-23 15:28:27 +01:00
Christoph Oelckers
5da2ecda66 - fix the compat_pointonline flag. 2019-03-23 15:28:10 +01:00
Magnus Norddahl
0c6d0de3ab - do not use persistent buffers for models as it is a limited resource where each consumes a vkDeviceMemory object 2019-03-23 14:58:37 +01:00
Christoph Oelckers
7606b22d0b - fixed the substitution logic in FTexture::GetRawTexture. 
This may only perform a substitution if the offset is not 0 and if the size matches.
 2019-03-23 12:48:57 +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
d500cedf49 - call SetData in VKBuffer::Lock so that the buffer is valid. 
This allows models to render, but a proper fix should handle mapping of static buffers for real. This workaround just allocates a non-static persistent buffer in CPU memory which is not the most efficient solution here.
 2019-03-22 21:14:32 +01:00
Christoph Oelckers
10e62e7b5d - fixed: VkBuffer::mPersistent was not initialized. 2019-03-22 20:32:59 +01:00
Christoph Oelckers
24a52d65a5 - renamed several data types in the hardware renderer that still had a GL prefix, although they are now generic. 2019-03-22 19:54:19 +01:00
Magnus Norddahl
d03839dfef - do not signal mRenderFinishedSemaphore if the submitted commands aren't about to be presented 2019-03-22 13:54:13 +01:00
Christoph Oelckers
4d768e5a49 - use a vector instead of a map to store a texture's descriptor sets. 
In this case a map is total overkill and its poor memory locality will always incur some performance hit. A vector here can only collect a very small amount of entries so the time to search is nearly irrelevant.
 2019-03-21 23:41:24 +01:00
Christoph Oelckers
3ad9783d8f - fixed the hardware rendering precacher not to evict secondary layers of multi-layer textures. 
It will now check all layers of a material.
Additionally it will also delete all descriptor sets of Vulkan hardware textures before precaching to make sure that nothing here can accidentally still reference a deleted texture.
 2019-03-21 21:57:39 +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
Christoph Oelckers
b28c984075 - fixed bad default for scaleoverride. 2019-03-19 23:01:30 +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
561ce41723 - fixed lifetime of ScaleOverrider for Strife dialogues. 2019-03-19 18:46:20 +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
be7d6241c2 - localize 'By' 2019-03-19 01:23:54 +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
e07d413095 - fixed: A pusher thinker must destroy itself if the point pusher/puller thing is gone. 2019-03-18 23:46:13 +01:00
Christoph Oelckers
b48f4032d8 - draw the FPS counter with the new console font. 
With the current scale settings the original one is simply too small.
 2019-03-18 14:27:42 +01:00
Christoph Oelckers
d86dd902fb Merge branch 'master' into vulkan2 2019-03-18 13:31:04 +01:00
Christoph Oelckers
4120e72dbd - explicitly mark all unresolved textures as invalid. 2019-03-18 11:45:00 +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
Christoph Oelckers
c2c9126453 - replaced the XLSX parser with a CSV parser. 
Since Google can export this as well it makes a lot more sense here because it is a textual format better suited for version control and does not carry along all the formatting baggage that isn't needed for a string table.
 2019-03-18 10:18:30 +01:00
alexey.lysiuk
1f16fd7801 - fixed clipping of automap background with althud and screenblocks < 10 2019-03-18 10:23:55 +02:00
Rachael Alexanderson
dd4ef010ab Merge remote-tracking branch 'origin/master' into vulkan2 2019-03-18 04:05:19 -04:00
Magnus Norddahl
7b3350ae1e - the material descriptor set must be bound again if the pipeline changes and the new shader uses more textures than the old one 2019-03-18 00:38:09 +01:00
Magnus Norddahl
b62d5784af - bind a texture in all descriptor slots 2019-03-17 23:24:50 +01:00
Magnus Norddahl
ec7a874a61 - implement PrecacheMaterial 2019-03-17 22:41:02 +01:00
Magnus Norddahl
bf85ad4b6a - remove tracking translation in VkHardwareTexture 
- only reset the descriptors when recreating the samplers
 2019-03-17 22:27:48 +01:00
Magnus Norddahl
2429eba8f6 - remove the old incomplete VkHardwareTexture implementation 2019-03-17 22:10:49 +01:00