1
0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-17 10:10:23 +00:00
Commit Graph

26283 Commits

Author SHA1 Message Date
elsid
41b02ff1aa
Copy only required RecastMeshObject fields 2021-08-07 12:38:01 +02:00
elsid
c91ef34a70
Avoid using a specific type for stored ref_ptr to extend lifetime 2021-08-07 12:20:55 +02:00
Evil Eye
29921bf9fa Don't stack cast packages 2021-08-07 10:06:56 +02:00
psi29a
b770373491 Merge branch 'OpenCS-enforce-str-length' into 'master'
OpenCS - Disallow entry of strings longer than the lengths allowed by the file format (#3066)

See merge request OpenMW/openmw!1088
2021-08-06 21:08:09 +00:00
psi29a
faad36ada2 Merge branch 'osg_stats' into 'master'
Add a script to analyze OpenSceneGraph log

See merge request OpenMW/openmw!1091
2021-08-06 21:00:00 +00:00
psi29a
ba268a5cd4 Merge branch 'macos_runner_macrofix' into 'master'
Fix mac runner

See merge request OpenMW/openmw!1092
2021-08-06 20:10:46 +00:00
elsid
1b224e2eb6 Merge branch 'fix_ci_coverity' into 'master'
Don't try to build openmw-cs in coverity

See merge request OpenMW/openmw!1093
2021-08-06 19:48:48 +00:00
jvoisin
76760cd993 Don't try to build openmw-cs in coverity
We need more than 3h to build everything with coverity.
2021-08-06 14:50:09 +02:00
glassmancody.info
cdf5b315c3 fix mac runner undefined macro 2021-08-05 16:52:40 -07:00
AnyOldName3
b8878cb5f9 Merge branch 'to_infinity_and_beyond' into 'master'
Reverse-Z depth buffer

See merge request OpenMW/openmw!889
2021-08-05 20:22:51 +00:00
glassmancody.info
09e03fde2e refactor and fix wobbly shores 2021-08-04 17:49:57 -07:00
glassmancody.info
cad0b151cb enable shaders path and dehardcode depth formats 2021-08-04 17:39:11 -07:00
glassmancody.info
b457dfd8b8 fix water RTTs and minor math error in non-infinite projection matrix 2021-08-04 17:39:11 -07:00
glassmancody.info
d89e37d689 add framebuffer extension check and fix issues with manual screenshots 2021-08-04 17:39:11 -07:00
glassmancody.info
70fac33940 initial reverse-z depth implementation 2021-08-04 17:39:11 -07:00
elsid
1d69681c0a
Add a script to analyze OpenSceneGraph log 2021-08-04 23:52:02 +02:00
Petr Mikheev
10d100f205 Merge branch 'lua_quit' into 'master'
Lua command `core.quit`

Closes #5936

See merge request OpenMW/openmw!1090
2021-08-04 17:16:24 +00:00
Petr Mikheev
a94072243b Lua command core.quit 2021-08-04 19:14:24 +03:00
psi29a
8a14daaac7 Update CHANGELOG.md 2021-08-04 09:53:31 +00:00
cc9cii
8aee84c46e Disallow entry of strings longer than the lengths allowed by the file format.
It is possible to allow longer strings but that will require an extension in the omwaddon format as well as changes to the reader to handle that extension.  Such changes should be a separate MR.

(applied the patch in https://gitlab.com/OpenMW/openmw/-/issues/3066)
2021-08-04 09:39:18 +10:00
psi29a
9fa7521fc5 Merge branch 'OpenCS-no-charconv' into 'master'
OpenCS - Avoid the inclusion of charconv header

See merge request OpenMW/openmw!1087
2021-08-03 23:32:40 +00:00
psi29a
9b7e14ec00 Merge branch 'OpenCS-moved-reference' into 'master'
OpenCS - Fix moved reference - Issues #3514 and #4752

See merge request OpenMW/openmw!1051

(cherry picked from commit 2bee171c7990522da33c2667f7d079fa35f4ede0)

36c30f7f Fix for Issue #3514 where moving a reference to another cell is not handled properly.
40327681 Update the changelog.
2021-08-03 23:29:05 +00:00
psi29a
e10e9c0005 Merge branch 'navmesh_reduce_lock_wait' into 'master'
Reduce waiting duration on locks when updating navmesh object in the main thread (#6193)

Closes #6193

See merge request OpenMW/openmw!1079
2021-08-03 23:05:39 +00:00
psi29a
fa18f049af Add #5788 to changelog 2021-08-03 23:02:41 +00:00
psi29a
16d04cf76c Merge branch 'fixtexindex' into 'master'
Fix texture index search bug

See merge request OpenMW/openmw!1080
2021-08-03 23:00:33 +00:00
cc9cii
bf06898a79 Retain the use of std::string_view in the function signature. 2021-08-04 08:23:22 +10:00
cc9cii
99e691fbe3 Avoid the inclusion of <charconv> header due to Ubuntu Bionic (18.04) which as gcc version less than 8.1
Partially reverts commit fd67ebde25
2021-08-04 06:47:14 +10:00
Alexei Dobrohotov
31e5fd91d1 Merge branch 'fix' into 'master'
Improve error messages in components/lua/serialization.cpp

See merge request OpenMW/openmw!1086
2021-08-03 16:57:11 +00:00
Petr Mikheev
3ce5e9e680 Improve error messages in components/lua/serialization.cpp 2021-08-03 16:42:26 +03:00
psi29a
09705260e8 Merge branch 'lua_controls' into 'master'
Remove Lua command "self:setDirectControl"

See merge request OpenMW/openmw!1084
2021-08-03 12:34:35 +00:00
Petr Mikheev
0f7f5ce140 Remove Lua command "self:setDirectControl" 2021-08-03 14:36:51 +03:00
elsid
050b7d31aa
Create RecastMesh outside critical section
To not lock main thread when it tries to update objects.
2021-08-03 12:21:56 +02:00
elsid
c8987bda2f
Store reference to BulletShapeInstance for btCollisionShape
To keep btCollisionShape lifetime.
2021-08-03 12:21:56 +02:00
elsid
4574e5f565
Remove redundant Navigator API functions 2021-08-03 12:21:55 +02:00
psi29a
bd1bf4ec73 Merge branch 'donoteraseme' into 'master'
#6192: Stop crashing in moveActors()

See merge request OpenMW/openmw!1085
2021-08-03 07:53:13 +00:00
fredzio
bc738c5640 Use extract/insert instead of erase/emplace
When we call moveObject(), we might trigger a change of cell for the
actor, which in turn triggers updatePtr(). The erase/emplace
construct invalidate references, whereas extract/insert do not.

The reason is was working before !1075 is because we were always
"refreshing" the reference by a call to getActor().
2021-08-03 07:00:42 +02:00
psi29a
1f8209158b Merge branch 'properly_initialize_lightsettings' into 'master'
Properly initialize light settings

See merge request OpenMW/openmw!1083
2021-08-02 07:51:53 +00:00
psi29a
fafad644a3 Merge branch 'correct_reflection_label' into 'master'
Correct reflection label for in-game settings menu

See merge request OpenMW/openmw!1082
2021-08-02 07:13:20 +00:00
glassmancody.info
1e52ca2b64 properly initialize light settings 2021-08-01 23:46:45 -07:00
glassmancody.info
0b9b724020 correct reflection label for in-game settings menu 2021-08-01 18:19:39 -07:00
unelsson
09ee2a0a36 fix texture brush index search 2021-08-01 19:42:41 +03:00
psi29a
4b48e62b64 Merge branch 'fixandclean' into 'master'
Fix opencs build and remove some clang warnings

See merge request OpenMW/openmw!1078
2021-08-01 12:11:17 +00:00
fredzio
1391194152 Remove unneeded return statement 2021-08-01 13:14:32 +02:00
fredzio
9ba459662d Remove unneeded std::move
[19/199] Building CXX object apps/opencs/CMakeFiles/openmw-cs.dir/model/world/commands.cpp.o
../../../apps/opencs/model/world/commands.cpp:298:12: warning: moving a temporary object prevents copy elision [-Wpessimizing-move]
    mOld = std::move(model.getRecord (id).clone());
           ^
../../../apps/opencs/model/world/commands.cpp:298:12: note: remove std::move call here
    mOld = std::move(model.getRecord (id).clone());
           ^~~~~~~~~~                            ~
../../../apps/opencs/model/world/commands.cpp:333:12: warning: moving a temporary object prevents copy elision [-Wpessimizing-move]
    mOld = std::move(model.getRecord (id).clone());
           ^
../../../apps/opencs/model/world/commands.cpp:333:12: note: remove std::move call here
    mOld = std::move(model.getRecord (id).clone());
           ^~~~~~~~~~                            ~
2 warnings generated.
2021-08-01 13:14:32 +02:00
fredzio
36e33b0cf2 Add missing override 2021-08-01 13:14:32 +02:00
fredzio
bede1ea1ec Fix build 2021-08-01 13:14:32 +02:00
psi29a
15d278de55 Merge branch 'opt-out-compose' into 'master'
Make it possible to opt out of composing variables

Closes #6186

See merge request OpenMW/openmw!1076
2021-08-01 08:53:52 +00:00
psi29a
9f5008783a Merge branch 'OpenCS-topicrange-bug' into 'master'
OpenCS - Fix Verify operation incorrectly reporting Multiple entries with quest status 'Named'

See merge request OpenMW/openmw!1077
2021-08-01 08:48:00 +00:00
cc9cii
67cad2c515 Fix CSMWorld::InfoCollection::getTopicRange() returning one too many. 2021-08-01 15:53:00 +10:00
AnyOldName3
04e9b6d242 Abort on duplicate content file 2021-08-01 03:04:12 +01:00