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
psi29a
60d1262d61
Merge branch 'askloadnotreallyrecent' into 'master'
...
Replicate recent save loading prompt behavior (bug #7617 )
Closes #7617
See merge request OpenMW/openmw!3710
2024-01-10 08:23:41 +00:00
psi29a
ce151692e9
Merge branch 'editor_shortcut_settings' into 'master'
...
Use settings values to declare shortcut settings (#6876 )
See merge request OpenMW/openmw!3753
2024-01-10 08:23:10 +00:00
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
2024-01-09 21:42:45 +00:00
Alexei Kotov
778fe606b8
Merge branch 'beastly' into 'master'
...
Restore beast race animations
See merge request OpenMW/openmw!3752
2024-01-09 21:42:20 +00:00
Evil Eye
ff78c13903
Merge branch 'unused_hrtf' into 'master'
...
Remove unused code
See merge request OpenMW/openmw!3750
2024-01-09 18:18:16 +00:00
Evil Eye
672cefd594
Track checked EsmFile pointers instead of full paths
2024-01-09 17:40:14 +01:00
Andrei Kortunov
fbd99583ca
Move local variables in GUI code
2024-01-09 16:11:44 +04:00
elsid
ad0ad625e5
Use single global static variable in Npc::getSoundIdFromSndGen for all parts
...
To eliminate checks for local static variable initialization.
2024-01-09 10:25:22 +01:00
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
2024-01-09 08:59:23 +00:00
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
2024-01-09 08:58:42 +00:00
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
2024-01-09 01:18:45 +01:00
uramer
539dc1ee43
Remove confusing addPlayerQuestBindings method
2024-01-08 21:57:59 +01:00
Alexei Kotov
9e3b427a98
Unbreak un-paging ( #7768 )
2024-01-08 23:41:51 +03:00
elsid
66f5d70550
Use settings values to declare shortcut settings
2024-01-08 21:09:12 +01:00
Evil Eye
164b6309a7
Improve legibility
2024-01-08 18:08:17 +01:00
Alexei Kotov
5043e67e06
Replicate recent save loading prompt behavior (bug #7617 )
2024-01-08 19:53:52 +03:00
Evil Eye
97dee00263
Merge branch 'remove_klass' into 'master'
...
Replace 'klass' by meaningful names
See merge request OpenMW/openmw!3745
2024-01-08 16:50:40 +00:00
Evil Eye
64673ea21f
Merge branch 'editor_colour_settings' into 'master'
...
Use settings values to declare colour settings (#6876 )
See merge request OpenMW/openmw!3747
2024-01-08 16:48:18 +00:00
Evil Eye
6756b8613d
Restore beast race animations
2024-01-08 17:18:08 +01:00
Andrei Kortunov
9102fd4d57
Remove unused code
2024-01-08 15:57:18 +04:00
jvoisin
57066bcac1
Merge branch 'more_cleanup' into 'master'
...
Code cleanup
See merge request OpenMW/openmw!3746
2024-01-08 11:35:24 +00:00
Alexei Kotov
3af28439d6
Interrupt thunder SFX indoors (bug #6402 )
2024-01-08 12:06:51 +03:00
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
2024-01-08 08:00:06 +00:00
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
2024-01-08 07:59:55 +00:00
uramer
a6e2ceebb8
Don't clear menu UI on game load
2024-01-07 23:29:20 +01:00
uramer
d1268acf95
Merge branch 'master' into menuscripts
2024-01-07 23:15:21 +01:00
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.
2024-01-07 17:57:11 +01:00
elsid
cc0b00a0d2
Use settings values to declare colour settings
2024-01-07 17:32:50 +01:00
Andrei Kortunov
084fc80efd
Use string_view for readonly string properties
2024-01-07 19:21:45 +04:00
Andrei Kortunov
8879d89e4a
Replace 'klass' by meaningful names
2024-01-07 19:12:49 +04:00
Andrei Kortunov
4f65b7167a
Do not copy vector for every door marker
2024-01-07 18:53:07 +04:00
Andrei Kortunov
828c40c710
Do not copy due to auto misuse
2024-01-07 18:52:10 +04:00
psi29a
eedb96863e
Merge branch 'editor_enum_settings' into 'master'
...
Use settings values to declare enum settings (#6876 )
See merge request OpenMW/openmw!3724
2024-01-07 10:14:07 +00:00
Alexei Kotov
9b8d685578
Expose requested apparent sun position (not normalized) to post-processing
2024-01-07 04:57:02 +03:00
Alexei Kotov
1f26485c47
Fix exterior sun direction/position (bug #4898 )
2024-01-07 04:57:02 +03:00
Alexei Kotov
ed31a0354a
Support playing ambient and rain weather SFX at the same time (bug #7761 )
2024-01-07 04:56:36 +03:00
Alexei Kotov
01dcca3363
Make scripted animations shut down pathfinding (bug #5065 )
2024-01-07 04:55:49 +03:00
Alexei Kotov
c1c774e11d
Update the spells window when constant effects are added/removed (bug #7475 )
2024-01-07 04:55:29 +03:00
Alexei Kotov
961c53f1c4
Merge branch 'clickcrash' into 'master'
...
Don't crash when clicking the logo video
See merge request OpenMW/openmw!3736
2024-01-07 01:21:56 +00:00
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
2024-01-07 01:19:43 +00:00
Alexei Kotov
8fff7215f4
Merge branch 'i-dont-have-a-type' into 'master'
...
Selection Groups Cleanup
Closes #7759
See merge request OpenMW/openmw!3731
2024-01-07 01:18:26 +00:00
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.
2024-01-06 16:56:52 +00:00
Evil Eye
72c382aca6
Don't crash when clicking the logo video
2024-01-06 14:23:08 +01:00
Evil Eye
74a6c81d53
Make ActorActiveEffects:getEffect return an empty value and strip expired effects from __pairs
2024-01-06 14:14:29 +01:00
psi29a
c3c8fa1e61
Merge branch 'sceneleak' into 'master'
...
Set paged refs' base node to null (#6335 )
Closes #6335
See merge request OpenMW/openmw!3715
2024-01-06 11:07:07 +00:00
Dave Corley
c563219b61
Cleanup(CS): Pass const ref when applicable for selection groups
2024-01-05 19:39:53 -06:00
Dave Corley
3ff1bae372
Cleanup(CS): More consistent names for selection group configs
2024-01-05 19:39:53 -06:00
Dave Corley
c93b6dca0a
Fix(CS): Add record type to selection groups to fix #7759
2024-01-05 19:39:53 -06:00
elsid
903299ce50
Avoid recomputing navigator flags when getting area costs
2024-01-06 02:39:42 +01:00
elsid
594bd6e136
Use walking speed for swimming actor with water walking for pathfinding
...
This will make them find shorter paths nearby shores.
2024-01-06 02:39:40 +01:00
jvoisin
689efa6d69
Merge branch 'mapnotes' into 'master'
...
Shorten global map marker notes like vanilla (bug #7619 )
Closes #7619
See merge request OpenMW/openmw!3719
2024-01-05 13:05:56 +00:00
jvoisin
5837f97b99
Merge branch 'nonexclusivesettings' into 'master'
...
Downgrade Settings GUI mode to a modal (bug #6758 )
Closes #6758
See merge request OpenMW/openmw!3720
2024-01-05 13:04:20 +00:00
Alexei Kotov
19a7d50a3f
Merge branch 'error_codes' into 'master'
...
Use error messages instead of unhandled exceptions
See merge request OpenMW/openmw!3723
2024-01-04 20:35:37 +00:00
Alexei Kotov
c5a3b516d6
Merge branch 'init_variables' into 'master'
...
Add missing initialization
See merge request OpenMW/openmw!3722
2024-01-04 20:31:55 +00:00
elsid
72fa4924dc
Use settings values to declare enum settings
2024-01-03 22:55:00 +01:00
Andrei Kortunov
7ffb2bc3c4
Use error messages instead of unhandled exceptions
2024-01-03 21:48:25 +04:00
Andrei Kortunov
8d3efd27ba
Add missing initialization
2024-01-03 19:25:33 +04:00
Alexei Kotov
febfccb356
Merge branch 'move_class_text' into 'master'
...
Avoid redundant string copies
See merge request OpenMW/openmw!3718
2024-01-03 15:24:22 +00:00
Alexei Kotov
b132fd4373
Merge branch 'lua_action_fixes' into 'master'
...
Lua Action fixes
See merge request OpenMW/openmw!3717
2024-01-03 15:19:18 +00:00
Alexei Kotov
7310418984
Downgrade Settings GUI mode to a modal (bug #6758 )
2024-01-02 22:32:52 +03:00
Alexei Kotov
19a6fd4e1b
Merge branch 'display_esm_version' into 'master'
...
Improve format version in content selector
See merge request OpenMW/openmw!3709
2024-01-02 17:32:21 +00:00
Alexei Kotov
14942d7541
Shorten global map marker notes like vanilla (bug #7619 )
2024-01-02 18:50:32 +03:00
Andrei Kortunov
fb16871c80
Avoid redundant string copies
2024-01-02 18:30:35 +04:00
uramer
e9b48e35c0
Coverity defects
2024-01-02 13:54:02 +01:00
Alexei Kotov
2ff2e3c2ef
Merge branch 'raceless' into 'master'
...
Replace missing NPC races and default animations
Closes #6754
See merge request OpenMW/openmw!3703
2024-01-02 12:37:03 +00:00
Alexei Kotov
2fbdde34c6
Set paged refs' base node to null ( #6335 )
2024-01-02 02:31:47 +03:00
jvoisin
29c20cdb41
Merge branch 'fix_universal_id' into 'master'
...
Add missing UniversalId::mClass initialization
See merge request OpenMW/openmw!3707
2024-01-01 23:05:57 +00:00
Andrei Kortunov
93e50cc7aa
Improve format version in content selector
2024-01-01 18:16:58 +04:00
Evil Eye
ef4e5b45e3
Don't add custom anim source if it's a default animation but keep the skeleton
2024-01-01 15:06:32 +01:00
Evil Eye
03c791e61a
Move animation handling to NpcAnimation
2024-01-01 13:58:55 +01:00
Evil Eye
84c15344ee
Address feedback
2024-01-01 13:07:43 +01:00
Evil Eye
4636ab3f3e
Update cmakelists
2024-01-01 13:07:43 +01:00
Evil Eye
5bd5c84018
Replace missing NPC races and default animations
2024-01-01 13:07:43 +01:00
elsid
94409ce172
Add missing UniversalId::mClass initialization
2024-01-01 01:12:19 +01:00
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
2023-12-31 17:33:08 +00:00
jvoisin
31ac993374
Merge branch 'allthatglitters' into 'master'
...
Use NAM9 for stack count
Closes #2566
See merge request OpenMW/openmw!3698
2023-12-31 17:12:46 +00:00
Evil Eye
e63933efa6
Use NAM9 for stack count
2023-12-31 17:12:46 +00:00
jvoisin
6180ad0e51
Merge branch 'sunlighting' into 'master'
...
Fix interior sun direction (bug #7585 )
Closes #7585
See merge request OpenMW/openmw!3699
2023-12-31 17:12:32 +00:00
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
2023-12-31 11:01:14 +00:00
Alexei Kotov
7e162a0d7c
Merge branch 'lua_real_frame_time' into 'master'
...
Pass real frame duration to onFrame
See merge request OpenMW/openmw!3621
2023-12-31 01:21:41 +00:00
Alexei Kotov
0f9eb3d85a
Merge branch 'editor_double_settings' into 'master'
...
Use settings values to declare double settings (#6876 )
See merge request OpenMW/openmw!3701
2023-12-30 15:20:25 +00:00
Alexei Kotov
8a91e7057f
Merge branch 'ref_id_universal_id' into 'master'
...
Fix RefId based UniversalId (#7747 )
Closes #7747
See merge request OpenMW/openmw!3702
2023-12-30 10:59:03 +00:00
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
2023-12-30 09:43:19 +00:00
psi29a
67955ac55f
Merge branch 'treejunk' into 'master'
...
Discard additional tokens in non-expression contexts
See merge request OpenMW/openmw!3700
2023-12-30 09:42:26 +00:00
psi29a
cb24475662
Merge branch 'what-a-selection-you-have' into 'master'
...
Feat(CS): Add More Selection Controls
See merge request OpenMW/openmw!3674
2023-12-30 09:40:29 +00:00
Alexei Kotov
640fa53bb8
Make rain and snow ripple settings global rather than per-weather ( #7748 )
2023-12-30 04:24:18 +03:00
Evil Eye
01eb333fad
Merge branch 'generic_object_cache' into 'master'
...
Refactor GenericObjectCache and add unit tests
See merge request OpenMW/openmw!3689
2023-12-29 21:22:30 +00:00
psi29a
e9f3e5c6d1
Merge branch 'lua_actions_electric_boogaloo' into 'master'
...
Lua actions take 3
See merge request OpenMW/openmw!2628
2023-12-29 18:56:59 +00:00
uramer
0e2e386dc9
Lua actions take 3
2023-12-29 18:56:59 +00:00
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
2023-12-29 14:30:49 +00:00
elsid
39dd73263d
Avoid converting UniversalId to a different type via string
2023-12-29 14:15:28 +01:00
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.
2023-12-29 14:12:36 +01:00
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
2023-12-29 13:09:56 +00:00
elsid
0fc78aa173
Make ESM::StringRefId compatible with std::string UniversalId
2023-12-29 13:10:13 +01:00
Alexei Kotov
abbbd8cf69
Fix interior sun direction (bug #7585 )
2023-12-29 02:21:39 +03:00
elsid
088d4ee5ce
Use settings values to declare double settings
2023-12-28 22:08:04 +01:00
elsid
fd2fc63dd3
Support heterogeneous lookup in GenericObjectCache
2023-12-28 21:58:41 +01:00
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.
2023-12-28 21:58:33 +01:00
Evil Eye
02775c490b
Discard additional tokens in non-expression contexts
2023-12-28 21:49:25 +01:00
jvoisin
c9d4ca5320
Merge branch 'editor_string_settings' into 'master'
...
Use settings values to declare string settings (#6876 )
See merge request OpenMW/openmw!3695
2023-12-28 14:51:09 +00:00
