Nelsson Huotari
f2fc02cdff
Support filtered tables (mapToSource for indexes)
2021-01-13 15:55:16 +02:00
Nelsson Huotari
16e03c151a
Implement basic move algorithm, connect it to drag&drop
2021-01-13 15:38:29 +02:00
Nelsson Huotari
70087e16fe
Disable dialogue info table sorting
2021-01-11 20:49:35 +02:00
psi29a
acfd2cfd90
Merge branch 'dialogclonefix' into 'master'
...
[OpenMW-CS] Fix cloning in info records
See merge request OpenMW/openmw!524
2021-01-11 14:13:53 +00:00
Nelsson Huotari
93b1b444f2
Optimize CreateCommand and CloneCommand configuration
2021-01-11 12:53:34 +02:00
psi29a
6863c5a68f
Merge branch 'raii' into 'master'
...
Make all physics object manage their own resources.
See merge request OpenMW/openmw!527
2021-01-10 20:50:55 +00:00
Nelsson Huotari
7196ad7455
Implement an override-value when cloning, use when cloning info records
2021-01-10 21:23:52 +02:00
Evil Eye
1ab4683dce
Tweak follow distance to be more like the original
2021-01-10 16:29:32 +01:00
fredzio
d015f17a6c
Make all physics object manage their own resources
...
Use smart pointer for heightfields and their members.
Move collision object addition inside of Object's ctor, as for Actors and HeightFields
2021-01-10 14:56:35 +01:00
elsid
8b7f3fe908
Merge branch 'nodeadlock' into 'master'
...
Avoid a rare but possible deadlock around mCollisionWorldMutex.
See merge request OpenMW/openmw!525
2021-01-10 13:41:31 +00:00
Bret Curtis
b3f3b29bbe
Merge pull request #3039 from akortunov/screenshotmanager
...
Move screenshots handling to the separate class
2021-01-10 12:59:45 +01:00
Bret Curtis
a735bbe9a5
Merge pull request #3040 from akortunov/pvs
...
Fix some issues, found by PVS Studio
2021-01-10 12:58:17 +01:00
Evil Eye
e737bd00fa
Merge branch 'unused_param' into 'master'
...
Remove never used parameter from CharacterController::update()
See merge request OpenMW/openmw!523
2021-01-10 10:58:28 +00:00
Alexei Dobrohotov
c3a952c133
Merge branch 'dorsbien' into 'master'
...
Don't update magic effects when unequipping items to equip something else
Closes #5687
See merge request OpenMW/openmw!509
2021-01-10 08:04:07 +00:00
Evil Eye
a257567b80
Don't update magic effects when unequipping items to equip something else
2021-01-10 08:04:06 +00:00
Nelsson Huotari
3045d20a97
Make sure that vector isn't empty, just in case
2021-01-10 01:25:40 +02:00
Nelsson Huotari
5f1d3e0e2f
Use the Topic ID of the cloned target from topicinfos
2021-01-10 01:06:23 +02:00
psi29a
f7d7186c39
Merge branch 'instanceselectiontools' into 'master'
...
[OpenMW-CS] Cube and sphere instance selection
See merge request OpenMW/openmw!485
2021-01-09 21:35:07 +00:00
Nelsson Huotari
313e895912
[OpenMW-CS] Cube and sphere instance selection
2021-01-09 21:35:07 +00:00
fredzio
60f66f5e29
Remove never used parameter from CharacterController:update()
2021-01-09 21:28:27 +01:00
fredzio
9bc687e209
Avoid a rare but possible deadlock around mCollisionWorldMutex.
...
What happened is that the last handle to an Actor shared_ptr was a
promoted weak_ptr. When the shared_ptr goes out of scope, the Actor dtor
is invoked. That involves removing the Actor collision object after
exclusively locking mCollisionWorldMutex. In this case, the lock was
already held in the outter scope of the promoted weak_ptr.
Reduce the scope of the mCollisionWorldMutex to never encompass the
lifetime of a promoted weak_ptr.
2021-01-09 21:10:29 +01:00
Andrei Kortunov
ad101de733
Merge declaration and initialization
2021-01-09 22:58:54 +04:00
Andrei Kortunov
1930f8f37d
Fix copy-paste error
2021-01-09 20:03:12 +04:00
Andrei Kortunov
50e4600b16
Reduce code duplication
2021-01-09 20:00:51 +04:00
Andrei Kortunov
874348fb46
Remove redundant code
2021-01-09 19:19:38 +04:00
Mads Buvik Sandvei
a2d8a0b61a
engine.cpp typos
2021-01-09 14:44:15 +00:00
Andrei Kortunov
80ee1b55ea
Protect assignment operator from this == &src case
2021-01-09 18:28:26 +04:00
Andrei Kortunov
33da0af1d1
Use explicit calls for virtual methods in constructors
2021-01-09 18:25:48 +04:00
Andrei Kortunov
a80ee7a76a
Avoid possible memory leak in the mInterMessageBoxe field
2021-01-09 14:43:00 +04:00
Andrei Kortunov
8e5f26c109
Code cleanup
2021-01-09 14:41:10 +04:00
Andrei Kortunov
c9b885ffd4
Avoid possible null dereferencing
2021-01-09 14:24:04 +04:00
Andrei Kortunov
33648313a6
Initialize variables
2021-01-09 14:21:57 +04:00
Andrei Kortunov
c1512b8b6c
Convert loop to condition
2021-01-09 14:18:38 +04:00
Andrei Kortunov
56666c60d4
Remove dead code
2021-01-09 14:17:59 +04:00
Andrei Kortunov
8283ec6cad
Do not use & for boolean arguments
2021-01-09 14:03:48 +04:00
Andrei Kortunov
7fc4c9f3f6
Avoid dead code
2021-01-09 13:52:01 +04:00
Andrei Kortunov
801e2d6ad0
Avoid to use uninitialized variables
2021-01-09 13:36:40 +04:00
Andrei Kortunov
c5a36ad440
Do not cast enums to booleans
2021-01-09 13:19:41 +04:00
Andrei Kortunov
799bd3379c
Move screenshots handling to the separate class
2021-01-09 10:44:33 +04:00
AnyOldName3
2d61db555b
Merge branch 'osg_log' into 'master'
...
Split long osg log messages into lines.
See merge request OpenMW/openmw!519
2021-01-09 01:05:53 +00:00
Petr Mikheev
7d551b0cfd
Split long osg log messages into lines.
2021-01-08 23:21:39 +01:00
psi29a
cbce3ebb79
Merge branch 'stanky_fetcher' into 'master'
...
Consider a path completed if it was non-empty
Closes #5773
See merge request OpenMW/openmw!508
2021-01-08 21:47:38 +00:00
Evil Eye
2a583e2337
consider empty paths as not constructed
2021-01-08 17:24:13 +01:00
psi29a
dc82cb61f4
Merge branch 'nativeshapesdebug' into 'master'
...
Unbreak physics debugger with projectiles' spherical shapes.
See merge request OpenMW/openmw!489
2021-01-04 09:07:28 +00:00
Alexei Dobrohotov
c17e498465
Merge branch 'launchercleanup' into 'master'
...
Remove deadcode from the launcher.
See merge request OpenMW/openmw!511
2021-01-03 08:48:52 +00:00
fredzio
5215ffd964
The debug drawer rely on Bullet to determines the vertices of collision
...
shapes. It doesn't work in the case of spheres (used by projectiles):
resulting shape is malformed. It can also leads to this error which
makes the debug drawer non-working till game restart:
CullVisitor::apply(Geode&) detected NaN,
depth=nan, center=(nan nan nan),
matrix={
-0.265814 -0.0639702 0.9619 0
0.964024 -0.0176387 0.265228 0
-4.29769e-09 0.997796 0.0663574 0
18178.6 -3550.91 42154.4 1
}
Avoid this issue by using osg::Sphere
While here, remove an unused function. We don't use Bullet's solver so
we never have any contact points (in Bullet parlance).
2021-01-01 17:47:12 +01:00
fredzio
dbdd397716
Remove deadcode.
2021-01-01 16:54:45 +01:00
Evil Eye
57c92673bc
Consider a path completed if it was non-empty
2020-12-30 16:09:12 +01:00
Evil Eye
e46472442a
Switch torches to shields for hostile NPCs
2020-12-29 01:40:30 +00:00
Andrei Kortunov
e80d34268c
Fix defines names
2020-12-28 21:11:58 +04:00
