psi29a
f656d2e380
Merge branch 'shutupverifier' into 'master'
...
Editor: Silence some verifier warnings
See merge request OpenMW/openmw!3814
2024-01-28 21:42:06 +00:00
psi29a
7450b11402
Merge branch 'vfs_normalized_path_1' into 'master'
...
Use normalized path for VFS manager and RecursiveDirectoryIterator
See merge request OpenMW/openmw!3806
2024-01-28 21:34:01 +00:00
psi29a
b1a72330a4
Merge branch 'allow_muliselect_in_archives_tab' into 'master'
...
Allow multiselect in the archives tab (#7606 )
Closes #7606
See merge request OpenMW/openmw!3773
2024-01-28 21:33:10 +00:00
Yury Stepovikov
c90ebcc86b
Allow multiselect in the archives tab ( #7606 )
2024-01-28 21:33:10 +00:00
Mads Buvik Sandvei
fbffecfd13
~0ul -> std::numeric_limits<uint32_t>::max()
2024-01-28 21:02:06 +01:00
Mads Buvik Sandvei
0ed94ead4e
Check that count is non-zero before decrementing it.
2024-01-28 17:34:22 +01:00
Mads Buvik Sandvei
24a0a0c3bf
size_t -> uint32_t
2024-01-28 16:34:44 +01:00
Mads Buvik Sandvei
993cea7d65
MR Comments
2024-01-28 16:31:01 +01:00
Mads Buvik Sandvei
36e1bdab10
Use a smaller integer type instead of dealing with casting issues.
2024-01-28 14:48:49 +01:00
Alexei Kotov
b83b30f0dc
Editor: Reset effect arguments when the effect ID changes ( #7785 )
2024-01-28 15:37:53 +03:00
Alexei Kotov
bd84200d4e
Merge branch 'bumpbump' into 'master'
...
Base GetColliding script functions on collisions detected by the movement solver
Closes #7053
See merge request OpenMW/openmw!3794
2024-01-28 10:18:02 +00:00
Alexei Kotov
df6e104e6f
Merge branch 'tastytastyenchantments' into 'master'
...
Use the correct id to absorb enchantments
Closes #7796
See merge request OpenMW/openmw!3813
2024-01-28 10:15:55 +00:00
Zackhasacat
4fcacd59aa
Add model to NPC lua
2024-01-27 12:02:56 -06:00
Evil Eye
1288ec5cea
Use deserializeText for find and countOf
2024-01-27 16:49:20 +01:00
Evil Eye
4ef68a8938
Split Class::getModel into Class::getCorrectedModel and Class::getModel so preloading can use string_view
2024-01-27 16:26:31 +01:00
uramer
9cce2e39ba
Merge branch 'master' into menuscripts
2024-01-27 15:45:31 +01:00
Alexei Kotov
093d86353f
Merge branch 'lua_mwscript_nilvar' into 'master'
...
#7791 : Require local variables to exist for lua mwscript local variables
Closes #7791
See merge request OpenMW/openmw!3811
2024-01-27 13:57:26 +00:00
Zackhasacat
cfd67f3ce7
#7791 : Require local variables to exist for lua mwscript local variables
2024-01-27 13:57:26 +00:00
uramer
ad5d594c28
Let menu scripts clean up before loading a game
2024-01-27 14:47:22 +01:00
Evil Eye
1d1ce2de7b
Use the correct id to absorb enchantments
2024-01-27 12:12:39 +01:00
Mads Buvik Sandvei
a94add741e
Lua: Animation bindings
2024-01-26 21:39:33 +00:00
Alexei Kotov
d1e79028e9
Merge branch 'lua-fix-active-spells-pairs-iterator-return' into 'master'
...
Lua: Fix return value for `Actor.ActiveSpells` iterator
See merge request OpenMW/openmw!3808
2024-01-26 20:38:13 +00:00
Alexei Kotov
30d637f5f6
Merge branch 'lua_water_level' into 'master'
...
Lua: Add water level to Core.Cell
See merge request OpenMW/openmw!3766
2024-01-26 20:37:04 +00:00
Zackhasacat
daa9c5f0e1
Lua: Add water level to Core.Cell
2024-01-26 20:37:04 +00:00
Evil Eye
aa9a99bde5
Merge branch 'magic_effects_fix' into 'master'
...
Fix magic effects in the editor
Closes #7481
See merge request OpenMW/openmw!3798
2024-01-26 16:33:51 +00:00
Evil Eye
ed22b91bf2
Merge branch 'kftest' into 'master'
...
Support parsing KF files in niftest
See merge request OpenMW/openmw!3807
2024-01-26 16:24:55 +00:00
Alexei Kotov
70a0b7ea9c
Editor: Drop zero attribute warnings
2024-01-26 19:23:03 +03:00
Evil Eye
f62e4f5707
Merge branch 'more_move' into 'master'
...
Use std::move() in /apps/openmw
See merge request OpenMW/openmw!3805
2024-01-26 16:21:00 +00:00
Alexei Kotov
48bbf0b637
Editor: Don't complain about body part references in Verify
2024-01-26 19:14:18 +03:00
Alexei Kotov
23e30eaaa5
Support MaxNumberRipples setting ( #7795 )
2024-01-26 17:18:50 +03:00
Alexei Kotov
2ea4013382
Correct base cloud speed, support Timescale Clouds fallback setting ( #7792 )
2024-01-26 17:18:50 +03:00
Pharis
3b0d654a3f
Return active spell id from pairs
2024-01-25 18:10:10 -06:00
Evil Eye
a8ee3dfae8
Move the caching getActorsSidingWith to its own type
2024-01-25 20:44:18 +01:00
Evil Eye
bdc6119b31
Bring attack voice lines in line with research
...
Only play them when starting combat when not in combat or not in combat
with one of the target's allies.
Don't play them when casting spells whose first effect isn't ranged.
2024-01-25 19:36:41 +01:00
Alexei Kotov
29a40c212f
Support parsing KF files in niftest
...
Mention BA2 support in help messages
2024-01-25 15:53:24 +03:00
Andrei Kortunov
9e55425b71
Use std::move() in /apps/openmw
2024-01-25 09:03:30 +04:00
psi29a
cdf2459ed8
Merge branch 'constpreload' into 'master'
...
Make cell models preloading a const operation
See merge request OpenMW/openmw!3777
2024-01-24 21:35:05 +00:00
elsid
70061329a1
Return Path::Normalized from RecursiveDirectoryIterator
2024-01-24 22:19:03 +01:00
Evil Eye
54429cd23b
Parse special characters that have been put back as names too
2024-01-24 18:31:04 +01:00
jvoisin
9616b03e7f
Merge branch 'savegame_error' into 'master'
...
Fix error message about savegame format
See merge request OpenMW/openmw!3796
2024-01-23 21:00:39 +00:00
jvoisin
ec6ac8058b
Merge branch 'vfs_normalized_path' into 'master'
...
Add type for normalized VFS path and use for VFS::Manager file map key
See merge request OpenMW/openmw!3781
2024-01-23 20:42:48 +00:00
Evil Eye
4dfe6078c8
Make StartCombat a no-op for dead targets and don't play an attack line when already in combat
2024-01-22 22:07:49 +01:00
psi29a
76ad680549
Merge branch 'tools' into 'master'
...
Use move semantics for tools
See merge request OpenMW/openmw!3795
2024-01-22 12:18:36 +00:00
Andrei Kortunov
2575801ba2
Improve esmtool output
2024-01-22 09:52:32 +04:00
Andrei Kortunov
a6ca726c3a
Fix error message about savegame format
2024-01-21 21:02:59 +04:00
Andrei Kortunov
737d3b499b
Use move semantics for tools
2024-01-21 20:20:37 +04:00
Andrei Kortunov
e01e2f1ae0
Fix magic effects in the editor
2024-01-21 17:50:45 +04:00
Andrei Kortunov
251d01304f
Use move semantics for osg::ref_ptr
2024-01-21 13:48:33 +04:00
psi29a
a41259cca8
Merge branch 'tooltips_fix' into 'master'
...
Fix tooltips in the main menu
See merge request OpenMW/openmw!3789
2024-01-20 15:53:40 +00:00
Evil Eye
467220e6d7
Base GetColliding script functions on collisions detected by the movement solver
2024-01-20 16:50:51 +01:00
