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
f99f818c0c
Merge branch 'esm4_cleanup' into 'master'
...
ESM4 cleanup
See merge request OpenMW/openmw!1792
2022-04-23 15:27:28 +00: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
d71a1efa92
Rename components/esm4/acti.hpp -> components/esm4/loadacti.hpp
2022-04-23 00:40:45 +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
Matt
56a1505885
Cache the target for ai packages instead of looking for it every frame
2022-04-17 17:15:00 +00:00
psi29a
4575df957e
Merge branch 'issue-6685' into 'master'
...
issue 6685 - wizard failure if config dir does not exist
See merge request OpenMW/openmw!1735
2022-04-17 17:13:31 +00:00
Eris Caffee
ba57d0651f
issue 6685 - wizard failure if config dir does not exist
2022-04-17 17:13:31 +00:00
psi29a
8f02cd7d17
Merge branch 'fix_6627' into 'master'
...
Fix #6627
Closes #6627
See merge request OpenMW/openmw!1762
2022-04-17 17:13:13 +00:00
psi29a
517bca803c
Merge branch 'issue-2766-warn_user_if_old_MW_version_installed' into 'master'
...
Issue 2766 Warn user of old MW version detected
See merge request OpenMW/openmw!1748
2022-04-17 16:28:15 +00:00
Eris Caffee
db84d9e649
Issue 2766 Warn user of old MW version detected
2022-04-17 16:28:14 +00:00
psi29a
a0d0f60490
Merge branch 'dont_look_at_me_im_hideous' into 'master'
...
Ignored flag part 2
Closes #6699
See merge request OpenMW/openmw!1782
2022-04-17 09:42:49 +00:00
Evil Eye
6c87219ba3
Print record flags in esmtool
2022-04-17 09:00:58 +02:00
psi29a
e66008c4e2
Merge branch 'dont_look_at_me_im_hideous' into 'master'
...
Implement ignored records
Closes #6699
See merge request OpenMW/openmw!1779
2022-04-16 22:15:00 +00:00
Evil Eye
86d7f5a988
Fix tests
2022-04-16 22:58:08 +02:00
Evil Eye
61ea678a96
Implement ignored records
2022-04-16 16:28:39 +02:00
Evil Eye
68799cfd2b
Merge branch 'cleancmakelist' into 'master'
...
Update CMakeLists.txt after a file was removed.
See merge request OpenMW/openmw!1778
2022-04-16 10:58:30 +00:00
elsid
fbc853804d
Fix recover from errors in Files::getHash
2022-04-15 21:43:54 +02:00
fredzio
3e4c683ba9
Update CMakeLists.txt after a file was removed.
2022-04-15 19:14:18 +02:00
elsid
b09570692e
Use ifstream for ESMReader
...
ESMReader reads the whole file, there is no need in the ConstrainedFileStream.
2022-04-15 02:58:57 +02:00
elsid
194c11f214
Fix loading order in EsmLoader
...
Need to load the last present record from a sequence of loaded records. That
means reverse should be called before unique or unique should be applied for
a reversed range. Since unique keeps only the first element from a sub
sequence of equal elements.
Use forEachUnique with reversed range to avoid redundant container
modifications.
2022-04-13 09:33:24 +02:00
psi29a
d3d9abede4
Merge branch 'refactor/predictAndAvoidCollisions' into 'master'
...
Use active package in predictAndAvoidCollisions
See merge request OpenMW/openmw!1770
2022-04-12 19:20:33 +00:00
uramer
5aa8e475a4
Merge branch 'rendering_raycast' into 'master'
...
Rendering raycasts in Lua
See merge request OpenMW/openmw!1768
2022-04-12 19:15:28 +00:00
ζeh Matt
1a41cefab3
Use active package in predictAndAvoidCollisions
2022-04-12 18:32:58 +03:00
psi29a
9809b873a0
Merge branch 'esm_namespace_qualifiers' into 'master'
...
Remove ESM:: namespace qualifier in components/esm3/ and tests
See merge request OpenMW/openmw!1769
2022-04-12 08:08:31 +00:00
elsid
4447ab0ed7
Remove ESM:: namespace qualifier in components/esm3/ and tests
2022-04-12 02:04:24 +02:00
Petr Mikheev
51845e9553
Rendering raycasts in Lua
2022-04-11 23:36:54 +02:00
Petr Mikheev
a65f8ebbc6
Reorganize delayed Lua actions
2022-04-11 22:19:51 +02:00
elsid
39da3bfef8
Ignore player when checking whether AiTravel destination is occupied by other actor
2022-04-11 19:30:54 +02:00
psi29a
84458baa8b
Merge branch 'VA_OpenMW-CS' into 'master'
...
OpenMW-CS: Issue #3245 Add configurable instance grid, angle, and scale snapping
Closes #3245
See merge request OpenMW/openmw!1737
2022-04-11 16:03:30 +00:00
Vidi_Aquam
035fe778b2
Temporary workaround for angle snapping
...
Made the angle snap only apply to an object when the drag is finished, which is much more usable until the rotation system can be fixed completely
2022-04-11 08:12:38 -05:00
psi29a
03806eb75e
Merge branch 'esm_rm_redundant_include' into 'master'
...
Remove redundant include from esm3/esmreader.hpp
See merge request OpenMW/openmw!1761
2022-04-11 07:47:48 +00:00
elsid
5eb8c4aebe
Avoid redundant conversion to const char* and use make_shared
2022-04-10 22:33:08 +02:00
Petr Mikheev
fa29b9d6f7
Fix #6627
2022-04-10 22:31:09 +02:00
