25111 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Andrei Kortunov	93954a961c	Unlock mutex on return to avoid hang	2021-04-10 09:30:58 +04:00
psi29a	484c46cb58	Merge branch 'hrtf-setting' into 'master' ... Add Audio settings to openmw-launcher See merge request OpenMW/openmw!692	2021-04-09 19:28:08 +00:00
Simon Meulenbeek	75b4871bab	Add Audio settings to openmw-launcher	2021-04-09 19:28:08 +00:00
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	2021-04-09 18:15:35 +00:00
Jonas Tobias Hopusch	799cf16f31	Attempt to fix #5942 ... Closes OpenMW/openmw#5942 This is an attempt to apply the fix suggested by @Capostrophic	2021-04-09 18:16:05 +02:00
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	2021-04-08 20:57:50 +00:00
tess	6f7e8d9f59	Implement #3983 - Add page to the wizard with links to buy morrowind	2021-04-08 20:57:50 +00:00
psi29a	4f86eddc96	Merge branch 'CreateBsaAddFileToBsa' into 'master' ... Create BSA, add file to existing BSA See merge request OpenMW/openmw!718	2021-04-08 20:00:15 +00:00
CedricMocquillon	9a6f0691b6	Update changelog	2021-04-08 20:13:50 +02:00
psi29a	a16387df61	Merge branch 'sky-dehardcode' into 'master' ... De-hardcode references to mesh files used by the sky. See merge request OpenMW/openmw!704	2021-04-08 16:32:39 +00:00
Matjaž Lamut	2cb4b62b83	De-hardcode references to mesh files used by the sky.	2021-04-08 16:32:38 +00:00
CedricMocquillon	d617d66a87	Add file to BSA	2021-04-08 18:08:28 +02:00
psi29a	50c57fc9ce	Merge branch 'gtest_cmake' into 'master' ... Fix tests build with CMake 3.20 See merge request OpenMW/openmw!706	2021-04-08 15:05:09 +00:00
psi29a	8cb3681c12	Merge branch 'esm_variant_tests' into 'master' ... Add tests for ESM::Variant See merge request OpenMW/openmw!712	2021-04-08 13:32:07 +00:00
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	2021-04-08 10:09:59 +00:00
psi29a	b68305e3e2	Merge branch 'bullet-msvc-runtime' into 'master' ... Fix FetchContent Bullet with MSVC See merge request OpenMW/openmw!717	2021-04-08 10:07:01 +00:00
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	2021-04-07 22:55:39 +00:00
AnyOldName3	3ad2335d11	Fix FetchContent Bullet with MSVC	2021-04-07 20:23:39 +00:00
Evil Eye	44f2cb0923	Fix targeted scripts losing their targets when rearranging your load order	2021-04-07 17:30:21 +02:00
Bret Curtis	30cba854da	Merge pull request #3060 from akortunov/master ... Restore old aiming for melee combat	2021-04-07 13:41:28 +02:00
Andrei Kortunov	59720aea9a	Restore old aiming for melee combat	2021-04-07 12:07:03 +04:00
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	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 (#5893) See merge request OpenMW/openmw!705	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
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
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 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
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 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