Commit Graph

21878 Commits (42c7fc8e921272d18830054fd217e6188b81a110)

Author SHA1 Message Date
Mads Buvik Sandvei 36e1bdab10 Use a smaller integer type instead of dealing with casting issues. 11 months ago
Alexei Kotov b83b30f0dc Editor: Reset effect arguments when the effect ID changes (#7785) 11 months ago
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
11 months ago
Alexei Kotov df6e104e6f Merge branch 'tastytastyenchantments' into 'master'
Use the correct id to absorb enchantments

Closes #7796

See merge request OpenMW/openmw!3813
11 months ago
Zackhasacat 4fcacd59aa Add model to NPC lua 11 months ago
Evil Eye 1288ec5cea Use deserializeText for find and countOf 11 months ago
Evil Eye 4ef68a8938 Split Class::getModel into Class::getCorrectedModel and Class::getModel so preloading can use string_view 11 months ago
uramer 9cce2e39ba Merge branch 'master' into menuscripts 11 months ago
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
11 months ago
Zackhasacat cfd67f3ce7 #7791: Require local variables to exist for lua mwscript local variables 11 months ago
uramer ad5d594c28 Let menu scripts clean up before loading a game 11 months ago
Evil Eye 1d1ce2de7b Use the correct id to absorb enchantments 11 months ago
Mads Buvik Sandvei a94add741e Lua: Animation bindings 11 months ago
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
11 months ago
Alexei Kotov 30d637f5f6 Merge branch 'lua_water_level' into 'master'
Lua: Add water level to Core.Cell

See merge request OpenMW/openmw!3766
11 months ago
Zackhasacat daa9c5f0e1 Lua: Add water level to Core.Cell 11 months ago
Evil Eye aa9a99bde5 Merge branch 'magic_effects_fix' into 'master'
Fix magic effects in the editor

Closes #7481

See merge request OpenMW/openmw!3798
11 months ago
Evil Eye ed22b91bf2 Merge branch 'kftest' into 'master'
Support parsing KF files in niftest

See merge request OpenMW/openmw!3807
11 months ago
Alexei Kotov 70a0b7ea9c Editor: Drop zero attribute warnings 11 months ago
Evil Eye f62e4f5707 Merge branch 'more_move' into 'master'
Use std::move() in /apps/openmw

See merge request OpenMW/openmw!3805
11 months ago
Alexei Kotov 48bbf0b637 Editor: Don't complain about body part references in Verify 11 months ago
Alexei Kotov 23e30eaaa5 Support MaxNumberRipples setting (#7795) 11 months ago
Alexei Kotov 2ea4013382 Correct base cloud speed, support Timescale Clouds fallback setting (#7792) 11 months ago
Pharis 3b0d654a3f Return active spell id from pairs 11 months ago
Evil Eye a8ee3dfae8 Move the caching getActorsSidingWith to its own type 11 months ago
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.
11 months ago
Alexei Kotov 29a40c212f Support parsing KF files in niftest
Mention BA2 support in help messages
11 months ago
Andrei Kortunov 9e55425b71 Use std::move() in /apps/openmw 11 months ago
psi29a cdf2459ed8 Merge branch 'constpreload' into 'master'
Make cell models preloading a const operation

See merge request OpenMW/openmw!3777
11 months ago
elsid 70061329a1
Return Path::Normalized from RecursiveDirectoryIterator 11 months ago
Evil Eye 54429cd23b Parse special characters that have been put back as names too 11 months ago
jvoisin 9616b03e7f Merge branch 'savegame_error' into 'master'
Fix error message about savegame format

See merge request OpenMW/openmw!3796
11 months ago
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
11 months ago
Evil Eye 4dfe6078c8 Make StartCombat a no-op for dead targets and don't play an attack line when already in combat 11 months ago
psi29a 76ad680549 Merge branch 'tools' into 'master'
Use move semantics for tools

See merge request OpenMW/openmw!3795
12 months ago
Andrei Kortunov 2575801ba2 Improve esmtool output 12 months ago
Andrei Kortunov a6ca726c3a Fix error message about savegame format 12 months ago
Andrei Kortunov 737d3b499b Use move semantics for tools 12 months ago
Andrei Kortunov e01e2f1ae0 Fix magic effects in the editor 12 months ago
Andrei Kortunov 251d01304f Use move semantics for osg::ref_ptr 12 months ago
psi29a a41259cca8 Merge branch 'tooltips_fix' into 'master'
Fix tooltips in the main menu

See merge request OpenMW/openmw!3789
12 months ago
Evil Eye 467220e6d7 Base GetColliding script functions on collisions detected by the movement solver 12 months ago
psi29a 6b35ee68e1 Merge branch 'holdstill' into 'master'
Make scripted animations shut down pathfinding (bug #5065)

Closes #5065

See merge request OpenMW/openmw!3711
12 months ago
psi29a c23cd8e544 Merge branch 'umlautontherocks' into 'master'
Convert strings in nif files to utf8

Closes #7780

See merge request OpenMW/openmw!3783
12 months ago
Mads Buvik Sandvei 1f416d7c8a Lua: Creature skill bindings 12 months ago
Andrei Kortunov b37aee21e3 Fix tooltips in the main menu 12 months ago
psi29a 6ead5f9321 Merge branch 'touch_record' into 'master'
Fix Touch command

See merge request OpenMW/openmw!3778
12 months ago
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
12 months ago
psi29a c84386aa4b Merge branch 'fix_navigator_update' into 'master'
Fix navmesh update on player changing tile

See merge request OpenMW/openmw!3756
12 months ago
psi29a 6b9fd12ab7 Merge branch 'fix_ubsan_warnings' into 'master'
Fix ubsan warnings

See merge request OpenMW/openmw!3772
12 months ago
psi29a 639b7b0b17 Merge branch 'light_settings' into 'master'
Enhance light settings tweaking

See merge request OpenMW/openmw!3782
12 months ago
psi29a 6ced0ab397 Merge branch 'sundirection' into 'master'
Fix exterior sun direction/position (bug #4898)

Closes #4898

See merge request OpenMW/openmw!3733
12 months ago
Evil Eye fba4055877 Move return comments to a new line 12 months ago
Cody Glassman 3cdb9496c4 dont clear empty FBOs, fix doc example 12 months ago
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.
12 months ago
Evil Eye 68c280a493 Merge branch 'streammusic_fade' into 'master'
Add a table with fadeOut argument for streamMusic

See merge request OpenMW/openmw!3774
12 months ago
Evil Eye 0f6133b040 Merge branch 'move_editor' into 'master'
Move local variables in the editor

See merge request OpenMW/openmw!3771
12 months ago
Evil Eye 48db113149 Address feedback 12 months ago
Evil Eye 27fa411f4f Convert strings in nif files to utf8 12 months ago
Andrei Kortunov a340b49cbc Enhance light settings tweaking 12 months ago
elsid a2147d70cc
Use forward declaration for some VFS types
This will allow to save on preprocessed code size in the future changes.
12 months ago
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
12 months ago
psi29a 39a1a7b2f1 Merge branch 'rework_launcher_tabs' into 'master'
Rework launcher tabs

See merge request OpenMW/openmw!3775
12 months ago
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.
12 months ago
Andrei Kortunov a91e557c68 Fix Touch command (bug 7765) 12 months ago
psi29a 2836ca2d91 Merge branch 'dynamic_casts' into 'master'
Check dynamic cast results

See merge request OpenMW/openmw!3761
12 months ago
uramer 0a2adfee16 SaveInfo.timePlayed field 12 months ago
Evil Eye 6ff14e19d1 Make cell models preloading a const operation 12 months ago
Andrei Kortunov 6cefe2c118 Rework launcher tabs 12 months ago
Alexei Kotov 1a629cbf07 Play shield hit sound for the shield that was hit (#7774) 12 months ago
Andrei Kortunov 98b281e4ad Add a missing assertion 12 months ago
Andrei Kortunov f8c1d48c0b Get rid of redundant casts 12 months ago
Andrei Kortunov 14e6af8bea Add a table with fadeOut argument for streamMusic 12 months ago
psi29a 51426eb754 Merge branch 'topiccoloring' into 'master'
Properly redraw the topics list when disposition bar state changes

See merge request OpenMW/openmw!3765
12 months ago
uramer b9afd7245c Create separate UI api tables for menu and player contexts 12 months ago
elsid 384a1dd13a
Update PrecipitationOccluder only when there is precipitation 12 months ago
uramer dd09c9b362 Don't save global storage if global scripts didn't run 12 months ago
jvoisin 99164b3a0e Merge branch 'cicontent' into 'master'
Use ciEqual to detect missing content files

See merge request OpenMW/openmw!3767
12 months ago
elsid 3592dc4c88
Add tests for saving and loading AiSequence::AiWander 12 months ago
psi29a 53e3dd0a70 Merge branch 'ondeath' into 'master'
Handle running stats extensions on non-actors gracefully (#7770)

Closes #7770

See merge request OpenMW/openmw!3760
12 months ago
Andrei Kortunov 074ab682ab Move local variables in the editor 12 months ago
Evil Eye 1880894f4a Use ciEqual to detect missing content files 12 months ago
psi29a 4c88ab5e07 Merge branch 'thunderstorm' into 'master'
Interrupt thunder SFX indoors (bug #6402)

Closes #6402

See merge request OpenMW/openmw!3741
12 months ago
psi29a d458a8e43b Merge branch 'readonly_properties' into 'master'
Refactor Lua properties

See merge request OpenMW/openmw!3762
12 months ago
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
12 months ago
Yury Stepovikov 52623ddd7d Set MacOS current_path before reading configuration files [#7706] 12 months ago
Alexei Kotov c4ed812567 Properly redraw the topics list when disposition bar state changes 12 months ago
uramer dd6017e81e Avoid making engine handler methods public 12 months ago
uramer 4ed2af7666 Merge branch 'master' into menuscripts 12 months ago
uramer 1092d2058d Load Lua storage before menu scripts might use it 12 months ago
uramer 1afc7ecd58 Test Lua widgets for text inputs correctly 12 months ago
uramer 79deb5f559 Remove settings pages in Lua 12 months ago
uramer 82a125fb6a Replace onUpdate with onFrame for menu scripts 12 months ago
uramer 2107bbc01d Reuse input engine handlers in menu scripts 12 months ago
uramer 962ecc4329 Allow menu scripts to read global sections while a game is loaded 12 months ago
Alexei Kotov ccbc02abc3 Handle running stats extensions on non-actors gracefully (#7770) 12 months ago
psi29a a6e07dd33a Merge branch 'paging' into 'master'
Unbreak un-paging (#7768)

Closes #7768

See merge request OpenMW/openmw!3754
12 months ago
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
12 months ago
psi29a a0890259e1 Merge branch 'move' into 'master'
Move local variables in GUI code

See merge request OpenMW/openmw!3758
12 months ago
Andrei Kortunov e67d6c6ebf Refactor Lua properties 12 months ago
psi29a 60d1262d61 Merge branch 'askloadnotreallyrecent' into 'master'
Replicate recent save loading prompt behavior (bug #7617)

Closes #7617

See merge request OpenMW/openmw!3710
12 months ago
psi29a ce151692e9 Merge branch 'editor_shortcut_settings' into 'master'
Use settings values to declare shortcut settings (#6876)

See merge request OpenMW/openmw!3753
12 months ago
Alexei Kotov 78d8cf86c3 Merge branch 'pickme' into 'master'
Override launcher file info with higher priority info

Closes #7733 and #7103

See merge request OpenMW/openmw!3743
12 months ago
Alexei Kotov 778fe606b8 Merge branch 'beastly' into 'master'
Restore beast race animations

See merge request OpenMW/openmw!3752
12 months ago
Evil Eye ff78c13903 Merge branch 'unused_hrtf' into 'master'
Remove unused code

See merge request OpenMW/openmw!3750
12 months ago
Evil Eye 672cefd594 Track checked EsmFile pointers instead of full paths 12 months ago
Andrei Kortunov fbd99583ca Move local variables in GUI code 12 months ago
elsid ad0ad625e5
Use single global static variable in Npc::getSoundIdFromSndGen for all parts
To eliminate checks for local static variable initialization.
12 months ago
psi29a a0c0509e3f Merge branch 'rm_unused_apps_includes' into 'master'
Use "" to quote apps/openmw includes and remove unused

See merge request OpenMW/openmw!3727
12 months ago
psi29a 5bd2020c23 Merge branch 'inactiveeffects' into 'master'
Make ActorActiveEffects:getEffect return an empty value and strip expired effects from __pairs

Closes #7440

See merge request OpenMW/openmw!3735
12 months ago
elsid 69cf507db8
Fix navmesh update on player changing tile
In cases when objects are not present on the scene (e.g. generated exterior
cells) navmesh is not updated because area that suppose to be covered with it
was not updated. It was updated only during cell change. This is a regression
from d15e1dca84.

Set TileCachedRecastMeshManager range on NavMeshManager update to make sure it
always covers correct area around player.

Return a union of objects, heightfields and water ranges from
getLimitedObjectsRange intersected with range provided above.
12 months ago
uramer 539dc1ee43 Remove confusing addPlayerQuestBindings method 12 months ago
Alexei Kotov 9e3b427a98 Unbreak un-paging (#7768) 12 months ago
elsid 66f5d70550
Use settings values to declare shortcut settings 12 months ago
Evil Eye 164b6309a7 Improve legibility 12 months ago
Alexei Kotov 5043e67e06 Replicate recent save loading prompt behavior (bug #7617) 12 months ago
Evil Eye 97dee00263 Merge branch 'remove_klass' into 'master'
Replace 'klass' by meaningful names

See merge request OpenMW/openmw!3745
12 months ago
Evil Eye 64673ea21f Merge branch 'editor_colour_settings' into 'master'
Use settings values to declare colour settings (#6876)

See merge request OpenMW/openmw!3747
12 months ago
Evil Eye 6756b8613d Restore beast race animations 12 months ago
Andrei Kortunov 9102fd4d57 Remove unused code 12 months ago
jvoisin 57066bcac1 Merge branch 'more_cleanup' into 'master'
Code cleanup

See merge request OpenMW/openmw!3746
12 months ago
Alexei Kotov 3af28439d6 Interrupt thunder SFX indoors (bug #6402) 12 months ago
psi29a 1bccd8483f Merge branch 'cs-icon-fix' into 'master'
Add OpenMW-CS RC file to app rather than static lib

See merge request OpenMW/openmw!3740
12 months ago
psi29a 7019405278 Merge branch 'rainloop' into 'master'
Support playing ambient and rain weather SFX at the same time (bug #7761)

Closes #7761

See merge request OpenMW/openmw!3738
12 months ago
uramer a6e2ceebb8 Don't clear menu UI on game load 12 months ago
uramer d1268acf95 Merge branch 'master' into menuscripts 12 months ago
elsid 067957f57b
Use "" to quote apps/openmw includes and remove unused
Using "" makes clangd to find unused includes which makes it quite easy to
remove them.
12 months ago
elsid cc0b00a0d2
Use settings values to declare colour settings 1 year ago
Andrei Kortunov 084fc80efd Use string_view for readonly string properties 1 year ago
Andrei Kortunov 8879d89e4a Replace 'klass' by meaningful names 1 year ago
Andrei Kortunov 4f65b7167a Do not copy vector for every door marker 1 year ago
Andrei Kortunov 828c40c710 Do not copy due to auto misuse 1 year ago
psi29a eedb96863e Merge branch 'editor_enum_settings' into 'master'
Use settings values to declare enum settings (#6876)

See merge request OpenMW/openmw!3724
1 year ago
Alexei Kotov 9b8d685578 Expose requested apparent sun position (not normalized) to post-processing 1 year ago
Alexei Kotov 1f26485c47 Fix exterior sun direction/position (bug #4898) 1 year ago
Alexei Kotov ed31a0354a Support playing ambient and rain weather SFX at the same time (bug #7761) 1 year ago
Alexei Kotov 01dcca3363 Make scripted animations shut down pathfinding (bug #5065) 1 year ago
Alexei Kotov c1c774e11d Update the spells window when constant effects are added/removed (bug #7475) 1 year ago
Alexei Kotov 961c53f1c4 Merge branch 'clickcrash' into 'master'
Don't crash when clicking the logo video

See merge request OpenMW/openmw!3736
1 year ago
Alexei Kotov dfc29974d0 Merge branch 'water_walking_cost' into 'master'
Use walking speed for swimming actor with water walking for pathfinding (#7758)

Closes #7758

See merge request OpenMW/openmw!3732
1 year ago
Alexei Kotov 8fff7215f4 Merge branch 'i-dont-have-a-type' into 'master'
Selection Groups Cleanup

Closes #7759

See merge request OpenMW/openmw!3731
1 year ago
AnyOldName3 6d37618301 Add OpenMW-CS RC file to app rather than static lib
Static libraries on Windows can't have embedded resources, so this mean the icon for the CS wasn't used.
This could have also been resolved by explicitly requesting the library type as OBJECT rather than letting it default to STATIC (as object libraries aren't a thing on-disk and are just an abstraction in CMake so you can use the same object files in different targets), but this seemed less invasive.

I also made it Win32-only as a Windows .rc file is meaningless on Unix, but it shouldn't be MSVC-only as MinGW can consume them.
1 year ago
Evil Eye 72c382aca6 Don't crash when clicking the logo video 1 year ago
Evil Eye 74a6c81d53 Make ActorActiveEffects:getEffect return an empty value and strip expired effects from __pairs 1 year ago
psi29a c3c8fa1e61 Merge branch 'sceneleak' into 'master'
Set paged refs' base node to null (#6335)

Closes #6335

See merge request OpenMW/openmw!3715
1 year ago
Dave Corley c563219b61 Cleanup(CS): Pass const ref when applicable for selection groups 1 year ago
Dave Corley 3ff1bae372 Cleanup(CS): More consistent names for selection group configs 1 year ago
Dave Corley c93b6dca0a Fix(CS): Add record type to selection groups to fix #7759 1 year ago
elsid 903299ce50
Avoid recomputing navigator flags when getting area costs 1 year ago
elsid 594bd6e136
Use walking speed for swimming actor with water walking for pathfinding
This will make them find shorter paths nearby shores.
1 year ago
jvoisin 689efa6d69 Merge branch 'mapnotes' into 'master'
Shorten global map marker notes like vanilla (bug #7619)

Closes #7619

See merge request OpenMW/openmw!3719
1 year ago
jvoisin 5837f97b99 Merge branch 'nonexclusivesettings' into 'master'
Downgrade Settings GUI mode to a modal (bug #6758)

Closes #6758

See merge request OpenMW/openmw!3720
1 year ago
Alexei Kotov 19a7d50a3f Merge branch 'error_codes' into 'master'
Use error messages instead of unhandled exceptions

See merge request OpenMW/openmw!3723
1 year ago
Alexei Kotov c5a3b516d6 Merge branch 'init_variables' into 'master'
Add missing initialization

See merge request OpenMW/openmw!3722
1 year ago
elsid 72fa4924dc
Use settings values to declare enum settings 1 year ago
Andrei Kortunov 7ffb2bc3c4 Use error messages instead of unhandled exceptions 1 year ago
Andrei Kortunov 8d3efd27ba Add missing initialization 1 year ago
Alexei Kotov febfccb356 Merge branch 'move_class_text' into 'master'
Avoid redundant string copies

See merge request OpenMW/openmw!3718
1 year ago
Alexei Kotov b132fd4373 Merge branch 'lua_action_fixes' into 'master'
Lua Action fixes

See merge request OpenMW/openmw!3717
1 year ago
Alexei Kotov 7310418984 Downgrade Settings GUI mode to a modal (bug #6758) 1 year ago
Alexei Kotov 19a6fd4e1b Merge branch 'display_esm_version' into 'master'
Improve format version in content selector

See merge request OpenMW/openmw!3709
1 year ago
Alexei Kotov 14942d7541 Shorten global map marker notes like vanilla (bug #7619) 1 year ago
Andrei Kortunov fb16871c80 Avoid redundant string copies 1 year ago
uramer e9b48e35c0 Coverity defects 1 year ago
Alexei Kotov 2ff2e3c2ef Merge branch 'raceless' into 'master'
Replace missing NPC races and default animations

Closes #6754

See merge request OpenMW/openmw!3703
1 year ago
Alexei Kotov 2fbdde34c6 Set paged refs' base node to null (#6335) 1 year ago
jvoisin 29c20cdb41 Merge branch 'fix_universal_id' into 'master'
Add missing UniversalId::mClass initialization

See merge request OpenMW/openmw!3707
1 year ago
Andrei Kortunov 93e50cc7aa Improve format version in content selector 1 year ago
Evil Eye ef4e5b45e3 Don't add custom anim source if it's a default animation but keep the skeleton 1 year ago
Evil Eye 03c791e61a Move animation handling to NpcAnimation 1 year ago
Evil Eye 84c15344ee Address feedback 1 year ago
Evil Eye 4636ab3f3e Update cmakelists 1 year ago
Evil Eye 5bd5c84018 Replace missing NPC races and default animations 1 year ago
elsid 94409ce172
Add missing UniversalId::mClass initialization 1 year ago
Alexei Kotov 78459314bf Merge branch 'impartialplayerbelike' into 'master'
Don't count the actor we're following as siding with us if we're in combat with them but they aren't in combat with us

Closes #7645

See merge request OpenMW/openmw!3650
1 year ago
jvoisin 31ac993374 Merge branch 'allthatglitters' into 'master'
Use NAM9 for stack count

Closes #2566

See merge request OpenMW/openmw!3698
1 year ago
Evil Eye e63933efa6 Use NAM9 for stack count 1 year ago
jvoisin 6180ad0e51 Merge branch 'sunlighting' into 'master'
Fix interior sun direction (bug #7585)

Closes #7585

See merge request OpenMW/openmw!3699
1 year ago
Evil Eye c97d0b5252 Merge branch 'weather' into 'master'
Make rain and snow ripple settings global rather than per-weather (#7748)

See merge request OpenMW/openmw!3706
1 year ago
Alexei Kotov 7e162a0d7c Merge branch 'lua_real_frame_time' into 'master'
Pass real frame duration to onFrame

See merge request OpenMW/openmw!3621
1 year ago
Alexei Kotov 0f9eb3d85a Merge branch 'editor_double_settings' into 'master'
Use settings values to declare double settings (#6876)

See merge request OpenMW/openmw!3701
1 year ago
Alexei Kotov 8a91e7057f Merge branch 'ref_id_universal_id' into 'master'
Fix RefId based UniversalId (#7747)

Closes #7747

See merge request OpenMW/openmw!3702
1 year ago
psi29a 7647af6e4e Merge branch 'friendlyhit' into 'master'
Correct friendly fire reaction for different damage sources (bug #7646)

Closes #7646

See merge request OpenMW/openmw!3694
1 year ago
psi29a 67955ac55f Merge branch 'treejunk' into 'master'
Discard additional tokens in non-expression contexts

See merge request OpenMW/openmw!3700
1 year ago
psi29a cb24475662 Merge branch 'what-a-selection-you-have' into 'master'
Feat(CS): Add More Selection Controls

See merge request OpenMW/openmw!3674
1 year ago
Alexei Kotov 640fa53bb8 Make rain and snow ripple settings global rather than per-weather (#7748) 1 year ago
Evil Eye 01eb333fad Merge branch 'generic_object_cache' into 'master'
Refactor GenericObjectCache and add unit tests

See merge request OpenMW/openmw!3689
1 year ago
psi29a e9f3e5c6d1 Merge branch 'lua_actions_electric_boogaloo' into 'master'
Lua actions take 3

See merge request OpenMW/openmw!2628
1 year ago
uramer 0e2e386dc9 Lua actions take 3 1 year ago
Evil Eye 3f6c3e24f4 Merge branch 'autoequipcrash' into 'master'
Avoid crashes upon Weapon::canBeEquipped attack check for the inventory doll (#7744)

Closes #7744

See merge request OpenMW/openmw!3697
1 year ago
elsid 39dd73263d
Avoid converting UniversalId to a different type via string 1 year ago
elsid 7b5310b569
Write StringRefId as is when converting UniversalId to string
To avoid adding quotes which on conversion ESM::StringRefId -> UniversalId ->
std::string -> UniversalId changes the string value adding quotes.
1 year ago
psi29a 2fde1ef3d8 Merge branch 'bodypartanimation' into 'master'
NpcAnimation: Assign parent animation time sources to body part controllers (bug #4822)

Closes #4822

See merge request OpenMW/openmw!3653
1 year ago
elsid 0fc78aa173
Make ESM::StringRefId compatible with std::string UniversalId 1 year ago
Alexei Kotov abbbd8cf69 Fix interior sun direction (bug #7585) 1 year ago
elsid 088d4ee5ce
Use settings values to declare double settings 1 year ago
elsid fd2fc63dd3
Support heterogeneous lookup in GenericObjectCache 1 year ago
elsid 56401a90a1
Merge GenericObjectCache update and remove functions
They are always called together. Single iteration over the items is more
efficient along with locking the mutex only once.
1 year ago
Evil Eye 02775c490b Discard additional tokens in non-expression contexts 1 year ago
jvoisin c9d4ca5320 Merge branch 'editor_string_settings' into 'master'
Use settings values to declare string settings (#6876)

See merge request OpenMW/openmw!3695
1 year ago