mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-30 21:32:42 +00:00
Code Issues Projects Releases Wiki Activity
26,134 Commits 19 Branches 66 Tags
Commit Graph

17682 Commits

Author SHA1 Message Date
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
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
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
AnyOldName3
4727ae4b3b Make it possible to opt out of composing variables 2021-08-01 02:47:10 +01:00
psi29a
547bc4a252 Merge branch 'notonlyactors' into 'master' 
Refactor the physics simulation to make it not actor centric.

See merge request OpenMW/openmw!1075
 2021-07-31 23:39:22 +00:00
psi29a
a3a079acc1 Merge branch 'projstats' into 'master' 
Add projectiles number to the resources stats

See merge request OpenMW/openmw!1074
 2021-07-31 23:12:14 +00:00
psi29a
4c5e6beb75 Merge branch 'canyouseeme' into 'master' 
Solve actor awareness check without async physics

See merge request OpenMW/openmw!1071
 2021-07-31 22:18:35 +00:00
fredzio
35928cf4d3 Refactor a bit the physics simulation to make it not actor centric: 
- inline PhysicsSystem::applyQueuedMovements() into PhysicsSystem::stepSimulation()
- rename PhysicsTaskScheduler::moveActors() to PhysicsTaskScheduler::applyQueuedMovements()
- move the actor movement code from World::doPhysics() to
  PhysicsSystem::moveActors() (analogically to the projectile manager)
 2021-07-31 23:39:04 +02:00
psi29a
141095b850 Merge branch 'OpenCS-loading-opt' into 'master' 
OpenCS loading time improvements

See merge request OpenMW/openmw!1044
 2021-07-31 21:27:29 +00:00
fredzio
c76387162b Add projectiles number to the resources stats 2021-07-31 23:08:50 +02:00
psi29a
ca011927f3 Merge branch 'ObjectPagingDisappearingTexture' into 'master' 
Move reference to the right cell according to its geographical position

See merge request OpenMW/openmw!1065
 2021-07-31 10:58:20 +00:00
Evil Eye
5cdf1e7e6b Merge branch 'vec3_vs_xyz' into 'master' 
Use Vec3f instead of x,y,z in World API

See merge request OpenMW/openmw!730
 2021-07-31 10:36:11 +00:00
fredzio
a7b190ad29 Change rotateObject() to take a osg::Vec3f argument instead of 3 floats 
for readability.
 2021-07-30 23:24:53 +02:00
fredzio
88a5ca440b Change moveObject() to take a osg::Vec3f argument instead of 3 floats 
for readability.
 2021-07-30 23:24:49 +02:00
fredzio
4e7c128d25 The LOS cache is now unconditionally used without async physics as well 
with a TTL of 0 frame. It helps performance when several subsystems
request the same LOS in the same frame (combat, headtracking, etc).
Except it doesn't work if the cache is never trimmed.
 2021-07-30 22:23:42 +02:00
Cédric Mocquillon
d0677c3f07 Move reference to the right cell according to its geographical position 2021-07-30 18:28:29 +02:00
psi29a
8c36eb56cf Merge branch 'stereo_friendly_water' into 'master' 
Stereo friendly water and statesetupdater

See merge request OpenMW/openmw!563
 2021-07-30 11:00:49 +00:00
psi29a
c5d49b44ba Merge branch 'lua_settings' into 'master' 
Add Lua package 'openmw.settings'

See merge request OpenMW/openmw!1017
 2021-07-30 10:47:15 +00:00
Evil Eye
779795734f Remove calm/rally/demoralize and turn undead from the wrong targets 2021-07-29 18:23:45 +02:00
Evil Eye
a366a85c4e Merge branch 'noalloc_dance_for_npcanimation' into 'master' 
Don't do an unnecessarily complex memory allocation dance in npcanimation.cpp

See merge request OpenMW/openmw!1042
 2021-07-28 17:25:28 +00:00
Evil Eye
88d207b0cd Merge branch 'land' into 'master' 
Correct creature landing sound type (bug #6118)

Closes #6118

See merge request OpenMW/openmw!1054
 2021-07-28 16:18:44 +00:00
psi29a
ea05b958b8 Merge branch 'FixIssueWithTRData' into 'master' 
Fix issue with Tamriel Data landscapes

See merge request OpenMW/openmw!1064
 2021-07-28 10:16:55 +00:00
psi29a
292e6f1a9e Merge branch 'seducer_ice_queen' into 'master' 
Prevent a missing weapon animation from partially freezing actors

See merge request OpenMW/openmw!1060
 2021-07-28 09:06:13 +00:00
Cédric Mocquillon
c98b0f713d If same area is defined in multiple plugin the last must wins 2021-07-28 10:29:16 +02:00
elsid
6adf7b10ae
Fix removing heightfield from navigator 
It's added not as object so it shouldn't be removed as it.
 2021-07-27 20:11:22 +02:00
Petr Mikheev
2938aaf05c Rename API_VERSION -> API_REVISION in Lua API. 2021-07-27 20:06:04 +02:00
Petr Mikheev
3e4c0b775d Add Lua package 'openmw.settings' 2021-07-27 20:06:04 +02:00
Petr Mikheev
68b8a148d7 Initialize Lua packages in LuaManager::init rather than in constructor. 2021-07-27 19:52:17 +02:00
Evil Eye
977f717f8b Prevent a missing weapon animation from partially freezing actors 2021-07-27 16:33:07 +02:00
Alexei Dobrohotov
536dc6a0c6 Correct creature landing sound type (bug #6118) 2021-07-27 07:39:21 +03:00
psi29a
5a434aebe0 Merge branch 'SortedStaticLands' into 'master' 
Replace land static container from vector to flat_set

See merge request OpenMW/openmw!853
 2021-07-26 18:29:07 +00:00
Cédric Mocquillon
7772f5111b std::set version 2021-07-26 18:30:06 +02:00
madsbuvi
41c08b1c3b Stereo friendly StateSetUpdater 
(cherry picked from commit 496b3aef88b8fd867dcdd23a6ca43144573b1b2f)

Stereo friendly water

(cherry picked from commit 0e22c55e48a7f965367d3d430c1bef5357b22748)

Option to disable per view mapping.

Include memory header

De-hardcode settings and buffers.

formatting error

Update water.cpp (whitespace)

Update water.cpp (more whitespace)

include render order

c array -> c++ array
 2021-07-26 14:01:02 +02:00
psi29a
44ceb9572a Merge branch 'recast_mesh_heightfield' into 'master' 
Reduce navmesh cache size by special handling for heightfields

See merge request OpenMW/openmw!1032
 2021-07-26 11:49:30 +00:00
glassmancody.info
166e23a6d9 fix CI artifacts, missing header 2021-07-25 20:49:17 -07:00
elsid
9a5ec5fd03
Store heightfields as array of heights instead of triangles 
To reduce size of RecastMesh and therefore cache size.
 2021-07-26 00:22:21 +02:00
elsid
28b2f769c2
Update navmeshtilescache benchmark generators 2021-07-26 00:22:21 +02:00
elsid
fdee9db20c
Consider RecastMeshManager not empty when there is water 2021-07-26 00:22:21 +02:00
elsid
5d6c93566d
Rename DetourNavigator::Water -> Cell 2021-07-26 00:22:21 +02:00
elsid
753767d6d9
Store only water shift 
Rotation is not used.
 2021-07-26 00:22:20 +02:00
elsid
a1549321d7
Move Water struct out of RecastMesh class 2021-07-26 00:22:20 +02:00
elsid
d60edb36aa
Make RecastMesh independent from recast scale factor 
To avoid scaling until it's required by delaying coordinates conversion until
navmesh generation.
 2021-07-26 00:22:20 +02:00