1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-15 16:49:55 +00:00
Commit graph

25081 commits

Author SHA1 Message Date
Evil Eye
ecde3932e2 Make AddItem's quantity overflow on negative numbers 2021-04-05 09:43:37 +02:00
psi29a
9aed0bbf16 Merge branch 'spdx-license' into 'master'
Return to CC0-licensed appdata metadata

See merge request OpenMW/openmw!707
2021-04-04 12:26:34 +00:00
Alexander Olofsson
db32b8de91
Return to CC0-licensed appdata metadata 2021-04-03 13:41:41 +02:00
Andrei Kortunov
86719c26b3 Merge branch 'altitude_fix' into 'master'
Fix z offset for Actors from SetPos and Move

See merge request OpenMW/openmw!702
2021-04-01 06:30:02 +00:00
Roman Siromakha
c9acac557a
Merge pull request #3059 from akortunov/master
Revert MR672
2021-03-31 23:35:47 +02:00
Alexei Dobrohotov
323c4bda61 Merge branch 'spdx-license' into 'master'
Use the SPDX license identifier in appdata XML

See merge request OpenMW/openmw!701
2021-03-31 18:08:23 +00:00
fredzio
9cae7882dd Fix a bug that was triggered with multi mark mod.
When a script calls SetPos for x,y,z in sequence on an actor, we need to make sure
that the actor will not spawn under ground at x,y coordinates.
Now that change of coordinates are cumulated and applied all at once, we
need to account for the whole offset.
To this end move the terrain height check inside of Actor class.
2021-03-31 19:34:06 +02:00
Alexander Olofsson
44bd81e8f0
Use the SPDX license identifier in appdata XML 2021-03-31 18:15:22 +02:00
Andrei Kortunov
1ab5a9f530 Revert "Merge branch 'refractiontest' into 'master'"
This reverts commit b31459cc00, reversing
changes made to 369adf1583.
2021-03-30 15:32:01 +04:00
Andrei Kortunov
a576824bcf Merge branch 'update-maintainer' into 'master'
Update Flatpak maintainer

See merge request OpenMW/openmw!700
2021-03-30 09:56:07 +00:00
Alexander Olofsson
ad0fe2ee29
Update Flatpak maintainer 2021-03-30 11:31:36 +02:00
Andrei Kortunov
ee7198a6af Merge branch 'DarthGandalf-master-patch-33177' into 'master'
Update Gentoo maintainers (me)

See merge request OpenMW/openmw!699
2021-03-30 08:02:32 +00:00
Alexey Sokolov
44829046a0 Update Gentoo maintainers (me) 2021-03-30 08:00:00 +00:00
psi29a
a6123fee0e Merge branch '5904-hack' into 'master'
Fix #5904

Closes #5904

See merge request OpenMW/openmw!698
2021-03-30 06:10:25 +00:00
AnyOldName3
c6033b4de6 Fix #5904 2021-03-29 21:00:28 +00:00
AnyOldName3
e3dd1bf69e Merge branch 'setpos_again' into 'master'
Remove wrong line that slipped in yesterday.

See merge request OpenMW/openmw!697
2021-03-29 20:33:38 +00:00
fredzio
0fac172413 Remove wrong line that slipped in yesterday. 2021-03-29 21:46:08 +02:00
Bret Curtis
d835204fdf
Merge pull request #3058 from akortunov/master
Rework knockdown and knockout animations fallbacks
2021-03-29 15:37:33 +02:00
Andrei Kortunov
50352daf90 Rework knockdown and knockout animations fallbacks 2021-03-29 14:45:07 +04:00
Evil Eye
582f1503c1 Merge branch 'setpos' into 'master'
Unbreak SetPos and the mods using it (#5919)

See merge request OpenMW/openmw!696
2021-03-28 20:14:17 +00:00
fredzio
7a67492d81 Unbreak SetPos and the mods using it.
To make SetPos works with async physics, it was modified to register a
position offset that would be applied to the real position during the
simulation.

A common pattern to teleport NPC in scripts is a sequence of SetPos/Disable/Enable in the same frame.
Since Disable/Enable creates a new physics actor using last known
RefData::Position, the registered offset never get a chance to be applied.

Modify disable() to call moveObject with the offset applied, so that the newly created physics actor will have up-to-date position
2021-03-28 21:19:14 +02:00
psi29a
08afc4729f Merge branch 'physics_clean' into 'master'
Close 2 data races with async physics

See merge request OpenMW/openmw!695
2021-03-27 16:56:54 +00:00
fredzio
b58244ac26 Guard the Bullet drawing method with a read lock on the
btCollisionWorld. It closes a race on the collision shapes coordinates.
2021-03-26 23:49:31 +01:00
fredzio
dbd6e3bfee Replace pointless usage of shared_ptr by unique_ptr / non-owning raw
pointer for btCollisionWorld.
2021-03-26 23:49:31 +01:00
fredzio
ccd3cbc69a Use saved actor position instead of reading again RefData in unstuck. It
is a race condition to do so.
2021-03-26 23:49:31 +01:00
Andrei Kortunov
5fce5b12f4 Merge branch 'drop_the_bird' into 'master'
Disallow inserting containers, creatures, and npcs from the save game not present in content files

Closes #5884

See merge request OpenMW/openmw!683
2021-03-26 15:48:17 +00:00
Andrei Kortunov
b61337643e Merge branch 'issue-5680' into 'master'
change aim calculation

See merge request OpenMW/openmw!685
2021-03-26 11:43:20 +00:00
Andrei Kortunov
bb9c4d5377 Merge branch 'fix_the_swimmer' into 'master'
Fix The Swimmer (#5914)

See merge request OpenMW/openmw!686
2021-03-26 11:19:57 +00:00
Max
dc09616e59 change bugfix name to be same as ticket name 2021-03-24 14:54:47 -07:00
Max
2cd96e56d5 create constant and use constant in other parts of the code base 2021-03-24 14:54:46 -07:00
Max
e56efdd562 change aim calculation 2021-03-24 14:54:46 -07:00
AnyOldName3
52eccf1a2d Merge branch 'fix-build' into 'master'
attempt to fix build issue

See merge request OpenMW/openmw!689
2021-03-24 21:50:15 +00:00
Max
72a2e3722e update syntax 2021-03-24 14:01:40 -07:00
Max
91bca0cb1f attempt to fix build issue 2021-03-24 13:28:34 -07:00
Andrei Kortunov
94d396a423
Merge pull request #3057 from akortunov/master
Fix build with OSG 3.4
2021-03-24 16:34:27 +04:00
Andrei Kortunov
cf52bee188 Fix build with OSG 3.4 2021-03-24 16:32:15 +04:00
elsid
e8c2cd15f0
Add #5914 to the changelog 2021-03-24 00:08:52 +01:00
elsid
453e94ea9f
Use half extents for destination distance tolerance in AiEscort
For actors moving in water destination may be located at such z coordinate
that they can't reach.
2021-03-24 00:07:28 +01:00
elsid
f32e1790bc
Add half extents to AiEscord max distance
For actors with big bounding box given constants may not work properly like
it's not possible to get close enough to actor from a given angle to make it
move.
2021-03-23 23:49:57 +01:00
elsid
39c0ce9ddf
Build limited path for far destinations
When distance between start and end point is greater than max radius of area
possibly covered by navmesh there is no way to find path via navmesh. Also if
distance is greater than cell size navmesh might not exists withing mentioned
area because cell is not loaded therefore navmesh is not generated. So minumum
of these values is used to limit max path distance. Assuming that path
actually exists it's possible to build path to the edge of a circle. When
actor reaches initial edge path is built further. However it will not be
optimal.
2021-03-23 23:23:12 +01:00
elsid
313355cb3d
Fix default max tile size in navigator doc 2021-03-23 21:40:32 +01:00
Evil Eye
cf5a93d712 Also run NPC validation for modified base records 2021-03-23 21:07:57 +01:00
Evil Eye
e79036f4e0 Don't erase the player 2021-03-23 20:43:52 +01:00
psi29a
a86b6ff6e2 Merge branch 'nifnifnifnifnif' into 'master'
Add in incomplete BSShader[PP/No]LightingProperty work before it rots away

See merge request OpenMW/openmw!681
2021-03-22 21:54:50 +00:00
psi29a
1af50b7e23 Merge branch 'sound_cleanup' into 'master'
Sound cleanup

See merge request OpenMW/openmw!567
2021-03-22 21:42:01 +00:00
psi29a
415591b7ed Merge branch 'ai_reaction_deviation' into 'master'
Distribute AI reactions and engage combat calls over time

See merge request OpenMW/openmw!674
2021-03-22 21:37:09 +00:00
Evil Eye
5e1960a76a Disallow inserting containers, creatures, and npcs from the save game not present in content files 2021-03-22 22:29:10 +01:00
psi29a
f8d32c0576 Merge branch 'upd-mygui' into 'master'
Update MyGUI

Closes #5897

See merge request OpenMW/openmw!650
2021-03-22 21:28:13 +00:00
Alexei Dobrohotov
75a967d743 Merge branch 'bound_branch' into 'master'
Bound branch

Closes #5912

See merge request OpenMW/openmw!682
2021-03-22 20:46:12 +00:00
Evil Eye
8e9bd5c0bd Don't throw an exception when equipping a bound item fails 2021-03-22 20:44:13 +01:00