psi29a
faa3e04494
Merge branch 'const_reff' into 'master'
...
Sprinkle some const-ref
See merge request OpenMW/openmw!1145
2021-08-17 08:20:13 +00:00
psi29a
76d867bb23
Merge branch 'ESSImporter-ACDT-fix' into 'master'
...
ESSImporter - Fix/workaround for Issue #3246
See merge request OpenMW/openmw!1150
2021-08-17 08:17:48 +00:00
psi29a
72fb3ad930
Merge branch 'mmmmove' into 'master'
...
Sprinkle a couple of std::move
See merge request OpenMW/openmw!1147
2021-08-17 08:11:14 +00:00
cc9cii
b1fb3e2313
Add missing includes.
2021-08-17 13:53:14 +10:00
cc9cii
59a92de977
update changelog
2021-08-17 12:31:06 +10:00
cc9cii
47a841d3b7
Fix/workaround for Issue #3246
...
OpenMW save file assumes the presence of NPC/Creature data but the vanilla save file provides only the delta changes in most situations. The base data are not available without loading all the relevant dependency content files. Duplicating that code in the ESSImporter is not desirable.
Ideally a flag should be set but that will mean a change in the save file format. For a minor change such as this doing so seems like an overkill. So a temporary workaround is introduced where the gold carried by the NPC/Creature is used as an indicator as the lack of ACDT data.
2021-08-17 12:29:28 +10:00
elsid
bd995817ee
Merge branch 'tidy_timeout' into 'master'
...
Don't build everything in clang-tidy
See merge request OpenMW/openmw!1148
2021-08-16 12:53:35 +00:00
jvoisin
5793f5cf18
Sprinkle a couple of std::move and a const
2021-08-16 13:11:22 +02:00
jvoisin
9622def79c
Don't build everything in clang-tidy
2021-08-16 12:10:45 +02:00
Alexei Dobrohotov
6c1ac9ed9f
Merge branch 'init_sky' into 'master'
...
Use an initialization list in WrapAroundOperator's constructor
See merge request OpenMW/openmw!1146
2021-08-16 01:19:28 +00:00
Alexei Dobrohotov
7665ebfa67
Merge branch 'another_fix' into 'master'
...
Fix #6219
Closes #6219
See merge request OpenMW/openmw!1137
2021-08-16 01:15:52 +00:00
Alexei Dobrohotov
873e16ae93
Merge branch 'emp' into 'master'
...
Use an emplace instead of an insert
See merge request OpenMW/openmw!1144
2021-08-16 01:14:36 +00:00
elsid
e8a67b61c1
Merge branch 'clang-tidy' into 'master'
...
Add clang-tidy to the CI
See merge request OpenMW/openmw!900
2021-08-15 23:03:26 +00:00
elsid
f966fdb65e
Merge branch 'noweak' into 'master'
...
use shared_ptr inside the physics simulation to simplify the code
See merge request OpenMW/openmw!1141
2021-08-15 21:59:47 +00:00
jvoisin
ff2a51a484
Use an initialization list in WrapAroundOperator's constructor
2021-08-15 19:57:20 +02:00
jvoisin
7a015d24c6
Sprinkle some const-ref
2021-08-15 19:50:28 +02:00
elsid
0505a31540
Merge branch 'artifacts_coverity' into 'master'
...
Don't save artifacts when using coverity
See merge request OpenMW/openmw!1135
2021-08-15 17:29:17 +00:00
AnyOldName3
88b666ae26
Merge branch 'break_the_fall' into 'master'
...
Addresss GCC compiler warning
See merge request OpenMW/openmw!1142
2021-08-15 17:01:10 +00:00
jvoisin
0792bb212a
Use an emplace instead of an insert
2021-08-15 18:57:33 +02:00
glassmancody.info
ed72f3335b
silence compiler warning
2021-08-15 08:02:00 -07:00
fredzio
ec871e6bf7
Use shared_ptr instead of weak_ptr for actors handle inside the
...
simulation
The purpose of weak_ptr is to avoid performing the simulation on deleted
Actor by promoting it to a shared_ptr via a lock() call. This clutter
the code with a lot of branches, whereas the overwhelmingly common case is for the call to succeed.
Since the simulation is decoupled from the engine state, we can use a shared_ptr instead of a weak_ptr.
This allow us to ignore (ie not handle) the rarer case where the actor is delete from the scene. This means that the simulation
will run for one frame more than before for each actor, whereas the rest of the engine
will be ignorant of this.
2021-08-15 16:21:16 +02:00
AnyOldName3
7400050b38
Merge branch 'character_preview_alpha_fix' into 'master'
...
Fix transparent objects being invisible in character doll
See merge request OpenMW/openmw!1140
2021-08-15 00:01:23 +00:00
glassmancody.info
6cc71745ac
ensure character preview is using standard depth
2021-08-14 14:50:33 -07:00
AnyOldName3
a286404346
Merge branch '6220-fix' into 'master'
...
Double buffering the water's node position uniform
Closes #6220
See merge request OpenMW/openmw!1139
2021-08-14 17:41:58 +00:00
Mads Buvik Sandvei
d40c18234a
Double buffering the water's node position uniform
2021-08-14 17:41:58 +00:00
fredzio
713f612bdb
Partially revert !1046 : the player is added before the scene exists, so we need to check again the grounded state, as it correctly was.
2021-08-13 18:01:16 +02:00
elsid
4e0e2fb52f
Merge branch 'clang_warning' into 'master'
...
Fix two -Wreorder clang warnings
See merge request OpenMW/openmw!1136
2021-08-13 13:01:14 +00:00
jvoisin
b01ef2629c
Fix two Wreorder clang warnings
2021-08-13 13:59:57 +02:00
jvoisin
baf62f4922
Don't save artifacts when using coverity
2021-08-13 13:53:37 +02:00
psi29a
508682cda7
Merge branch 'serialize' into 'master'
...
Serialize NifOsg::MatrixTransform children properly
See merge request OpenMW/openmw!1127
2021-08-13 08:18:03 +00:00
Alexei Dobrohotov
c09e011af4
Merge branch 'remove-ilk' into 'master'
...
Remove incremental link files from the artefacts
See merge request OpenMW/openmw!1128
2021-08-12 22:37:38 +00:00
Alexei Dobrohotov
839cf36bdd
Merge branch 'hidden_markers' into 'master'
...
Use common implementation to filter hidden markers
See merge request OpenMW/openmw!1132
2021-08-12 22:29:20 +00:00
Alexei Dobrohotov
dbf12b764f
Merge branch 'navmesh_rm_has_tile' into 'master'
...
Remove redundant TileCachedRecastMeshManager::hasTile function
See merge request OpenMW/openmw!1133
2021-08-12 21:46:17 +00:00
elsid
05258ed644
Remove redundant TileCachedRecastMeshManager::hasTile function
...
It's used only for tests. getMesh is a valid replacement.
2021-08-12 22:40:06 +02:00
elsid
8ac8d56e8c
Mark TileCachedRecastMeshManager member functions as const where possible
2021-08-12 22:39:25 +02:00
elsid
3caf45807f
Use common implementation to filter hidden markers
2021-08-12 22:35:16 +02:00
AnyOldName3
8287c5ee4e
Remove incremental link files from the artefacts
...
They make the files people download much bigger.
2021-08-12 17:38:09 +00:00
Alexei Dobrohotov
b49f51cbfc
Serialize NifOsg::MatrixTransform children properly
2021-08-12 18:33:06 +03:00
psi29a
3c6f145753
Merge branch 'update_changelog' into 'master'
...
Add #4595 to changelog
See merge request OpenMW/openmw!1125
2021-08-12 12:52:54 +00:00
elsid
f9c3e1272b
Add #4595 to changelog
...
Resolved by https://gitlab.com/OpenMW/openmw/-/merge_requests/430
2021-08-12 12:44:39 +02:00
jvoisin
bcdd0f55da
Merge branch 'bc_refnum' into 'master'
...
Always print object refnum
See merge request OpenMW/openmw!1123
2021-08-12 10:18:55 +00:00
elsid
e84a177a91
Always print object refnum
...
Also print content file index even when it's negative. To be able to identify
the object unambiguously.
2021-08-12 02:02:25 +02:00
psi29a
640998aca0
Merge branch 'revert' into 'master'
...
#6212 Revert idiotic change
See merge request OpenMW/openmw!1122
2021-08-11 21:31:19 +00:00
fredzio
de9ee2f196
Revert "Calls directly MovementSolver::traceDown instead of"
...
This reverts commit c1e50f530b
2021-08-11 21:53:04 +02:00
psi29a
ee1ec53cd9
Merge branch 'fix_op_bzzt_whoopsie_2' into 'master'
...
Fixing another bzzt whoopsie
See merge request OpenMW/openmw!1118
2021-08-10 15:51:12 +00:00
psi29a
45b45b3560
Merge branch 'fix_op_bzzt_whoopsie' into 'master'
...
resolve issue of OP meshes that cross boundaries
See merge request OpenMW/openmw!1117
2021-08-10 15:50:33 +00:00
psi29a
eb3c50842d
Merge branch 'ZoomableMapsIncreasesLoadingTimes' into 'master'
...
Zoomable maps increases loading times
Closes #6204
See merge request OpenMW/openmw!1106
2021-08-10 07:28:26 +00:00
Bret Curtis
436c640da2
the old switch-a-roo because we shoudl only StopTraversal when the node size is larger than 1 and not the other way around
2021-08-09 22:56:04 +02:00
Bret Curtis
c99bddc8dc
Revert "Move reference to the right cell according to its geographical position"
...
This reverts commit d0677c3f07
2021-08-09 22:11:00 +02:00
Bret Curtis
7dfaef7644
resolve issue of meshes that cross boundaries; should only be calculating the maxBound, not the minBound of y; also fix it in groundcover as it was copied blindly over;
2021-08-09 22:05:12 +02:00
