1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-07-01 17:41:34 +00:00
Commit graph

27988 commits

Author SHA1 Message Date
psi29a
c0ffb289ab Merge branch 'ptmikheev-master-patch-72894' into 'master'
Fix #6731

Closes #6731

See merge request OpenMW/openmw!1832
2022-05-08 08:33:43 +00:00
psi29a
71e4e5ceec Merge branch 'lua_activate' into 'master'
[Lua] Fix the bug that object:activate() doesn't trigger mwscripts

See merge request OpenMW/openmw!1834
2022-05-08 08:30:50 +00:00
uramer
9b0928e8f4 Merge branch 'lua_pairs' into 'master'
[Lua] pairs and ipairs for ObjectList (resolves #6732)

Closes #6732

See merge request OpenMW/openmw!1833
2022-05-07 09:38:09 +00:00
Petr Mikheev
2d1d7e644c [Lua] Fix the bug the object:activate() doesn't trigger mwscripts 2022-05-06 23:46:36 +02:00
Petr Mikheev
70c7f1880d [Lua] pairs and ipairs for ObjectList (resolves #6732) 2022-05-06 23:11:47 +02:00
Petr Mikheev
86d6ab593e Fix #6731 2022-05-06 19:57:41 +00:00
jvoisin
a9767f1ffc Merge branch 'fix_cobertura_reports' into 'master'
Fix collecting cobertura reports

See merge request OpenMW/openmw!1831
2022-05-06 19:41:29 +00:00
elsid
06225c6968 Fix collecting cobertura reports 2022-05-06 19:41:29 +00:00
AnyOldName3
d975e9e138 Merge branch 'position_in_radians' into 'master'
Fix copy paste error

See merge request OpenMW/openmw!1829
2022-05-05 20:57:47 +00:00
Evil Eye
bc5e43ab60 Fix copy paste error 2022-05-05 21:53:20 +02:00
jvoisin
331363d469 Merge branch 'fix_uninit' into 'master'
Fix uninitialized coverity warnings

See merge request OpenMW/openmw!1819
2022-05-05 17:35:16 +00:00
Alexei Kotov
68a1958c94 Merge branch 'cocoa-solids' into 'master'
Disable Chocolatey community repo

See merge request OpenMW/openmw!1824
2022-05-05 06:50:15 +00:00
Alexei Kotov
6aaf2c33bf Merge branch 'refactor/5336-1' into 'master'
#5336 (1): Refactor World::updatePlayer in to Player::update

See merge request OpenMW/openmw!1828
2022-05-05 06:46:28 +00:00
Alexei Kotov
6857f4f7ff Merge branch 'empty_and_clear' into 'master'
Replace empty std::string assignments

See merge request OpenMW/openmw!1827
2022-05-05 06:43:30 +00:00
ζeh Matt
2bbd0ba976
#5336: Refactor World::updatePlayer in to Player::update 2022-05-05 00:57:15 +03:00
Evil Eye
a64979e25d Replace empty std::string assignments 2022-05-04 22:33:39 +02:00
Alexei Kotov
06dee79cc3 Merge branch 'seductive_poses' into 'master'
Don't mark idle animations as bad when blocking them

Closes #6730

See merge request OpenMW/openmw!1826
2022-05-04 20:20:04 +00:00
Evil Eye
55d32432b9 Don't mark idle animations as bad when blocking them 2022-05-04 21:15:08 +02:00
Alexei Kotov
bbec296891 Merge branch 'we-are-anonymous-we-are-quivers-apparently' into 'master'
Don't return a random anonymous node from getArrowBone when the current weapon doesn't fire arrows.

Closes #6718

See merge request OpenMW/openmw!1822
2022-05-04 03:00:57 +00:00
AnyOldName3
2f10ccd18f Disable Chocolatey community repo
This should work around https://github.com/chocolatey/choco/issues/1541, which causes priority to be ignored and our proxy cache to be skipped
2022-05-03 22:51:34 +00:00
AnyOldName3
2b9c7e77bd Appease the CHANGELOG 2022-05-03 21:30:21 +01:00
Cody Glassman
c649d94fee Merge branch 'mw_templates' into 'master'
MWUI interface (resolve https://gitlab.com/OpenMW/openmw/-/issues/6594)

Closes #6594

See merge request OpenMW/openmw!1702
2022-05-03 17:36:50 +00:00
uramer
03659bef86 MWUI interface (resolve https://gitlab.com/OpenMW/openmw/-/issues/6594) 2022-05-03 17:36:49 +00:00
jvoisin
b4fca045c6 Merge branch 'no_assert_but_if_instead' into 'master'
Use an `if` instead of an assert

See merge request OpenMW/openmw!1820
2022-05-02 21:17:25 +00:00
jvoisin
143dcad0e8 Use an if instead of an assert 2022-05-02 21:17:24 +00:00
AnyOldName3
a6c9c9d1f8 Don't return a random anonymous node from getArrowBone when the current weapon doesn't fire arrows. 2022-05-02 20:11:01 +01:00
psi29a
699c1db1d8 Merge branch 'improvement/allow-option-for-new-windows' into 'master'
Add option to open record editing sub views in new windows instead of exclusive docking.

See merge request OpenMW/openmw!1806
2022-05-01 20:24:20 +00:00
Max Henzerling
2771fa1bb4 create and add issue to changelog 2022-05-01 11:52:42 -07:00
Max Henzerling
41be5a17f4 comments from PR 2022-05-01 11:52:19 -07:00
Max Henzerling
af5b1b3083 Add option to open record editting subviews in new windows instead of exclusive docking. 2022-05-01 11:52:19 -07:00
elsid
b67a0a8f2b
Fix uninitialized coverity warnings 2022-05-01 18:36:16 +02:00
psi29a
f3f63a5f5b Merge branch 'fix_region_save' into 'master'
End SNAM record as SNAM record

See merge request OpenMW/openmw!1817
2022-05-01 15:23:52 +00:00
elsid
92538dde89
End SNAM record as SNAM record 2022-05-01 15:45:22 +02:00
psi29a
dccbd3e980 Merge branch 'try_and_hit_me' into 'master'
Bring HitAttemptOnMe in line with HitOnMe

See merge request OpenMW/openmw!1816
2022-04-30 18:26:30 +00:00
psi29a
265fa51128 Merge branch 'respect_water_filtering' into 'master'
Simple water should respect filter settings (#5989)

Closes #5989

See merge request OpenMW/openmw!1813
2022-04-30 17:02:32 +00:00
psi29a
828f394200 Merge branch 'stacked_up' into 'master'
Make stack manipulation unconditional

Closes #6717

See merge request OpenMW/openmw!1815
2022-04-30 16:58:57 +00:00
psi29a
275bebb066 Merge branch 'Stereo-MR' into 'master'
Stereo

See merge request OpenMW/openmw!1757
2022-04-30 16:40:09 +00:00
unknown
1bc24d5120 Bring HitAttemptOnMe in line with HitOnMe 2022-04-30 18:32:10 +02:00
jvoisin
5afe3fb8ae Merge branch 'region_size' into 'master'
Use subrecord size instead of version to load WEAT

See merge request OpenMW/openmw!1814
2022-04-30 15:13:26 +00:00
Evil Eye
db19700599 Make stack manipulation unconditional 2022-04-30 16:45:45 +02:00
Evil Eye
9a96d64611 Use subrecord size instead of version to load WEAT 2022-04-30 10:11:49 +02:00
cody glassman
ed6cd487ee allow updating filtering at runtime 2022-04-29 17:26:09 -07:00
cody glassman
13a05dbd63 simple water should respect filter settings 2022-04-29 17:01:28 -07:00
madsbuvi
31a97141b7 Mac 2022-04-29 21:59:26 +02:00
madsbuvi
79577f37de Rebase artifacts + cleaned up the remaining unnecessary exposures of stereo awareness. 2022-04-29 17:35:24 +02:00
psi29a
51024a8208 Merge branch 'issue-6706-save-the-size-of-the-options-window' into 'master'
Issue-6706 Save the size of the Options window

Closes #6706

See merge request OpenMW/openmw!1798
2022-04-29 09:56:09 +00:00
Eris Caffee
de291b0ec4 Issue-6706 Save the size of the Options window 2022-04-29 09:56:08 +00:00
psi29a
f0d84342b1 Merge branch 'lighting' into 'master'
Clamp vertex lighting properly (#6697)

Closes #6697

See merge request OpenMW/openmw!1811
2022-04-29 07:10:13 +00:00
cody glassman
276cb6f170 clamp vertex lighting in fragment shader properly 2022-04-28 20:02:13 -07:00
psi29a
a707f5b0e0 Merge branch 'portable' into 'master'
Make OpenMW more portable (follow up of !1555)

See merge request OpenMW/openmw!1805
2022-04-28 19:35:29 +00:00