mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-16 15:29:55 +00:00
Code Issues Releases Wiki Activity
30413 commits 107 branches 66 tags 133 MiB
Commit graph

30413 commits

This branch
This branch
All branches
Author SHA1 Message Date
elsid
8031b9a16c
Use spaces only for identation in CMakeLists.txt 2023-03-10 15:01:24 +01:00
psi29a
eca26e8b18 Merge branch 'Support-BA2-file-format' into 'master' 
Support ba2 file format

See merge request OpenMW/openmw!2787
 2023-03-08 22:00:43 +00:00
psi29a
cb0fa6dd5a Merge branch 'pushittothelimit' into 'master' 
Improve btTriangleMesh abuse (bug #6027, part 2)

Closes #6027

See merge request OpenMW/openmw!2807
 2023-03-08 10:03:02 +00:00
Alexei Dobrohotov
2277bdc1ae Improve btTriangleMesh abuse (bug #6027, part 2) 2023-03-08 06:13:32 +03:00
Cédric Mocquillon
19fbba080d Add a check if the requested file is not found 2023-03-06 21:26:51 +01:00
Cédric Mocquillon
7f936ad18f Some cleanup on includes 2023-03-06 21:26:20 +01:00
Cédric Mocquillon
64ce6eb6bc Merge the two identical conditions 2023-03-06 21:25:53 +01:00
Cédric Mocquillon
1a7b2cd611 Fix remaining bugs 2023-03-06 15:50:45 +01:00
psi29a
cbd14833fd Merge branch 'rig-and-morph-geometry-state-fixes' into 'master' 
Use Rig/MorphGeometry state for its child geometry, revert redundant fix

Closes #7251

See merge request OpenMW/openmw!2802
 2023-03-06 07:50:13 +00:00
AnyOldName3
4aa40897ca Revert "Apply ShaderVisitor to Rig/MorphGeometry source geometry" 
This reverts commit 471f6abf6c.

The commit should be redundant as of 20e799dadc
 2023-03-06 00:54:57 +00:00
Alexei Dobrohotov
20e799dadc Use Rig/MorphGeometry state for its child geometry 
Cherry-pick of ed44095cdc from 0.48 branch
 2023-03-06 00:54:02 +00:00
psi29a
8e36d5e704 Merge branch 'operate_on_this' into 'master' 
Handle incorrect comparison operators

Closes #6716

See merge request OpenMW/openmw!2801
 2023-03-05 22:03:53 +00:00
Evil Eye
c6a545766c Remove redundant string_view 2023-03-05 21:45:03 +01:00
psi29a
0858da3d1f Merge branch 'cellstore' into 'master' 
[Refactorring] Merge duplicated `public:` and `private:` sections in cellstore.hpp

See merge request OpenMW/openmw!2800
 2023-03-05 20:25:54 +00:00
Evil Eye
724c6ec425 Match unit test to Morrowind.exe behaviour 2023-03-05 20:27:07 +01:00
psi29a
94b6da52d5 Merge branch 'fix_physics_deadlock' into 'master' 
Fix deadlock in async physics (#7255)

Closes #7255

See merge request OpenMW/openmw!2798
 2023-03-05 18:25:16 +00:00
unknown
868a398b86 Allow comparison operators of arbitrary length 2023-03-05 19:15:43 +01:00
Petr Mikheev
929fade8be Merge duplicated public: and private: sections in cellstore.hpp 2023-03-05 18:45:53 +01:00
elsid
0040da3497
Do not use std::shared_mutex to wait for job for async physics 
std::shared_mutex in combination with std::condition_variable_any may
lead to a situation when notify_all does not wake up all waiting threads
on Windows. Use separate std::mutex and std::condition_variable to
notify about new job. Encapsulate all workers synchronization logic into
a separate type.
 2023-03-05 18:07:56 +01:00
psi29a
31ae1cd339 Merge branch 'limit_max_bullet_supported_threads' into 'master' 
Limit max bullet supported threads by BT_MAX_THREAD_COUNT - 1

See merge request OpenMW/openmw!2797
 2023-03-04 12:42:51 +00:00
psi29a
a91b4e0cce Merge branch 'duplicated_locales' into 'master' 
Ignore duplicated preferred l10n locales

See merge request OpenMW/openmw!2796
 2023-03-04 12:42:25 +00:00
psi29a
afa6643c6e Merge branch 'maybe-fix-freeze-catcher' into 'master' 
Fix Windows freeze catcher

See merge request OpenMW/openmw!2795
 2023-03-04 12:42:06 +00:00
psi29a
d1cf93e203 Merge branch 'reserve_texture_units' into 'master' 
Log reserved texture units

See merge request OpenMW/openmw!2794
 2023-03-04 12:41:51 +00:00
Petr Mikheev
e70ab80b90 Ignore duplicated preferred l10n locales 2023-03-04 10:20:03 +01:00
elsid
949b9191a5
Limit max bullet supported threads by BT_MAX_THREAD_COUNT - 1 
There is a check and assert for number of threads >= BT_MAX_THREAD_COUNT.
btDbvtBroadphase::m_rayTestStacks::size may return BT_MAX_THREAD_COUNT which
triggers the assert.
 2023-03-04 02:08:45 +01:00
AnyOldName3
5b3e9e15ee Maybe fix Windows freeze catcher 
It looks like it's never actually been capable of creating a minidump since the original MR was merged. It worked briefly, and then apparently I managed to dissappear an important function call when rearranging things.
 2023-03-04 00:28:22 +00:00
Petr Mikheev
e007dc9d6b Log reserving texture units 2023-03-04 00:55:34 +01:00
psi29a
88567cd363 Merge branch 'unplugged' into 'master' 
Handle sound device changes

Closes #4382

See merge request OpenMW/openmw!2791
 2023-03-03 20:41:42 +00:00
psi29a
2f4eb3e299 Merge branch 'string_to_ref_id' into 'master' 
Replace std::string and std::string_view by ESM::RefId to avoid getRefIdString call

See merge request OpenMW/openmw!2790
 2023-03-03 20:41:19 +00:00
psi29a
fbb00027d8 Merge branch 'fix_clamp_physics_threads' into 'master' 
Fix clamping physics threads

See merge request OpenMW/openmw!2792
 2023-03-03 19:52:15 +00:00
Cédric Mocquillon
d2244c8d97 Fix detectVersion 2023-03-03 20:49:31 +01:00
elsid
3d3cccb8e5
Fix clamping physics threads 2023-03-03 18:44:47 +01:00
Evil Eye
027d49cf28 Set thread priority and start thread on fallback usage 2023-03-03 18:00:02 +01:00
Evil Eye
e020af8b4a Switch to new default device if default device changes 2023-03-03 17:31:09 +01:00
Cédric Mocquillon
78251a2bb1 Move outside the condition + fix bug: missing offset 2023-03-03 17:09:38 +01:00
Cédric Mocquillon
d73ab7ef6f Add comments 2023-03-03 17:09:38 +01:00
Cédric Mocquillon
24272d07bf Share generateHash used in ba2dx10file and ba2gnrlfile 2023-03-03 17:09:35 +01:00
elsid
d03bec60e9
Avoid redundant conversion from RefId to string and back 2023-03-03 15:44:19 +01:00
elsid
191f207e78
Avoid redundant conversion to lower case for CommandDispatcher::mSelection items 2023-03-03 15:44:19 +01:00
elsid
7daef583cb
Use ESM::RefId as key for ScriptContext::mLocals 2023-03-03 15:44:18 +01:00
elsid
3975003778
Use ESM::RefId as key for Globals::mVariables 2023-03-03 15:44:18 +01:00
elsid
cd6a5b5a0e
Support asymmetric comparison between ESM::RefId and std::string_view 2023-03-03 15:44:18 +01:00
elsid
6f329f3d40
Add tests for ESM::RefId 2023-03-03 15:44:18 +01:00
elsid
693f4c40f4
Use ESM::RefId as key for Data::mRefLoadCache 2023-03-03 15:44:18 +01:00
elsid
419a86f0b9
Use ESM::RefId for actor parts 
To avoid redundant conversion RefId to string and back.
 2023-03-03 15:44:14 +01:00
elsid
4cb095ce39
Use ESM::RefId as key for MergeReferencesStage::mIndex 2023-03-03 15:41:56 +01:00
elsid
eb17f0ba06
Use ESM::RefId as key in TestInterpreterContext::mMembers 2023-03-03 15:41:56 +01:00
elsid
3c9dbb11cc
Use ESM::RefId as key for SavingState::mSubRecords 2023-03-03 15:41:53 +01:00
psi29a
0d25656d81 Merge branch 'settigs_docs' into 'master' 
Update settings documentation

See merge request OpenMW/openmw!2789
 2023-03-03 10:25:11 +00:00
psi29a
c252f6a264 Merge branch 'ref_id_string_helpers' into 'master' 
Add helper functions for string comparison to RefId

See merge request OpenMW/openmw!2788
 2023-03-03 10:24:42 +00:00