8330 commits

Author	SHA1	Message	Date
psi29a	e4fd852df6	Merge branch 'ba2' into 'master' ... BA2 support fixes See merge request OpenMW/openmw!4055	2024-04-28 07:40:40 +00:00
psi29a	1eb6b322a7	Merge branch 'morefunfallout4discoveries' into 'master' ... Fix reading BSLightingShaderProperty backlight power in NIF Bethesda stream version 132 See merge request OpenMW/openmw!4058	2024-04-28 07:39:51 +00:00
Alexei Kotov	a5d936993f	Clarify Fallout 4 next gen update BA2 version naming	2024-04-28 05:09:40 +03:00
Andrei Kortunov	98abfcfe00	Use grayscale images for disabled icons	2024-04-27 11:25:56 +04:00
Andrei Kortunov	070327a259	Change SVG color in the editor	2024-04-27 09:57:47 +04:00
Alexei Kotov	52bc744642	Fix reading backlight power in NIF stream version 132	2024-04-26 17:32:07 +03:00
Alexei Kotov	52d77e3a45	Version 8 texture BA2s found	2024-04-26 16:45:30 +03:00
Alexei Kotov	f0e4793321	Remove allow shadow map overlap setting (#7939)	2024-04-26 13:50:03 +03:00
Alexei Kotov	61b6150c01	Properly detect the version for post-FO4 BA2 formats	2024-04-26 10:50:06 +03:00
Alexei Kotov	f796e051cb	Support zlib-compressed version 3 DDS BA2s	2024-04-26 10:45:03 +03:00
Alexei Kotov	b32385a0af	Fix BA2 signature check	2024-04-26 10:32:17 +03:00
Alexei Kotov	22fb3d7f83	Add support for Fallout 4 next-gen update BA2s	2024-04-26 10:30:42 +03:00
psi29a	26f0e6b22c	Merge branch 'nifmisc' into 'master' ... Miscellaneous NIF loader corrections See merge request OpenMW/openmw!4052	2024-04-25 08:45:36 +00:00
Alexei Kotov	7f13f6a4e9	Use osg::Fog::compare in NifOsg::Fog::compare	2024-04-25 03:09:04 +03:00
psi29a	a628c658a9	Merge branch 'lessgoofymaterialptr' into 'master' ... Simplify material file pointer acrobatics See merge request OpenMW/openmw!4049	2024-04-24 08:39:52 +00:00
psi29a	99a0755094	Merge branch 'remove_natural_sort' into 'master' ... Remove dead code See merge request OpenMW/openmw!4047	2024-04-24 08:38:26 +00:00
Alexei Kotov	745be2e91b	Implement NifOsg::Fog::compare()	2024-04-24 01:45:09 +03:00
Alexei Kotov	a513049129	Adjust drawable property state changes ... Reset shininess and specular strength when specular lighting is supposed to be disabled Don't add the material redundantly if a sorter is pushed Don't discard non-default emissive and specular multipliers if there's no sorter or material	2024-04-24 00:40:54 +03:00
Alexei Kotov	713e741f9c	Share fog state attributes	2024-04-23 23:53:34 +03:00
Alexei Kotov	d7bd5e76ca	Move wrapping flag handling to relevant properties	2024-04-23 23:40:14 +03:00
psi29a	02cdeb6252	Merge branch 'scalable_editor' into 'master' ... Treat editor icons as scalable See merge request OpenMW/openmw!4042	2024-04-23 07:04:59 +00:00
Alexei Kotov	78eda530ac	Simplify material file pointer acrobatics	2024-04-23 00:34:38 +03:00
Andrei Kortunov	6390fdee7a	Remove dead code	2024-04-22 20:41:58 +04:00
psi29a	023c0f7a46	Merge branch 'vfs_normalized_path_6' into 'master' ... Use normalized path for music related functions See merge request OpenMW/openmw!4038	2024-04-22 07:02:14 +00:00
Andrei Kortunov	1bb48bcef7	Treat editor icons as scalable	2024-04-21 20:56:06 +04:00
Alexei Kotov	884668927f	BGSM Reader: include cleanup, adjust getFile return result	2024-04-20 23:38:01 +03:00
elsid	a863899eb1	Use normalized path for SoundManager::streamMusic	2024-04-20 21:14:09 +02:00
Alexei Kotov	77c3cd4467	More BGSM cleanup	2024-04-20 19:43:42 +03:00
Alexei Kotov	6be2bb70c3	Remove unused remnants of NIFStream from BGSMStream	2024-04-20 19:43:42 +03:00
Alexei Kotov	ea5e101821	Handle glow maps for BGSM files	2024-04-20 19:43:42 +03:00
Alexei Kotov	8325e100df	More decal deduplication	2024-04-20 19:43:42 +03:00
Alexei Kotov	5789eb73b1	Deduplicate decal and alpha handling in NifLoader	2024-04-20 19:43:42 +03:00
Alexei Kotov	4ccf9c1917	Deduplicate NifLoader texture attachment ... Handle non-existent shader materials more gracefully Deduplicate shader material drawable property handling	2024-04-20 19:43:42 +03:00
Alexei Kotov	e680123482	NifLoader: Make the image manager a member	2024-04-20 19:43:42 +03:00
Alexei Kotov	8997bd6854	Apply shader material transparency parameters, get rid of unwanted shiny	2024-04-20 19:43:42 +03:00
Alexei Kotov	1d65aaee71	Formatting	2024-04-20 19:43:42 +03:00
Alexei Kotov	96f5ae5a8d	Handle BGSM decal flag, hide visibility editor markers	2024-04-20 19:43:41 +03:00
Alexei Kotov	1a961f3021	Extremely early handling for BGSM/BGEM files	2024-04-20 19:43:41 +03:00
Alexei Kotov	fe1cb3a5ae	Add a resource manager for BGSM files	2024-04-20 19:43:41 +03:00
Alexei Kotov	cb77bcc4c8	Initial BGEM file parsing	2024-04-20 19:43:41 +03:00
Alexei Kotov	484a360792	Add a safety measure for string loading in BGSM	2024-04-20 19:43:41 +03:00
Alexei Kotov	f9f8c1e591	Fix depth test reading in BGSM	2024-04-20 19:43:41 +03:00
Alexei Kotov	8ef6304dd9	BGSM colors are Vec3	2024-04-20 19:43:41 +03:00
Alexei Kotov	015aca2cfd	Initial BGSM file parsing	2024-04-20 19:43:41 +03:00
Alexei Kotov	124df1be61	Parse shared part of material files	2024-04-20 19:43:41 +03:00
Alexei Kotov	aea7b10986	Add dummy BGSM/BGEM file reader	2024-04-20 19:43:40 +03:00
AnyOldName3	04f1dc282b	Merge branch 'fix-osga-rotate-wildly' into 'master' ... Fix OSGAnimation issues See merge request OpenMW/openmw!3989	2024-04-20 15:37:09 +00:00
elsid	e11a5a4352	Use normalized path for SoundManager::playPlaylist	2024-04-19 22:43:20 +02:00
elsid	82931059fd	Make NormalizedView constructor from const char* explicit	2024-04-19 22:42:04 +02:00
Sam Hellawell	b7aa3b9f47	Remove rename from RenameBonesVisitor, rename to RenameAnimCallbacksVisitor	2024-04-19 07:48:26 +01:00
psi29a	e4c70b7861	Merge branch 'anyoldname3-and-the-amazing-technicolour-terminal-emulator' into 'master' ... Support coloured terminal output on Windows See merge request OpenMW/openmw!4027	2024-04-17 13:09:07 +00:00
psi29a	3600c6c7c7	Merge branch 'filterview' into 'master' ... Validate INFO filters when loading the record See merge request OpenMW/openmw!4003	2024-04-17 13:08:49 +00:00
psi29a	b91ff634e4	Merge branch 'navmesh_queue' into 'master' ... Optimize queue for navmesh async jobs See merge request OpenMW/openmw!4025	2024-04-17 11:10:44 +00:00
Sam Hellawell	2653b76db9	getTranslation/getTransformForNode refactor, unit tests	2024-04-17 08:16:48 +01:00
AnyOldName3	83e3718bed	. c l a n g - f o r m a t	2024-04-16 13:14:36 +01:00
AnyOldName3	61364c874f	Warn future me off wasting their time again	2024-04-16 01:14:20 +01:00
AnyOldName3	a7021bf9cc	Clear std stream errors when reopening ... Prior errors are no longer relevant. Shouldn't make a difference unless you've tried printing something before the streams were set up.	2024-04-16 01:10:39 +01:00
Alexei Kotov	443e341ae7	Generalize unsized pixel format computation	2024-04-16 02:52:25 +03:00
Alexei Kotov	3c0c1717a9	Fix red-green normal map handling for terrain	2024-04-15 12:02:52 +03:00
Alexei Kotov	58afe1ba23	Support red-green normal maps	2024-04-15 12:02:52 +03:00
elsid	910c88325a	Add a setting to wait for all navmesh jobs on exit	2024-04-13 19:51:16 +02:00
elsid	50f4471750	Use R-tree for dynamic priority of navmesh async job	2024-04-13 19:51:16 +02:00
elsid	17bd571a65	Do not repost failed jobs ... Failures should not happen except for some weird corner cases. Retrying is unlikely to help in such situation.	2024-04-13 19:51:16 +02:00
elsid	d6f3d34f2f	Remove tiles present on navmesh but outside desired area	2024-04-13 19:51:16 +02:00
elsid	61c69c5563	Use proper prefix for CollisionShapeType	2024-04-13 19:51:16 +02:00
elsid	a1438f65fe	Set proper max tiles on initializing navmesh settings	2024-04-13 19:48:58 +02:00
AnyOldName3	1930bfeabb	Support coloured terminal output on Windows ... First try the modern Windowsy way, where we can directly query if escape sequences will be processed. The function is available as far back as Windows 2000, but it just won't return the right flag until the Windows version is new enough. If that fails, fall back to the Unixy way, as not all colour-supporting terminal emulators for Windows use the Win32 API to declare that capability. The implementation isn't identical as isatty wasn't available without adding more headers, and we already have Windows.h in this file, so I might as well use the Win32 API instead of its POSIX-compatibility layer.	2024-04-13 17:09:48 +01:00
Evil Eye	6e79064a57	Fix editor oddities	2024-04-12 18:32:47 +02:00
psi29a	f9e957ea0e	Merge branch 'esm4scvr' into 'master' ... ESM4: Make script local variable loading more reliable See merge request OpenMW/openmw!3967	2024-04-12 15:01:46 +00:00
Evil Eye	a4625ea784	Deduplicate dialogue filter parsing	2024-04-11 22:29:33 +02:00
Evil Eye	fb4edda45d	Validate INFO filters when loading the record	2024-04-11 16:55:00 +02:00
Sam Hellawell	8c2c66d59e	.nif check, matrix mult feedback, auto usage, reuse NodeMap typedef	2024-04-11 02:16:06 +01:00
psi29a	8037a6e765	Merge branch 'portable-launcher' into 'master' ... Portable Launcher (plus a whole slew of bugs fixes for problems I found that I suspect aren't on the tracker) Closes #6846 See merge request OpenMW/openmw!3925	2024-04-10 09:53:07 +00:00
AnyOldName3	48f1f08537	Hide things that depend on present-but-inactive game files ... https://gitlab.com/OpenMW/openmw/-/merge_requests/3925#note_1843962919	2024-04-07 22:12:39 +01:00
Sam Hellawell	d23c10622d	Use dynamic cast to check for bone	2024-04-07 21:09:45 +01:00
Sam Hellawell	a51d560174	Move bone rename logic to ColladaDescriptionVisitor, undo formatting/refactoring	2024-04-05 01:59:40 +01:00
Sam Hellawell	2288a691d2	Replace osgAnimation bone underscore naming at load time, map bone instances, reset root bone transform each frame	2024-04-04 00:10:51 +01:00
AnyOldName3	bb3c22e4a5	Add and register SettingValue stream operators	2024-04-01 00:15:58 +01:00
psi29a	3da6b4f529	Merge branch 'more_stats' into 'master' ... Report more stats in F4 See merge request OpenMW/openmw!3956	2024-03-30 08:41:29 +00:00
psi29a	43f2574406	Merge branch 'vaporeon' into 'master' ... Make sunlight scattering and wobbly shores optional See merge request OpenMW/openmw!3994	2024-03-30 08:41:04 +00:00
elsid	215404e126	Report more stats from caches	2024-03-29 14:25:39 +01:00
elsid	ae41ebfc83	Report CellPreloader stats	2024-03-29 14:05:26 +01:00
elsid	9a24e77d3f	Show F4 stats in pages	2024-03-29 14:05:25 +01:00
Alexei Kotov	76105cc2d1	Make sunlight scattering and wobbly shores optional	2024-03-29 10:41:04 +03:00
Evil Eye	1d13f7db8f	Simplify detachFromParent	2024-03-28 20:17:05 +01:00
Evil Eye	8cbcb82dd4	Prevent iterator invalidation when updating Lua UI and increase const correctness	2024-03-28 20:01:50 +01:00
psi29a	2497164b2b	Merge branch 'optimize_font_loading' into 'master' ... Optimize bitmap fonts loading See merge request OpenMW/openmw!3988	2024-03-28 09:05:22 +00:00
psi29a	2056da358d	Merge branch 'opencs-projectile-speed' into 'master' ... OpenMW-CS: Editing and verifying of projectile speed for magic effects See merge request OpenMW/openmw!3939	2024-03-28 09:04:50 +00:00
psi29a	e8038d353f	Merge branch 'esmstuff' into 'master' ... Use more decomposition, string_view, and implicit sizes in ESM code See merge request OpenMW/openmw!3975	2024-03-27 19:40:18 +00:00
Sam Hellawell	deb8894035	ESM::MagicEffect::blank() set the default to 1 ... Signed-off-by: Sam Hellawell <sshellawell@gmail.com>	2024-03-27 09:26:04 +00:00
Andrei Kortunov	f2dc25e214	Optimize bitmap fonts loading	2024-03-27 12:44:35 +04:00
psi29a	f7f7502d60	Merge branch 'i-said-it-was-unlocked-damn-you' into 'master' ... Fix(CS): Actually allow unlocking doors ( #7899 ) Closes #7899 See merge request OpenMW/openmw!3982	2024-03-27 07:32:53 +00:00
Dave Corley	2e68786331	Fix(CS): Actually allow unlocking doors ( #7899 )	2024-03-27 07:32:53 +00:00
psi29a	b70f1d86c5	Merge branch 'fix-sheathing-non-nifs' into 'master' ... Fix weapon and shield sheathing for non-nif meshes See merge request OpenMW/openmw!3985	2024-03-27 07:30:14 +00:00
Mads Buvik Sandvei	e0b11c14c2	Remove unused member mStackable	2024-03-26 14:44:02 +00:00
Sam Hellawell	7897ff7ac9	Fix weapon sheathing for non-nif meshes	2024-03-25 21:03:59 +00:00
psi29a	012d10703f	Merge branch 'spellcast-refactor' into 'master' ... Spellcast related Lua API + spellcasting/activespell refactor See merge request OpenMW/openmw!3922	2024-03-25 13:50:23 +00:00
Mads Buvik Sandvei	320d8ef014	Spellcast related Lua API + spellcasting/activespell refactor	2024-03-25 13:50:23 +00:00
Alexei Kotov	6515fdd73f	Handle zero length Lua storage files more gracefully (#7823)	2024-03-24 20:05:37 +03:00
jvoisin	79a62b3ad3	Merge branch 'enable_normals_for_all' into 'master' ... Restructure colormasks at higher level See merge request OpenMW/openmw!3970	2024-03-23 21:56:30 +00:00
Cody Glassman	a4dd9224df	Restructure colormasks at higher level	2024-03-23 21:56:30 +00:00
Evil Eye	5a0aed3a78	Use more decomposition, string_view, and implicit sizes in ESM code	2024-03-23 12:15:09 +01:00
Evil Eye	bf708acfac	Merge branch 'goddamnit-there-are-more' into 'master' ... Even more MSVC-specific warnings that evaded detection in CI See merge request OpenMW/openmw!3968	2024-03-23 08:07:28 +00:00
Alexei Kotov	63276e0f1f	Merge branch 'avoid_copy' into 'master' ... Follow-up for YAML API See merge request OpenMW/openmw!3961	2024-03-23 07:13:39 +00:00
Cody Glassman	098396822f	add choice widget type to postprocessing uniforms	2024-03-21 17:48:30 -07:00
AnyOldName3	818a99a870	Review	2024-03-21 16:18:18 +00:00
AnyOldName3	da8150e2e4	Even more MSVC-specific warnings that evaded detection in CI	2024-03-21 15:51:29 +00:00
Alexei Kotov	3721a69747	ESM4: Make script local variable loading more reliable	2024-03-21 18:16:11 +03:00
psi29a	af9f1b54da	Merge branch 'lost-warnings' into 'master' ... Fixes for a whole bunch of warnings See merge request OpenMW/openmw!3950	2024-03-21 07:45:21 +00:00
Alexei Kotov	25414cd660	Merge branch 'rm_esm4_local_static' into 'master' ... Remove static modifier from local variables used to store temporary loading results See merge request OpenMW/openmw!3964	2024-03-21 05:28:40 +00:00
elsid	3358bc80bf	Merge branch 'esm4fourcc' into 'master' ... Get rid of ESM4::SubRecordTypes See merge request OpenMW/openmw!3962	2024-03-20 20:42:43 +00:00
elsid	0da8b29a88	Remove static modifier from local variables used to store temporary loading results ... They make the code thread unsafe because different threads will use the same memory to write and read using different instances of the loaded objects.	2024-03-20 00:01:41 +01:00
Alexei Kotov	6b93479bd3	Get rid of ESM4::SubRecordTypes ... All my homies hate ESM4::SubRecordTypes	2024-03-18 12:25:17 +03:00
Dave Corley	fcff1a6739	Fix #7887, use actual instead of reported size for script data	2024-03-17 16:14:52 -05:00
Andrei Kortunov	2d3a8ca0fc	Do not use an inner namespace	2024-03-17 18:15:23 +04:00
Andrei Kortunov	cb831a5917	Add more includes just for sure	2024-03-17 17:22:10 +04:00
Andrei Kortunov	2523afe9c2	Use namespace instead of static class	2024-03-16 22:06:28 +04:00
Andrei Kortunov	8037ad7f00	Remove unused includes	2024-03-16 22:06:15 +04:00
psi29a	854b4f226b	Merge branch 'fix_msvc_build' into 'master' ... Fix build with MSVC 19.38 See merge request OpenMW/openmw!3960	2024-03-16 14:09:42 +00:00
Andrei Kortunov	4520ee465d	Do not copy vector	2024-03-16 16:26:26 +04:00
elsid	ee2cc8aeb7	Fix build with MSVC 19.38 ... components\detournavigator\navigator.hpp(44): error C3861: 'assert': identifier not found	2024-03-16 13:09:16 +01:00
elsid	16410d0960	Use std::string for ResourceManager cache key ... Otherwise terrain textures cache has zero hits because it stores not normalized paths. Due to implicit conversion it's possible to add entry with addEntryToObjectCache passing a string that is converted into normalized path. But then getRefFromObjectCache called with original value does not find this entry because it's not converted and overloaded operators are used instead.	2024-03-16 00:17:13 +01:00
Andrei Kortunov	6da151cf77	Fix GCC build	2024-03-15 20:12:47 +04:00
psi29a	5d669f0470	Merge branch 'fix_ui_crashes' into 'master' ... Another day, another UI crash fix See merge request OpenMW/openmw!3949	2024-03-15 11:03:21 +00:00
psi29a	090e57b27c	Merge branch 'esm3structs' into 'master' ... Replace fixed size writeHNT calls with decomposition See merge request OpenMW/openmw!3914	2024-03-15 11:02:42 +00:00
psi29a	d746918563	Merge branch 'yaml_parse' into 'master' ... Load YAML files via Lua Closes #7590 See merge request OpenMW/openmw!3924	2024-03-15 11:02:05 +00:00
Alexei Kotov	6e2dbfbd74	Merge branch 'check-osg-plugins-but-better' into 'master' ... Get OSG to tell us the plugin filenames it's going to use See merge request OpenMW/openmw!3942	2024-03-15 08:36:02 +00:00
AnyOldName3	a06ab94a20	Canonicalise resolved representation of data directories	2024-03-15 00:42:15 +00:00
AnyOldName3	9638fbabb4	https://www.youtube.com/watch?v=2_6U9gkQeqY	2024-03-15 00:11:19 +00:00
AnyOldName3	ff3ffa13b6	Auto format	2024-03-14 23:54:22 +00:00
AnyOldName3	28131fd62b	Fixes for a whole bunch of warnings ... These warnings were always enabled, but we didn't see them due to https://gitlab.com/OpenMW/openmw/-/issues/7882. I do not fully understand the cause of 7822 as I can't repro it in a minimal CMake project. Some of these fixes are thought through. Some are sensible best guesses. Some are kind of a stab in the dark as I don't know whether there was a possible bug the warning was telling me about that I've done nothing to help by introducing a static_cast. Nearly all of these warnings were about some kind of narrowing conversion, so I'm not sure why they weren't firing with GCC and Clang, which have -Wall -Wextra -pedantic set, which should imply -Wnarrowing, and they can't have been affected by 7882. There were also some warnings being triggered from Boost code. The vast majority of library headers that do questionable things weren't firing warnings off, but for some reason, /external:I wasn't putting these Boost headers into external mode. We need these warnings dealt with one way or another so we can switch the default Windows CI from MSBuild (which doesn't do ccache) to Ninja (which does). I have the necessary magic for that on a branch, but the branch won't build because of these warnings.	2024-03-14 23:39:33 +00:00
uramer	68ed771816	Fix element detachment logic	2024-03-14 20:28:12 +01:00
uramer	2f40491065	Fix crash when destroying UI element in the same frame as creating it	2024-03-14 18:08:18 +01:00
Evil Eye	b52f721318	Use getSubComposite to read AMBI	2024-03-14 17:08:23 +01:00
Andrei Kortunov	715efe892f	Load YAML files via Lua (feature 7590)	2024-03-14 16:29:21 +04:00
psi29a	2764d8ceff	Merge branch 'fix_destroying_new_elements' into 'master' ... Don't destroy root widget for new elements See merge request OpenMW/openmw!3947	2024-03-14 08:37:13 +00:00
AnyOldName3	942eeb54c1	Yet another osgpluginchecker rewrite ... It turns out that it's possible for OSG plugins to be spread across multiple directories, and OSG doesn't account for this in osgDB::listAllAvailablePlugins(), even though it works when actually loading the plugin. Instead, use code that's much more similar to how OSG actually loads plugin, and therefore less likely to miss anything. Incidentally make things much simpler as we don't need awkwardness from working around osgDB::listAllAvailablePlugins()'s limitations.	2024-03-12 23:30:11 +00:00
uramer	b12f98db98	Don't destroy root widget for new elements	2024-03-12 17:48:42 +01:00
elsid	859d765921	Use normalized path for NifFileManager::get	2024-03-11 22:07:37 +01:00
elsid	3ea3eeb613	Use string_view for canOptimize	2024-03-11 22:07:37 +01:00
elsid	a98ce7f76a	Replace std::filesystem::path by std::string_view in Files::getHash argument	2024-03-11 22:07:37 +01:00
elsid	79b73e45a1	Replace std::filesystem::path by std::string and std::string_view in nif code ... It's used only for error reporting.	2024-03-11 22:07:37 +01:00
elsid	cd3c3ebadb	Use VFS::Path::Normalized for ResourceManager cache key	2024-03-11 22:07:36 +01:00
psi29a	b5b6744321	Merge branch 'hotfix_ui_update' into 'master' ... Fix Lua UI updates See merge request OpenMW/openmw!3936	2024-03-11 11:14:26 +00:00
psi29a	3cb8d05fe5	Merge branch 'vfs_normalized_path_4' into 'master' ... Use VFS::Path::Normalized in few more places See merge request OpenMW/openmw!3934	2024-03-11 07:29:55 +00:00
AnyOldName3	0730dc2ebb	Get OSG to tell us the plugin filenames it's going to use ... That way, we don't have issues like the checker getting false positives when the right plugins are present for the wrong OSG version or build config, or false negatives when we've generated the wrong filenames.	2024-03-10 18:04:38 +00:00
uramer	af8662daee	Detach Lua Elements properly from their parent	2024-03-10 14:05:37 +01:00
uramer	0f60052bb8	Set Element state in Element::create	2024-03-09 22:27:10 +01:00
psi29a	6f9ceff3f3	Merge branch 'windows_build' into 'master' ... Add option to disable precompiled headers See merge request OpenMW/openmw!3933	2024-03-09 09:48:57 +00:00
elsid	cc35df9409	Use VFS::Path::Normalized for fx::Technique file path	2024-03-09 00:21:17 +01:00
elsid	ffbeb5ab98	Build localization path using VFS::Path::Normalized	2024-03-09 00:21:17 +01:00
elsid	84adb0a148	Make VFS::Path::Normalized constructor from std::string_view explicit	2024-03-09 00:21:16 +01:00
psi29a	a926f4a5a9	Merge branch 'alt_tab_fix' into 'master' ... Do not treat Alt-Tab as resolution change Closes #7866 See merge request OpenMW/openmw!3931	2024-03-08 08:41:55 +00:00
psi29a	f09f5c644c	Merge branch 'update_setting_pages' into 'master' ... Optimize setting group rendering See merge request OpenMW/openmw!3929	2024-03-08 08:39:49 +00:00
AnyOldName3	e0b13f0858	Ensure default config values are present ... Moving builtin.omwscripts out of the root openmw.cfg means we actually might need to use the defaults, so need to have some.	2024-03-08 01:44:47 +00:00
elsid	5859fd464c	Add option to disable precompiled headers ... To be able to use ccache. Also fix compilation errors appeared due to absence of precompiled headers.	2024-03-08 02:11:51 +01:00
Andrei Kortunov	5dcac4c48f	Do not treat Alt-Tab as resolution change (bug 7866)	2024-03-07 15:43:35 +04:00
AnyOldName3	36f5c819bb	capitulate	2024-03-07 01:48:16 +00:00
AnyOldName3	243b5b6666	Hopefully convince the old MSVC version on GitLab CI to work ... The old code was legal, and the things it did worked in other places, so should have worked here, too. Hopefully just rearranging stuff convinces what I assume to be a compiler bug to not happen.	2024-03-06 23:52:16 +00:00
AnyOldName3	ed23f48754	Actually erase the things we're removing ... Caused by bad copy and paste	2024-03-06 23:44:24 +00:00
uramer	9ae61f1932	Fix child UI Elements created in the same frame as parent	2024-03-06 23:16:02 +01:00
elsid	5acfb07850	Fix build with OSG_USE_UTF8_FILENAME	2024-03-06 20:51:48 +01:00
Evil Eye	1499dd2654	Add getCompositeSize and handle NPC data	2024-03-06 18:16:55 +01:00
AnyOldName3	bf24bb71b1	Explicitly use std::strong_ordering ... Otherwise it's ambiguous how to build <=> from <, == and >	2024-03-06 01:23:51 +00:00
AnyOldName3	1ae2cc82a1	I do not know how this escaped formatting locally.	2024-03-06 00:46:01 +00:00
AnyOldName3	a130ca57a4	Track source of settings ... This one's a biggie. The basic idea's that GameSettings should know: * what the interpreted value of a setting is, so it can actually be used. * what the original value the user put in their config was, so it can be put back when the config's saved. * which path it's processing the openmw.cfg from so relative paths can be resolved correctly. * whether a setting's a user setting that can be modified, or from one of the other openmw.cfg files that can't necessarily be modified. This had fairly wide-reaching implications. The first is that paths are resolved properly in cases where they previously wouldn't have been. Without this commit, if the launcher saw a relative path in an openmw.cfg, it'd be resolved relative to the process' working directory (which we always set to the binary directory for reasons I won't get into). That's not what the engine does, so is bad. It's also not something a user's likely to suspect. This mess is no longer a problem as paths are resolved correctly when they're loaded instead of on demand when they're used by whatever uses them. Another problem was that if paths used slugs like ?userconfig? would be written back to openmw.cfg with the slugs replaced, which defeats the object of using the slugs. This is also fixed. Tracking which settings are user settings and which are in a non-editable openmw.cfg allows the launcher to grey out rows so they can't be edited (which is sensible as they can't be edited on-disk) while still being aware of content files that are provided by non-user data directories etc. This is done in a pretty straightforward way for the data directories and fallback-archives, as those bits of UI are basic, but it's more complicated for content files as that uses a nmodel/view approach and has a lot more moving parts. Thankfully, I'd already implemented that when dealing with builtin.omwscripts, so it just needed wiring up. One more thing of note is that I made the SettingValue struct storable as a QVariant so it could be attached to the UI widgets as userdata, and then I could just grab the original representation and use it instead of needing any complicated mapping from display value to on-disk value.	2024-03-06 00:36:13 +00:00
psi29a	231b5753e4	Merge branch 'launcher_help_version' into 'master' ... Open matching version of documentation for Launcher Help See merge request OpenMW/openmw!3909	2024-03-05 09:24:52 +00:00
psi29a	e340b06411	Merge branch 'get-glextensions-properly' into 'master' ... Get the GLExtensions instance when a context is created Closes #7351 See merge request OpenMW/openmw!3022	2024-03-04 15:05:23 +00:00
psi29a	61f5a13c02	Merge branch 'check-osg-plugins' into 'master' ... Check for dynamic OSG plugins on launch Closes #7736 See merge request OpenMW/openmw!3748	2024-03-04 08:00:16 +00:00
Evil Eye	cef59e8928	Replace fixed size writeHNT calls with decomposition	2024-03-03 19:39:19 +01:00
Evil Eye	958f70736f	Implement auto calculated potion values	2024-03-02 12:45:48 +01:00
AnyOldName3	b8cb757ca4	Oopsie	2024-02-29 00:01:14 +00:00
AnyOldName3	9e1334cc09	Resync composing and path openmw.cfg settings with options.cpp	2024-02-28 23:49:55 +00:00
psi29a	be1e77c282	Merge branch 'fix-git-commit-updating' into 'master' ... Fix git commit updating See merge request OpenMW/openmw!3911	2024-02-28 20:37:28 +00:00
psi29a	03d5872a55	Merge branch 'drop_on_exit' into 'master' ... Add a storage mode to drop section on game exit See merge request OpenMW/openmw!3905	2024-02-28 20:36:40 +00:00
AnyOldName3	d111b4bbd9	Handle built-in content files in content model ... There's also handling for files declared as originating from a lower-priority openmw.cfg, e.g. anything in the local config or any intermediate ones, as they can't be disabled or reordered. There's no way to mark such files yet, but the logic's the same as built-in files, so everything will be fine once that's set up.	2024-02-28 00:58:30 +00:00
Andrei Kortunov	ddd0945645	Add a storage mode to drop section on game exit	2024-02-27 23:26:22 +04:00
Mads Buvik Sandvei	c82c111ee1	Use correct index for Athletics_SwimOneSecond	2024-02-27 19:28:51 +01:00
AnyOldName3	f476301670	There's no such thing as the global data directory ... That's what resources/vfs is for.	2024-02-27 14:11:48 +00:00
AnyOldName3	7d28788aee	data-local is already unquoted when it's read	2024-02-27 02:14:31 +00:00
AnyOldName3	dbdecfe94b	Use approved safety comment for path escaping explanation ... I thought I'd got this one already	2024-02-27 01:41:12 +00:00
AnyOldName3	90966ecc47	Handle replace= lines properly in the launcher	2024-02-27 01:39:49 +00:00
AnyOldName3	626f438dcc	Make builtin.omwscripts actually mandatory ... Previously it was quasi-mandatory - lots of things would add it, e.g. when running openmw through the CS, but it could technically be disabled. Now it's treated like the resources/vfs directory and implicitly added by the engine etc.	2024-02-27 01:09:46 +00:00
Alexei Kotov	46f863a32e	Merge branch 'help-i-cant-swim' into 'master' ... Fix(editor): Don't save dirty water height values Closes #7841 See merge request OpenMW/openmw!3881	2024-02-26 21:50:50 +00:00
psi29a	619ccf7107	Merge branch 'decomposition' into 'master' ... Use decompose to remove more instances of pragma pack See merge request OpenMW/openmw!3906	2024-02-26 11:23:17 +00:00
psi29a	f2039b35d0	Merge branch 'vfs_normalized_path_3' into 'master' ... Use normalized path for correctSoundPath See merge request OpenMW/openmw!3903	2024-02-26 11:21:33 +00:00
AnyOldName3	bcd54ab1ff	Format osgpluginchecker.cpp.in ... I formatted the generated file that's part of the VS solution, then diffed it against the input and changed it to match.	2024-02-25 23:01:52 +00:00
AnyOldName3	02ef7ae3cc	Give up rearranging the CS	2024-02-25 22:49:53 +00:00
AnyOldName3	93a84b38ac	Give git-version its name back	2024-02-25 19:05:38 +00:00
AnyOldName3	42c7fc8e92	Update 2 files ... - /components/CMakeLists.txt - /cmake/GitVersion.cmake	2024-02-25 18:53:19 +00:00
uramer	86a82ae3f1	Open matching version of documentation for Launcher Help	2024-02-25 18:20:40 +01:00
AnyOldName3	357bf3db61	Load all config files	2024-02-25 14:01:20 +00:00
Dave Corley	059191c840	Also apply hasWaterHeightSub for INTV	2024-02-25 07:30:23 -06:00
Alexei Kotov	357b190571	Merge branch 'oldsavessuck' into 'master' ... Account for pre-0.46 saves storing a gold value of 0 for everything See merge request OpenMW/openmw!3902	2024-02-25 10:07:52 +00:00
Alexei Kotov	01e0b25fd3	Merge branch 'coverity' into 'master' ... Fix some Coverity complaints See merge request OpenMW/openmw!3904	2024-02-24 20:25:58 +00:00
AnyOldName3	a761e417f1	Accept that it's too much work to defer light manager creation in the CS and instead use something akin to the old approach	2024-02-24 16:59:11 +00:00
Evil Eye	7d7e8939ab	Use ESM::decompose to handle WPDTstruct	2024-02-24 16:55:58 +01:00
Evil Eye	ec1c6ee171	Use ESM::decompose to handle ENAMstruct	2024-02-24 14:03:24 +01:00
elsid	ec9c829021	Use normalized path for correctSoundPath	2024-02-24 12:42:36 +01:00
elsid	92d57d6e46	Make Normalized constructor from const char* explicit	2024-02-24 12:42:02 +01:00
Evil Eye	82c92a9a6c	Merge branch 'bookart-is-textures-too' into 'master' ... Consider bookart a valid prefix for regular textures and vice versa Closes #7535 See merge request OpenMW/openmw!3342	2024-02-24 10:31:13 +00:00
AnyOldName3	dec8d32b3a	FIx static destruction order chaos	2024-02-24 00:54:40 +00:00
Andrei Kortunov	cf6b6020a0	Move local variables	2024-02-23 17:10:55 +04:00
Andrei Kortunov	fc1f244627	Add missing initialization	2024-02-23 17:01:59 +04:00
AnyOldName3	3fbd97ffc8	Remove unused <vector> header	2024-02-23 12:48:39 +00:00
Alexei Kotov	6d35b626cf	Merge branch 'fix_components_property' into 'master' ... Set components property after it is defined See merge request OpenMW/openmw!3899	2024-02-23 12:41:36 +00:00
Alexei Kotov	89d856d03e	Merge branch 'use_is_directory_member' into 'master' ... Use is_directory member function See merge request OpenMW/openmw!3897	2024-02-23 12:36:40 +00:00
AnyOldName3	6406095bfb	s p a n	2024-02-23 01:34:01 +00:00
AnyOldName3	2bc091fc05	Include missing header ... I thought I'd seen this class defined in one of the existing headers with a different name, but I was muddling its forward declaration and a different class being in a non-obvious header.	2024-02-23 00:15:23 +00:00
AnyOldName3	ec4731d454	Cope with scene widgets being destroyed in a weird order ... I can't actually test this as the CS still doesn't get far enough with this MR.	2024-02-23 00:15:23 +00:00
AnyOldName3	36a75cdb29	Get the GLExtensions instance when a context is created	2024-02-23 00:15:23 +00:00
AnyOldName3	1717e696b1	Format before clang notices and sends me an angry email	2024-02-23 00:06:51 +00:00
AnyOldName3	db5a43db30	Allow top-level prefix to be found in the middle of a path	2024-02-23 00:04:48 +00:00
Evil Eye	0bab37327c	Account for pre-0.46 saves storing a gold value of 0 for everything	2024-02-22 20:23:21 +01:00
psi29a	e4a9e83609	Merge branch 'disable-shadows-properly-properly' into 'master' ... Affect correct texture units when disabling shadows for stateset Closes #7838 See merge request OpenMW/openmw!3891	2024-02-22 18:05:48 +00:00
elsid	38990b1fd2	Set components property after it is defined	2024-02-22 11:15:39 +01:00
Dave Corley	ce2787e15e	Cleanup(loadcell): Rename setHasWater to setHasWaterHeightSub	2024-02-22 03:26:17 -06:00
Dave Corley	d04572ac84	Cleanup(loadcell): Rename mHasWater to mHasWaterHeightSub for clarity.	2024-02-22 03:01:29 -06:00
Dave Corley	f95cad07f2	Cleanup(loadcell): Remove unused integer water flag	2024-02-22 03:01:29 -06:00
Dave Corley	bb35f0366a	Fix(loadcell): Save water height regardless of value, if the user actually adjusted it	2024-02-22 03:01:28 -06:00
Dave Corley	1b431bf633	Fix(editor): Don't save dirty water height values	2024-02-22 03:01:28 -06:00
psi29a	35f547ad7c	Merge branch 'fatstacks' into 'master' ... Allow the NAM9 field to be used if COUN is omitted Closes #7836 See merge request OpenMW/openmw!3889	2024-02-22 08:10:59 +00:00
psi29a	518f34c869	Merge branch 'bsa_archive' into 'master' ... Cleanup and optimize BSA archives code See merge request OpenMW/openmw!3876	2024-02-22 08:02:12 +00:00
AnyOldName3	2a5f8d5bab	Skip the check on MacOS ... It doesn't work, the workaround isn't enough to make it work, I can't be bothered making a more powerful workaround, and it's impossible to *package* a MacOS build missing the plugins we need anyway, even if you can build and attempt to run it.	2024-02-22 00:24:44 +00:00
elsid	c2ac1ce046	Use is_directory member function ... To reduce the number of syscalls.	2024-02-21 22:03:15 +01:00
AnyOldName3	3335ccbc32	Capitulate	2024-02-20 23:51:42 +00:00
AnyOldName3	8c92f6ee87	Make uniform a signed int again	2024-02-20 23:10:23 +00:00
AnyOldName3	d282fdb77a	Eliminate unused uniform	2024-02-20 23:10:03 +00:00
AnyOldName3	132c43affa	Fix warning ... Also attempt to make an equivalent warning fire with MSVC, then have to fix other stuff because /WX wasn't working, then back out of enabling the warning because none of the ones I could find disliked the old code.	2024-02-20 22:14:13 +00:00
AnyOldName3	7391bf2814	Fix OpenGL errors ... There's no reason to use the AndModes variant as we never (intentionally) attempt to sample from a shadow map via the FFP.	2024-02-20 21:23:23 +00:00
AnyOldName3	535c5e328a	Affect correct texture units when disabling shadows for stateset ... Knowing which are right required making the function non-static, so the shadow manager had to become a singleton as the results of passing it around to where it's needed were hellish. I'm seeing a bunch of OpenGL errors when actually using this, so I'll investigate whether they're happening on master. I'm hesitant to look into it too much, though, as I'm affected by https://gitlab.com/OpenMW/openmw/-/issues/7811, and also have the Windows setting enabled that turns driver timeouts into a BSOD so a kernel dump is collected that I can send to AMD.	2024-02-20 21:02:31 +00:00
Evil Eye	254b533512	Allow the NAM9 field to be used if COUN is omitted	2024-02-20 20:04:28 +01:00
psi29a	8c8fffc2c6	Merge branch 'fix_shared_library_build' into 'master' ... Build fixes related to shared libraries and position independent code See merge request OpenMW/openmw!3878	2024-02-20 08:47:14 +00:00
AnyOldName3	2c1c8bc8de	Work around for listAllAvailablePlugins	2024-02-19 23:16:50 +00:00
psi29a	e88e92d3aa	Merge branch 'recursive_directory_iteration_errors' into 'master' ... Add context to the errors on recursive iteration over directory See merge request OpenMW/openmw!3872	2024-02-19 10:00:24 +00:00
psi29a	3369184c19	Merge branch 'lesspragmaticpackages' into 'master' ... Use decompose to handle AI packages and data See merge request OpenMW/openmw!3856	2024-02-19 09:59:59 +00:00
elsid	efbc37d22f	Build components with position independent code only for Android ... openmw is build as shared library with position independent code enabled there so linked static libraries need to have this too.	2024-02-18 19:36:58 +01:00
elsid	e2e1d913af	Remove redundant destructor	2024-02-18 14:54:51 +01:00
elsid	8c6e0866e0	Avoid seek for detecting BSA type ... Seek is pretty expensive operation. Try to read first 12 bytes instead.	2024-02-18 14:54:51 +01:00
elsid	cc9f9b53ba	Convert BsaVersion to enum class	2024-02-18 14:54:51 +01:00
elsid	df077a2524	Simplify and reduce code duplication for BSA archive creation	2024-02-18 14:54:14 +01:00
elsid	1b1ed55762	Add context to the errors on recursive iteration over directory ... To avoid showing users errors like: recursive_directory_iterator::operator++: Access is denied. And show something like this: Failed to recursively iterate over "/home/elsid/.local/share/openmw/test_data" when incrementing to the next item from "/home/elsid/.local/share/openmw/test_data/permission_denied": Permission denied	2024-02-18 01:08:19 +01:00
elsid	a2345194c8	Optimize lookup for a file in the BSA archive ... Use binary search in sorted vector or normalized paths instead of linear search in the original file struct. With number of files from 1k to 10k in vanilla archives this gives some benefits.	2024-02-18 00:56:50 +01:00
psi29a	a297a0e742	Merge branch 'init_filesystem_archive' into 'master' ... Initialize FileSystemArchive index in constructor See merge request OpenMW/openmw!3870	2024-02-17 23:42:30 +00:00
psi29a	f9820e2061	Merge branch 'debugdrawdebugged' into 'master' ... Try to uncursify debug primitive drawer (#7767) Closes #7767 See merge request OpenMW/openmw!3852	2024-02-17 18:56:21 +00:00
elsid	d147d1d250	Initialize FileSystemArchive index in constructor ... It should be initialize for each created archive anyway. There is no good reason to have additional complexity for lazy initialization. And it helps to catch problems with specific directory when it's added to the VFS not when all are added and index is built.	2024-02-17 02:07:50 +01:00
Alexei Kotov	d9ee54ae98	DebugCustomDraw: Correct PerContextProgram use, clean up drawImplementation	2024-02-16 14:43:16 +03:00
psi29a	1280345296	Merge branch 'copy_qtbase' into 'master' ... Copy qtbase translations See merge request OpenMW/openmw!3840	2024-02-15 09:26:42 +00:00
Andrei Kortunov	9a7b9572fd	Deploy base Qt translations when needed	2024-02-15 09:26:14 +04:00
uramer	08b7ee8a44	Test LuaUtil::safeGet preventing crash	2024-02-14 09:49:32 +01:00