1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-25 19:23:50 +00:00
Commit graph

25546 commits

Author SHA1 Message Date
Jacob Turnbull
bc8db8b8f5 Fix for enchanted items being removed on item equip cycling when they are re-equipped 2021-04-06 20:12:51 -05:00
psi29a
9aa5aef2c6 Merge branch 'my_other_mr_is_larger' into 'master'
Make AddItem's quantity overflow on negative numbers

Closes 

See merge request 
2021-04-05 11:45:31 +00:00
Andrei Kortunov
d3e185623d Merge branch 'ref_data_move' into 'master'
Add move constructor and move assignment operator to RefData ()

See merge request 
2021-04-05 10:51:28 +00:00
elsid
bd33fa76b6
Use CRTP to define CustomData clone function 2021-04-05 11:53:07 +02:00
elsid
e380470558
Add move ctor and assignment operator to RefData 2021-04-05 11:53:07 +02:00
elsid
045bb7cbd7
Store CustomData and ContainerStore as unique_ptr 2021-04-05 11:52:52 +02:00
Evil Eye
ecde3932e2 Make AddItem's quantity overflow on negative numbers 2021-04-05 09:43:37 +02:00
elsid
dae3f022ba
Add tests for ESM::Variant 2021-04-04 23:09:50 +02:00
elsid
03fc3ec803
Do not allow write variant of string as local variable
To be consitent with read where it's not allowed.
2021-04-04 23:09:27 +02:00
AnyOldName3
168f26fc80 Fix crash on startup 2021-04-04 15:29:08 +00:00
psi29a
9aed0bbf16 Merge branch 'spdx-license' into 'master'
Return to CC0-licensed appdata metadata

See merge request 
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
elsid
6c18449304
Remove GTest and ExternalProject from FindGMock.cmake 2021-04-03 02:15:00 +02:00
Andrei Kortunov
86719c26b3 Merge branch 'altitude_fix' into 'master'
Fix z offset for Actors from SetPos and Move

See merge request 
2021-04-01 06:30:02 +00:00
Roman Siromakha
c9acac557a
Merge pull request from akortunov/master
Revert MR672
2021-03-31 23:35:47 +02:00
Hristos N. Triantafillou
b808968070
Use the new macOS image for the CI runner open beta
Also add a second build for wider version coverage.
2021-03-31 14:05:05 -05:00
Alexei Dobrohotov
323c4bda61 Merge branch 'spdx-license' into 'master'
Use the SPDX license identifier in appdata XML

See merge request 
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 
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 
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 

Closes 

See merge request 
2021-03-30 06:10:25 +00:00
AnyOldName3
c6033b4de6 Fix 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 
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 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 ()

See merge request 
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 
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 

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

See merge request 
2021-03-26 11:43:20 +00:00
Andrei Kortunov
bb9c4d5377 Merge branch 'fix_the_swimmer' into 'master'
Fix The Swimmer ()

See merge request 
2021-03-26 11:19:57 +00:00
elsid
0c6d72b2d1
Consider first set element as first acquired 2021-03-25 19:28:41 +01:00
elsid
f2ebad5115
Return cached element when set existing 2021-03-25 19:28:41 +01:00
elsid
05d6f6ac25
Use single map for navmesh cache 2021-03-25 19:28:41 +01:00
elsid
b9a40bc5fc
Add NavMeshTilesCache benchmarks 2021-03-25 19:28:41 +01: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 
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 from akortunov/master
Fix build with OSG 3.4
2021-03-24 16:34:27 +04:00