1
0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-04 12:39:55 +00:00

14072 Commits

Author SHA1 Message Date
Petr Mikheev
6a97a21fbd [Lua] Fix stupid bug in tostring for ESM::Weapon and ESM::Door 2022-05-08 13:09:02 +02:00
psi29a
408540517a Merge branch 'refactor/fCombatInvisoMult' into 'master'
Avoid looking up settings from gmst each frame

See merge request OpenMW/openmw!1771
2022-05-08 10:43:08 +00:00
psi29a
49487a17e6 Merge branch 'environment' into 'master'
Make Environment a storage of referencing pointers instead of owned

See merge request OpenMW/openmw!1830
2022-05-08 08:47:34 +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
Petr Mikheev
2d1d7e644c [Lua] Fix the bug the object:activate() doesn't trigger mwscripts 2022-05-06 23:46:36 +02:00
elsid
2dc6e755b2
Remove redundant update virtual functions 2022-05-06 23:44:04 +02:00
elsid
79676aee15
Make Environment a storage of referencing pointers instead of owned
Engine controls lifetime of managers therefore it should own them. Environment
is only access provider.

This allows to avoid redundant virtual calls and also some functions from
managers base classes can be removed if they are used only by Engine.
2022-05-06 23:44:01 +02:00
Petr Mikheev
70c7f1880d [Lua] pairs and ipairs for ObjectList (resolves #6732) 2022-05-06 23:11:47 +02:00
Evil Eye
bc5e43ab60 Fix copy paste error 2022-05-05 21:53:20 +02: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
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
uramer
03659bef86 MWUI interface (resolve https://gitlab.com/OpenMW/openmw/-/issues/6594) 2022-05-03 17:36:49 +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
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
Evil Eye
db19700599 Make stack manipulation unconditional 2022-04-30 16:45:45 +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
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
Mads Buvik Sandvei
606a795a54 multiview linker-method 2022-04-28 21:09:06 +02:00
madsbuvi
dd5901d351 Initial commit
Multiview shaders.

Refactor Frustum management

Rewrite shared shadow map

cull mask should respect stereo

Stereo savegame screencap

LocalMap refactoring

use the vertex buffer hint instead of the display list patch to enable/disable display lists

Character preview fixes
2022-04-28 21:05:34 +02:00
Petr Mikheev
c7ab67c2c1 Allow relative paths in openmw.cfg; support --replace=config. 2022-04-28 00:39:41 +02:00
psi29a
c930aabf17 Merge branch 'fix_windows_build' into 'master'
Fix build on Windows

See merge request OpenMW/openmw!1796
2022-04-25 06:38:33 +00:00
elsid
0dcb1f5aac
Fix build on Windows
Use wrapper header over Windows.h to undefine far and near in a single place.
2022-04-25 00:25:46 +02:00
psi29a
eceb7406aa Merge branch 'lua_storage' into 'master'
[Lua] Update openmw.storage

See merge request OpenMW/openmw!1795
2022-04-24 20:13:59 +00:00
jvoisin
3621b9a759 Merge branch 'clean' into 'master'
Appease some clang warnings

See merge request OpenMW/openmw!1794
2022-04-24 11:34:29 +00:00
Petr Mikheev
eae1e87081 [Lua] Update openmw.storage 2022-04-23 18:55:12 +02:00
psi29a
cfcc88f64c Merge branch 'istream_unique_ptr' into 'master'
Use unique_ptr to store istream

See merge request OpenMW/openmw!1793
2022-04-23 11:19:27 +00:00
fredzio
5a1a987f6c Remove write-only variable. 2022-04-23 09:13:22 +02:00
elsid
94c1d0cced
Use unique_ptr to store istream 2022-04-22 18:27:17 +02:00
Petr Mikheev
88d09c336c Lua console 2022-04-21 21:57:07 +02:00
Alexei Kotov
6d794cf9ca Merge branch 'fix-savegamerecords' into 'master'
Include random state record in count of saved records

See merge request OpenMW/openmw!1790
2022-04-21 10:38:49 +00:00
ζeh Matt
51a84aaef8
Include random state record in count of saved records 2022-04-21 11:51:10 +03:00
elsid
a2d596dbc7
Prepare navmesh scene asynchronously
It is expensive operation to generate new osg::Group for updated navmesh tile
which noticeably slows down main thread primarily because of
SceneManager::recreateShaders call. Move it to the preload work queue that is
used by RenderingManager. Leave to main thread only manipulations on the root
node.

Also move deallocation of no more needed data to the work queue. It's also
quite expensive operation because SceneManager::recreateShaders allocates a
new state set for each osg::Geometry. Deallocating them takes time.

Avoid creating another work item if there is existing one that is not started
yet.

Make sure results are accepted in the proper serialized order by selecting
completed work item with maximum {id, version}.
2022-04-20 23:14:31 +02:00
psi29a
c14796fc57 Merge branch 'ncc' into 'master'
#6496 Handle NCC flag in Nif files

See merge request OpenMW/openmw!1516
2022-04-17 20:29:41 +00:00
psi29a
4e723cad59 Merge branch 'issue-6667-pressing_escape_during_wait_causes_black_screen' into 'master'
issue-6667 pressing escape during wait causes black screen

See merge request OpenMW/openmw!1783
2022-04-17 20:26:23 +00:00
Eris Caffee
627656ace0 issue-6667 pressing escape during wait causes black screen 2022-04-17 20:26:23 +00:00
psi29a
58f77ab3ef Merge branch 'issue-5279-console_stops_scrolling_properly_after_selection' into 'master'
issue-5279 console stops scrolling properly after selection

See merge request OpenMW/openmw!1781
2022-04-17 20:25:10 +00:00
Eris Caffee
b2c6c49999 issue-5279 console stops scrolling properly after selection 2022-04-17 20:25:09 +00:00
fredzio
d05a2facf3 Handle NCC flag in Nif files. Objects with this flag will collide only with camera.
Expose objects with NC flag to be used by Lua mods.
2022-04-17 20:03:00 +02:00
psi29a
c17b6de787 Merge branch 'refactor/cache-target' into 'master'
Cache the target for ai packages instead of looking for it every frame

See merge request OpenMW/openmw!1772
2022-04-17 17:15:01 +00:00