Commit Graph

25095 Commits (75b4871bab239b9f3c92ff9441ae93b488e49574)
 

Author SHA1 Message Date
Simon Meulenbeek 75b4871bab Add Audio settings to openmw-launcher 4 years ago
psi29a 22cf9bd823 Merge branch 'new-macos-ci-image' into 'master'
Use the new macOS image for the CI runner open beta

See merge request OpenMW/openmw!690
4 years ago
psi29a b68305e3e2 Merge branch 'bullet-msvc-runtime' into 'master'
Fix FetchContent Bullet with MSVC

See merge request OpenMW/openmw!717
4 years ago
psi29a 71fda935e8 Merge branch 'shuffle_those_mods' into 'master'
Fix targeted scripts losing their targets when rearranging your load order

See merge request OpenMW/openmw!715
4 years ago
AnyOldName3 3ad2335d11 Fix FetchContent Bullet with MSVC 4 years ago
Evil Eye 44f2cb0923 Fix targeted scripts losing their targets when rearranging your load order 4 years ago
Bret Curtis 30cba854da
Merge pull request #3060 from akortunov/master
Restore old aiming for melee combat
4 years ago
Andrei Kortunov 59720aea9a Restore old aiming for melee combat 4 years ago
psi29a 9aa5aef2c6 Merge branch 'my_other_mr_is_larger' into 'master'
Make AddItem's quantity overflow on negative numbers

Closes #5934

See merge request OpenMW/openmw!713
4 years ago
Andrei Kortunov d3e185623d Merge branch 'ref_data_move' into 'master'
Add move constructor and move assignment operator to RefData (#5893)

See merge request OpenMW/openmw!705
4 years ago
elsid bd33fa76b6
Use CRTP to define CustomData clone function 4 years ago
elsid e380470558
Add move ctor and assignment operator to RefData 4 years ago
elsid 045bb7cbd7
Store CustomData and ContainerStore as unique_ptr 4 years ago
Evil Eye ecde3932e2 Make AddItem's quantity overflow on negative numbers 4 years ago
psi29a 9aed0bbf16 Merge branch 'spdx-license' into 'master'
Return to CC0-licensed appdata metadata

See merge request OpenMW/openmw!707
4 years ago
Alexander Olofsson db32b8de91
Return to CC0-licensed appdata metadata 4 years ago
Andrei Kortunov 86719c26b3 Merge branch 'altitude_fix' into 'master'
Fix z offset for Actors from SetPos and Move

See merge request OpenMW/openmw!702
4 years ago
Roman Siromakha c9acac557a
Merge pull request #3059 from akortunov/master
Revert MR672
4 years ago
Hristos N. Triantafillou b808968070
Use the new macOS image for the CI runner open beta
Also add a second build for wider version coverage.
4 years ago
Alexei Dobrohotov 323c4bda61 Merge branch 'spdx-license' into 'master'
Use the SPDX license identifier in appdata XML

See merge request OpenMW/openmw!701
4 years ago
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.
4 years ago
Alexander Olofsson 44bd81e8f0
Use the SPDX license identifier in appdata XML 4 years ago
Andrei Kortunov 1ab5a9f530 Revert "Merge branch 'refractiontest' into 'master'"
This reverts commit b31459cc00, reversing
changes made to 369adf1583.
4 years ago
Andrei Kortunov a576824bcf Merge branch 'update-maintainer' into 'master'
Update Flatpak maintainer

See merge request OpenMW/openmw!700
4 years ago
Alexander Olofsson ad0fe2ee29
Update Flatpak maintainer 4 years ago
Andrei Kortunov ee7198a6af Merge branch 'DarthGandalf-master-patch-33177' into 'master'
Update Gentoo maintainers (me)

See merge request OpenMW/openmw!699
4 years ago
Alexey Sokolov 44829046a0 Update Gentoo maintainers (me) 4 years ago
psi29a a6123fee0e Merge branch '5904-hack' into 'master'
Fix #5904

Closes #5904

See merge request OpenMW/openmw!698
4 years ago
AnyOldName3 c6033b4de6 Fix #5904 4 years ago
AnyOldName3 e3dd1bf69e Merge branch 'setpos_again' into 'master'
Remove wrong line that slipped in yesterday.

See merge request OpenMW/openmw!697
4 years ago
fredzio 0fac172413 Remove wrong line that slipped in yesterday. 4 years ago
Bret Curtis d835204fdf
Merge pull request #3058 from akortunov/master
Rework knockdown and knockout animations fallbacks
4 years ago
Andrei Kortunov 50352daf90 Rework knockdown and knockout animations fallbacks 4 years ago
Evil Eye 582f1503c1 Merge branch 'setpos' into 'master'
Unbreak SetPos and the mods using it (#5919)

See merge request OpenMW/openmw!696
4 years ago
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
4 years ago
psi29a 08afc4729f Merge branch 'physics_clean' into 'master'
Close 2 data races with async physics

See merge request OpenMW/openmw!695
4 years ago
fredzio b58244ac26 Guard the Bullet drawing method with a read lock on the
btCollisionWorld. It closes a race on the collision shapes coordinates.
4 years ago
fredzio dbd6e3bfee Replace pointless usage of shared_ptr by unique_ptr / non-owning raw
pointer for btCollisionWorld.
4 years ago
fredzio ccd3cbc69a Use saved actor position instead of reading again RefData in unstuck. It
is a race condition to do so.
4 years ago
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
4 years ago
Andrei Kortunov b61337643e Merge branch 'issue-5680' into 'master'
change aim calculation

See merge request OpenMW/openmw!685
4 years ago
Andrei Kortunov bb9c4d5377 Merge branch 'fix_the_swimmer' into 'master'
Fix The Swimmer (#5914)

See merge request OpenMW/openmw!686
4 years ago
Max dc09616e59 change bugfix name to be same as ticket name 4 years ago
Max 2cd96e56d5 create constant and use constant in other parts of the code base 4 years ago
Max e56efdd562 change aim calculation 4 years ago
AnyOldName3 52eccf1a2d Merge branch 'fix-build' into 'master'
attempt to fix build issue

See merge request OpenMW/openmw!689
4 years ago
Max 72a2e3722e update syntax 4 years ago
Max 91bca0cb1f attempt to fix build issue 4 years ago
Andrei Kortunov 94d396a423
Merge pull request #3057 from akortunov/master
Fix build with OSG 3.4
4 years ago
Andrei Kortunov cf52bee188 Fix build with OSG 3.4 4 years ago