jvoisin
cdd73a1a19
Merge branch 'fix_far_away_navmesh_crash' into 'master'
...
Limit navmesh vertices coordinates values (#6574 )
Closes #6574
See merge request OpenMW/openmw!3825
2024-02-05 09:49:24 +00:00
jvoisin
838785d5a3
Merge branch 'sworc' into 'master'
...
Make StartCombat a no-op for dead targets and don't always play attack lines
Closes #7769 and #5413
See merge request OpenMW/openmw!3803
2024-02-05 09:48:20 +00:00
Alexei Kotov
a5d88d489b
Merge branch 'menu_fixes' into 'master'
...
Follow up fixes for Lua Menu MR !3464
See merge request OpenMW/openmw!3834
2024-02-05 00:41:11 +00:00
Evil Eye
6c2ddc635d
Reset friendly hits at the end of combat and don't count hits while in combat
2024-02-04 21:41:03 +01:00
uramer
02accd7a49
Fix statemanager cleanup setting game state to ended by accident
2024-02-04 11:12:12 +01:00
uramer
8c6a1ae8c0
Allow menu scripts to send global events while a game is loaded
2024-02-04 11:12:11 +01:00
Alexei Kotov
62f2f4a011
Merge branch 'clear_lua_actions' into 'master'
...
Fix quickload causing a crash with certain Lua queued actions
Closes #7801
See merge request OpenMW/openmw!3833
2024-02-04 07:25:39 +00:00
Andrei Kortunov
292879d0fb
Address Coverity Scan complaints left
2024-02-04 08:56:25 +04:00
elsid
e6196c782d
Limit navmesh vertices coordinates values
...
Float values with more than 22 significant fraction bits may cause out of bounds
access in recastnavigation on triangles rasterization. Prevent passing such
values there.
2024-02-03 18:48:42 +01:00
Alexei Kotov
8b47381162
Merge branch 'more_move' into 'master'
...
Fix some Coverity Scan complaints
See merge request OpenMW/openmw!3829
2024-02-03 17:24:53 +00:00
uramer
a1970857fd
Queue quick loads
2024-02-03 15:18:34 +01:00
Zackhasacat
1338e884a9
Merge branch 'menuscripts' into 'master'
...
Add new Lua context: menu scripts
Closes #7805 and #7648
See merge request OpenMW/openmw!3464
2024-02-02 21:46:22 +00:00
uramer
784459a652
Clean up the cleanup code
2024-02-02 22:07:58 +01:00
jvoisin
720573115d
Merge branch 'references' into 'master'
...
Pass some arguments by references
See merge request OpenMW/openmw!3824
2024-02-02 16:35:40 +00:00
Andrei Kortunov
69936f3537
Move TextureData
2024-02-02 09:45:42 +04:00
Andrei Kortunov
225e834b88
Fix some Coverity Scan complaints
2024-02-02 09:28:19 +04:00
uramer
b988db9bda
Merge branch 'master' into menuscripts
2024-02-01 20:11:02 +01:00
Mads Buvik Sandvei
a59981e3fa
Initialize mScripted again.
2024-02-01 20:00:10 +01:00
Andrei Kortunov
66d1e036d2
Pass some arguments by references
2024-02-01 10:02:15 +04:00
Andrei Kortunov
7e345436f4
Localize Launcher and Wizard
2024-02-01 09:47:25 +04:00
Zackhasacat
c7fcd1c31b
Fix formatting
2024-01-31 17:00:33 -06:00
psi29a
6136e3d8fc
Merge branch 'csspellarg' into 'master'
...
Editor: Reset effect arguments when the effect ID changes (#7785 )
Closes #7785
See merge request OpenMW/openmw!3802
2024-01-31 10:52:13 +00:00
psi29a
c9489bad9b
Merge branch 'cleanup_esm3_readers_cache' into 'master'
...
Remove stateless encoder from ReadersCache
See merge request OpenMW/openmw!3823
2024-01-31 10:49:53 +00:00
Alexei Kotov
b6b497c76b
Merge branch 'esmtool_output' into 'master'
...
Improve esmtool output
Closes #7669
See merge request OpenMW/openmw!3801
2024-01-30 23:18:59 +00:00
uramer
47d5868e2c
creationTime field in save info
2024-01-30 22:09:12 +01:00
Mads Buvik Sandvei
e0e968a082
rebase errors
2024-01-30 21:25:39 +01:00
Mads Buvik Sandvei
055e9a5055
clang'd
2024-01-30 21:25:39 +01:00
Mads Buvik Sandvei
264a8c0669
Remove the now unused npcstats methods useSkill and increaseSkill
2024-01-30 21:25:39 +01:00
Mads Buvik Sandvei
9f15f3b431
Add engine handler for skill levelup, to dehardcode the book/trainer case.
2024-01-30 21:25:39 +01:00
Mads Buvik Sandvei
e1a22242d9
skillGain as a table
2024-01-30 21:25:38 +01:00
Mads Buvik Sandvei
80e9631abd
Use ESM::Class::Specialization for parameters to npcstats
2024-01-30 21:25:38 +01:00
Mads Buvik Sandvei
011d9d6493
Dehardcode skill and level progression
2024-01-30 21:25:36 +01:00
uramer
76915ce6e9
Queue auto started scripts until next update
2024-01-30 18:58:34 +01:00
uramer
ad8a05e2a1
Trigger a game ended state handler before loading to allow menu scripts to do cleanup
2024-01-30 18:58:15 +01:00
Alexei Kotov
9350222e1a
Merge branch 'deserializeinventory' into 'master'
...
Use deserializeText for find and countOf
See merge request OpenMW/openmw!3817
2024-01-30 04:24:50 +00:00
Alexei Kotov
c86ca0ef01
Merge branch 'cast-fix' into 'master'
...
Fix bad cast of loop count in animation bindings.
See merge request OpenMW/openmw!3819
2024-01-30 04:18:03 +00:00
Evil Eye
340d1423c6
Optimize AI package target comparisons
2024-01-29 22:25:39 +01:00
Evil Eye
8ed7a5319d
Exclude deleted actors, prevent copies, and try to avoid a second getActorsSidingWith call
2024-01-29 22:08:00 +01:00
psi29a
4ebedaca99
Merge branch 'npc_model_lua' into 'master'
...
Add model to NPC lua record
See merge request OpenMW/openmw!3818
2024-01-29 11:58:04 +00:00
elsid
f9b69623d3
Remove stateless encoder from ReadersCache
...
It was added by https://gitlab.com/OpenMW/openmw/-/merge_requests/2804 without a
good reason. There is already encoder available in the used context.
2024-01-29 11:09:29 +01:00
psi29a
be6d063b94
Merge branch 'pointlessinisettings' into 'master'
...
Support Timescale Clouds and MaxNumberRipples INI settings (#7792 , #7795 )
Closes #7792 and #7795
See merge request OpenMW/openmw!3812
2024-01-28 22:13:45 +00:00
psi29a
435a4cb9ec
Merge branch 'minusputback' into 'master'
...
Parse special characters that have been put back as names too
See merge request OpenMW/openmw!3804
2024-01-28 22:12:11 +00:00
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
psi29a
6b35ee68e1
Merge branch 'holdstill' into 'master'
...
Make scripted animations shut down pathfinding (bug #5065 )
Closes #5065
See merge request OpenMW/openmw!3711
2024-01-20 11:57:36 +00:00
psi29a
c23cd8e544
Merge branch 'umlautontherocks' into 'master'
...
Convert strings in nif files to utf8
Closes #7780
See merge request OpenMW/openmw!3783
2024-01-20 11:56:59 +00:00
Mads Buvik Sandvei
1f416d7c8a
Lua: Creature skill bindings
2024-01-20 11:56:36 +00:00
Andrei Kortunov
b37aee21e3
Fix tooltips in the main menu
2024-01-19 15:16:46 +04:00
psi29a
6ead5f9321
Merge branch 'touch_record' into 'master'
...
Fix Touch command
See merge request OpenMW/openmw!3778
2024-01-19 08:32:03 +00:00
psi29a
7c14bac7c2
Merge branch 'load_save_composites' into 'master'
...
Write AiSequence and Script data field by field via decompose function
See merge request OpenMW/openmw!3770
2024-01-19 08:31:43 +00:00
psi29a
c84386aa4b
Merge branch 'fix_navigator_update' into 'master'
...
Fix navmesh update on player changing tile
See merge request OpenMW/openmw!3756
2024-01-19 08:30:22 +00:00
psi29a
6b9fd12ab7
Merge branch 'fix_ubsan_warnings' into 'master'
...
Fix ubsan warnings
See merge request OpenMW/openmw!3772
2024-01-19 08:29:23 +00:00
psi29a
639b7b0b17
Merge branch 'light_settings' into 'master'
...
Enhance light settings tweaking
See merge request OpenMW/openmw!3782
2024-01-19 08:28:23 +00:00
psi29a
6ced0ab397
Merge branch 'sundirection' into 'master'
...
Fix exterior sun direction/position (bug #4898 )
Closes #4898
See merge request OpenMW/openmw!3733
2024-01-19 08:27:50 +00:00
Evil Eye
fba4055877
Move return comments to a new line
2024-01-18 22:32:46 +01:00
Cody Glassman
3cdb9496c4
dont clear empty FBOs, fix doc example
2024-01-18 07:15:35 -08:00
elsid
35d9b18b4c
Add type for normalized VFS path and use for VFS::Manager file map key
...
This will reduce the number of path normalizations while more places will use
this type. In some cases it also will reduce number of temporary allocations for
new strings.
For now make conversion from and to std::string_view implicit to allow gradual
migration to this type.
2024-01-18 00:03:06 +01:00
Evil Eye
68c280a493
Merge branch 'streammusic_fade' into 'master'
...
Add a table with fadeOut argument for streamMusic
See merge request OpenMW/openmw!3774
2024-01-17 19:26:07 +00:00
Evil Eye
0f6133b040
Merge branch 'move_editor' into 'master'
...
Move local variables in the editor
See merge request OpenMW/openmw!3771
2024-01-17 17:21:05 +00:00
Evil Eye
48db113149
Address feedback
2024-01-17 18:10:42 +01:00
Evil Eye
27fa411f4f
Convert strings in nif files to utf8
2024-01-16 20:56:58 +01:00
Andrei Kortunov
a340b49cbc
Enhance light settings tweaking
2024-01-16 10:23:13 +04:00
elsid
a2147d70cc
Use forward declaration for some VFS types
...
This will allow to save on preprocessed code size in the future changes.
2024-01-16 01:32:11 +01:00
Evil Eye
5ae878c248
Merge branch 'blocksound' into 'master'
...
Play shield hit sound for the shield that was hit (#7774 )
Closes #7774
See merge request OpenMW/openmw!3776
2024-01-15 16:06:01 +00:00
psi29a
39a1a7b2f1
Merge branch 'rework_launcher_tabs' into 'master'
...
Rework launcher tabs
See merge request OpenMW/openmw!3775
2024-01-15 11:31:28 +00:00
elsid
6451750890
Write AiSequence and Script data field by field via decompose function
...
Use the same function to load and save to have single place with field order
definition. Use concepts for overload over different types.
2024-01-14 23:04:56 +01:00
Andrei Kortunov
a91e557c68
Fix Touch command (bug 7765)
2024-01-14 22:10:18 +04:00
psi29a
2836ca2d91
Merge branch 'dynamic_casts' into 'master'
...
Check dynamic cast results
See merge request OpenMW/openmw!3761
2024-01-14 17:23:13 +00:00
uramer
0a2adfee16
SaveInfo.timePlayed field
2024-01-14 17:47:27 +01:00
Evil Eye
6ff14e19d1
Make cell models preloading a const operation
2024-01-14 16:41:55 +01:00
Andrei Kortunov
6cefe2c118
Rework launcher tabs
2024-01-14 14:05:14 +04:00
Alexei Kotov
1a629cbf07
Play shield hit sound for the shield that was hit ( #7774 )
2024-01-14 10:33:21 +03:00
Andrei Kortunov
98b281e4ad
Add a missing assertion
2024-01-14 10:59:39 +04:00
Andrei Kortunov
f8c1d48c0b
Get rid of redundant casts
2024-01-14 10:54:51 +04:00
Andrei Kortunov
14e6af8bea
Add a table with fadeOut argument for streamMusic
2024-01-13 15:42:17 +04:00
psi29a
51426eb754
Merge branch 'topiccoloring' into 'master'
...
Properly redraw the topics list when disposition bar state changes
See merge request OpenMW/openmw!3765
2024-01-13 09:52:20 +00:00
uramer
b9afd7245c
Create separate UI api tables for menu and player contexts
2024-01-13 10:13:13 +01:00
elsid
384a1dd13a
Update PrecipitationOccluder only when there is precipitation
2024-01-13 01:08:57 +01:00
uramer
dd09c9b362
Don't save global storage if global scripts didn't run
2024-01-13 00:42:55 +01:00
jvoisin
99164b3a0e
Merge branch 'cicontent' into 'master'
...
Use ciEqual to detect missing content files
See merge request OpenMW/openmw!3767
2024-01-12 19:19:02 +00:00
elsid
3592dc4c88
Add tests for saving and loading AiSequence::AiWander
2024-01-12 12:31:40 +01:00
psi29a
53e3dd0a70
Merge branch 'ondeath' into 'master'
...
Handle running stats extensions on non-actors gracefully (#7770 )
Closes #7770
See merge request OpenMW/openmw!3760
2024-01-12 07:55:49 +00:00
Andrei Kortunov
074ab682ab
Move local variables in the editor
2024-01-12 10:10:27 +04:00
Evil Eye
1880894f4a
Use ciEqual to detect missing content files
2024-01-11 19:05:37 +01:00
psi29a
4c88ab5e07
Merge branch 'thunderstorm' into 'master'
...
Interrupt thunder SFX indoors (bug #6402 )
Closes #6402
See merge request OpenMW/openmw!3741
2024-01-11 16:23:16 +00:00
psi29a
d458a8e43b
Merge branch 'readonly_properties' into 'master'
...
Refactor Lua properties
See merge request OpenMW/openmw!3762
2024-01-11 09:32:30 +00:00
AnyOldName3
e6e24e1b6c
Merge branch 'fix_mac_os_current_path' into 'master'
...
Set MacOS current_path before reading configuration files [#7706 ]
See merge request OpenMW/openmw!3739
2024-01-11 00:59:27 +00:00
Yury Stepovikov
52623ddd7d
Set MacOS current_path before reading configuration files [ #7706 ]
2024-01-11 00:59:27 +00:00
Alexei Kotov
c4ed812567
Properly redraw the topics list when disposition bar state changes
2024-01-11 03:28:34 +03:00
uramer
dd6017e81e
Avoid making engine handler methods public
2024-01-11 00:55:29 +01:00
uramer
4ed2af7666
Merge branch 'master' into menuscripts
2024-01-10 23:21:42 +01:00
uramer
1092d2058d
Load Lua storage before menu scripts might use it
2024-01-10 23:13:27 +01:00
uramer
1afc7ecd58
Test Lua widgets for text inputs correctly
2024-01-10 23:13:27 +01:00
uramer
79deb5f559
Remove settings pages in Lua
2024-01-10 23:13:27 +01:00
uramer
82a125fb6a
Replace onUpdate with onFrame for menu scripts
2024-01-10 23:13:27 +01:00
uramer
2107bbc01d
Reuse input engine handlers in menu scripts
2024-01-10 23:13:23 +01:00
uramer
962ecc4329
Allow menu scripts to read global sections while a game is loaded
2024-01-10 22:28:57 +01:00
Alexei Kotov
ccbc02abc3
Handle running stats extensions on non-actors gracefully ( #7770 )
2024-01-10 22:41:11 +03:00
psi29a
a6e07dd33a
Merge branch 'paging' into 'master'
...
Unbreak un-paging (#7768 )
Closes #7768
See merge request OpenMW/openmw!3754
2024-01-10 19:06:43 +00:00
psi29a
f56198c2c1
Merge branch 'static_npc_parts' into 'master'
...
Use single global static variable in Npc::getSoundIdFromSndGen for all parts
See merge request OpenMW/openmw!3757
2024-01-10 19:05:53 +00:00
psi29a
a0890259e1
Merge branch 'move' into 'master'
...
Move local variables in GUI code
See merge request OpenMW/openmw!3758
2024-01-10 19:05:01 +00:00
Andrei Kortunov
e67d6c6ebf
Refactor Lua properties
2024-01-10 12:37:14 +04:00
