Commit Graph

25211 Commits (33b8233887e588cb18ee9b6767994cfaee72b585)
 

Author SHA1 Message Date
Evil Eye e5ace3727a Merge branch 'bugfix-inverted-persuasion-result' into 'master'
Attempt to fix inverted persuasion behaviour on intimidation

Closes #5942

See merge request OpenMW/openmw!721
4 years ago
Jonas Tobias Hopusch 799cf16f31
Attempt to fix #5942
Closes OpenMW/openmw#5942
This is an attempt to apply the fix suggested by @Capostrophic
4 years ago
jvoisin 3e20000778 Add a coverity scan 4 years ago
psi29a fe2a97ee39 Merge branch 'wizard-link' into 'master'
Implement #3983 - Add page to the wizard with links to buy morrowind

Closes #3983

See merge request OpenMW/openmw!693
4 years ago
tess 6f7e8d9f59 Implement #3983 - Add page to the wizard with links to buy morrowind 4 years ago
psi29a 4f86eddc96 Merge branch 'CreateBsaAddFileToBsa' into 'master'
Create BSA, add file to existing BSA

See merge request OpenMW/openmw!718
4 years ago
CedricMocquillon 9a6f0691b6 Update changelog 4 years ago
elsid 8e1c92d9af
Use std::variant for ESM::Variant implementation 4 years ago
elsid 7f577f5f08
Do not compare hash in tests
Different std libraries have different implementation that produce different
results for the same values.
4 years ago
psi29a a16387df61 Merge branch 'sky-dehardcode' into 'master'
De-hardcode references to mesh files used by the sky.

See merge request OpenMW/openmw!704
4 years ago
Matjaž Lamut 2cb4b62b83 De-hardcode references to mesh files used by the sky. 4 years ago
CedricMocquillon d617d66a87 Add file to BSA 4 years ago
psi29a 50c57fc9ce Merge branch 'gtest_cmake' into 'master'
Fix tests build with CMake 3.20

See merge request OpenMW/openmw!706
4 years ago
psi29a 8cb3681c12 Merge branch 'esm_variant_tests' into 'master'
Add tests for ESM::Variant

See merge request OpenMW/openmw!712
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
elsid dae3f022ba
Add tests for ESM::Variant 4 years ago
elsid 03fc3ec803
Do not allow write variant of string as local variable
To be consitent with read where it's not allowed.
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
elsid 6c18449304
Remove GTest and ExternalProject from FindGMock.cmake 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