1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-30 08:15:37 +00:00
Commit graph

30447 commits

Author SHA1 Message Date
psi29a
6d8f3c7bce Merge branch 'cs_unit_tests' into 'master'
Introduce unit tests for editor

See merge request OpenMW/openmw!2821
2023-03-13 09:37:32 +00:00
psi29a
b90bdb9fcf Merge branch 'update-appdata' into 'master'
Update AppData summary to be more concise

See merge request OpenMW/openmw!2826
2023-03-13 09:35:24 +00:00
psi29a
9b184a1698 Merge branch 'loadammo' into 'master'
Updates to ESM4::Ammunition loading

See merge request OpenMW/openmw!2830
2023-03-13 09:34:31 +00:00
psi29a
e95f5f2ec1 Merge branch 'cherry-pick-fb3a80be' into 'master'
Cherry pick 'openmw-48-stereo-fixes' into 'master'

See merge request OpenMW/openmw!2829
2023-03-13 09:33:55 +00:00
psi29a
34724c5538 Merge branch 'remove_double_dialogue_store_setup' into 'master'
Set up Store<ESM::Dialogue> once

See merge request OpenMW/openmw!2824
2023-03-13 08:47:13 +00:00
psi29a
0e4766ffe2 Merge branch 'fix_store_test_function_name' into 'master'
Remove misleading part of the function name

See merge request OpenMW/openmw!2823
2023-03-13 08:47:01 +00:00
Alexei Dobrohotov
3d87bc185d Updates to ESM4::Ammunition loading 2023-03-13 01:36:07 +03:00
psi29a
e37860c1dc Cherry pick 'openmw-48-stereo-fixes' into 'master'
Openmw 48 stereo fixes

See merge request OpenMW/openmw!2815
2023-03-12 22:20:23 +01:00
Alexander Olofsson
62750ae821
Update AppData summary to be more concise
This brings the AppData in line with the Debian package title
2023-03-12 20:17:40 +01:00
elsid
0577d2751b
Set up Store<ESM::Dialogue> once
Store<ESM::Dialogue> is derived from DynamicStore and setUp is called for it
along with other setUp calls for stores derived from DynamicStore.
2023-03-12 15:31:19 +01:00
elsid
55ebd97949
Remove misleading part of the function name 2023-03-12 15:14:38 +01:00
elsid
712feb0d92
Run CS tests in CI 2023-03-12 12:06:33 +01:00
elsid
403bc927fb
Add test for CSMWorld::InfoCollection::load 2023-03-12 12:06:33 +01:00
elsid
6f6e452dfa
Add executable to run CS tests 2023-03-12 12:06:33 +01:00
elsid
59f2fccc9f
Split openmw-cs into binary and library 2023-03-12 12:06:33 +01:00
psi29a
efebb8efd8 Merge branch 'cmake_fixes' into 'master'
Formatting and coverage related CMake files fixes

See merge request OpenMW/openmw!2811
2023-03-12 11:03:06 +00:00
psi29a
86a812f434 Merge branch 'store_test_dialogue' into 'master'
Add ESMStore tests for loading dialogue and info records

See merge request OpenMW/openmw!2820
2023-03-12 10:52:28 +00:00
psi29a
d4d9b2d699 Merge branch 'multithreaded-bullet-windows' into 'master'
Use multithreaded Bullet libraries on Windows

Closes #7270

See merge request OpenMW/openmw!2816
2023-03-12 10:49:04 +00:00
psi29a
3594f92e3a Merge branch 'symstore' into 'master'
Package symbols for symbol server in CI

See merge request OpenMW/openmw!2818
2023-03-12 10:48:52 +00:00
elsid
9c780efe50
Add ESMStore tests for loading dialogue and info records 2023-03-12 01:52:20 +01:00
AnyOldName3
946e905d58 Bump cache key for new Bullet binaries 2023-03-11 18:36:06 +00:00
AnyOldName3
6ca9fb7e15 Use multithreaded Bullet libraries on Windows 2023-03-11 18:32:36 +00:00
elsid
1cc4909144
Add --coverage to components_qt, benchmarks and openmw-cs 2023-03-10 21:36:12 +01:00
elsid
1857d8a68c
Use target_compile_options to add --coverage 2023-03-10 15:34:08 +01:00
elsid
a527db8ca7
Enforce space only indendation in CMake files 2023-03-10 15:28:14 +01:00
elsid
cc066efa11
Fix identation in CMakeLists.txt 2023-03-10 15:28:06 +01:00
elsid
8031b9a16c
Use spaces only for identation in CMakeLists.txt 2023-03-10 15:01:24 +01:00
psi29a
ff7a098e74 Merge branch 'justbenormal' into 'master'
Unify collision shape transformations

See merge request OpenMW/openmw!2808
2023-03-10 07:51:01 +00:00
psi29a
b9f1d5d4e7 Merge branch 'seventeenth-times-the-charm' into 'master'
Fix #7264

Closes #7264

See merge request OpenMW/openmw!2805
2023-03-10 07:21:07 +00:00
Alexei Dobrohotov
562461a659 Unify collision shape transformations 2023-03-10 00:12:12 +03: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
AnyOldName3
ccdb1bf6b7 Ensure shader requirements are pushed at least once for subgraph
Shaders, if deemed necessary, get attached to the node mentioned by the
top of the requirements stack. Previously an empty stack was incorrectly
assumed to mean no shaders were required, but we found out that was
wrong. We need to put shaders *somewhere*, and the root of the subgraph
we're modifying should be the best place.
2023-03-08 00:28:48 +00:00
AnyOldName3
aee1edaf9e Partially revert "Attach shaders to geometry that lacks a stateset if necessary"
This reverts commit 6aef366fd3.
2023-03-08 00:15:49 +00: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