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
ed31a0354a
Support playing ambient and rain weather SFX at the same time (bug #7761 )
2024-01-07 04:56:36 +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
AnyOldName3
647bd2b572
Merge branch 'revert-78a8f9d6' into 'master'
...
Revert "Merge branch 'skating-olympics' into 'master'"
See merge request OpenMW/openmw!3696
2023-12-28 00:59:07 +00:00
jvoisin
dcb403c114
Merge branch 'training' into 'master'
...
Use modified value for governing attribute training limit (#7742 )
Closes #7742
See merge request OpenMW/openmw!3692
2023-12-27 22:49:23 +00:00
Alexei Kotov
30cff6f6ee
Avoid crashes upon Weapon::canBeEquipped attack check for the inventory doll
2023-12-28 01:49:18 +03:00
Mads Buvik Sandvei
9d3ede7575
Revert "Merge branch 'skating-olympics' into 'master'"
...
This reverts merge request !3631
2023-12-27 19:11:49 +00:00
Alexei Kotov
f1782ad8df
Merge branch 'rm_unused_vfs' into 'master'
...
Remove unused vfs argument from correctMeshPath
See merge request OpenMW/openmw!3691
2023-12-27 17:23:16 +00:00
Alexei Kotov
ca5e7d1ccb
Merge branch 'fix_fallout3' into 'master'
...
Make traits and base data optional for ESM4 NPC
See merge request OpenMW/openmw!3682
2023-12-27 17:10:13 +00:00
Alexei Kotov
d5428b23d8
Disable voiced responses to magical friendly hits (bug #7646 )
...
Disable ranged friendly fire
2023-12-27 20:05:08 +03:00
Alexei Kotov
94c052dfef
Classify the damage passed to Class::onHit
2023-12-27 20:05:08 +03:00
Evil Eye
c6e5a28241
Merge branch 'crime_disposition' into 'master'
...
Implement crime disposition modifier
Closes #4683
See merge request OpenMW/openmw!3448
2023-12-27 11:53:56 +00:00
elsid
13c8e04b27
Make traits and base data optional for ESM4 NPC
...
Fallout 3 is not fully supported and it causes failures to load NPCs. Log errors
and make sure there is no nullptr dereference.
2023-12-27 10:07:48 +01:00
jvoisin
291d19af48
Merge branch 'rm_ref_ptr' into 'master'
...
Avoid using osg::ref_ptr when reference is enough
See merge request OpenMW/openmw!3690
2023-12-27 08:03:16 +00:00
elsid
6a16686107
Use settings values to declare string settings
2023-12-27 00:33:45 +01:00
Alexei Kotov
1834597361
Move friendly fire logic to onHit
2023-12-27 01:03:23 +03:00
Alexei Kotov
1b594d874e
Use modified value for governing attribute training limit ( #7742 )
2023-12-26 21:53:49 +03:00
AnyOldName3
a497d40689
Merge branch 'vfs_string_view' into 'master'
...
Use string_view for VFS (#6125 )
See merge request OpenMW/openmw!3688
2023-12-26 18:40:25 +00:00
Cody Glassman
8f85c9194d
lua - add bindings to get frame duration
2023-12-26 09:15:55 -08:00
psi29a
a2c6009352
Merge branch 'editor_bool_settings' into 'master'
...
Use settings values to declare bool settings (#6876 )
See merge request OpenMW/openmw!3679
2023-12-26 15:31:14 +00:00
jvoisin
f80ba4e28c
Apply 1 suggestion(s) to 1 file(s)
2023-12-26 13:54:23 +00:00
elsid
81a483fc7f
Remove unused vfs argument from correctMeshPath
2023-12-26 14:14:52 +01:00
elsid
145f7b5672
Avoid using osg::ref_ptr when reference is enough
2023-12-26 11:35:03 +01:00
psi29a
5d53eb7566
Merge branch 'russianroulette' into 'master'
...
BulletNifLoader: Handle NiSkinPartition, reduce false-positive collision generation for NiSwitchNode children
See merge request OpenMW/openmw!3634
2023-12-26 10:33:20 +00:00
psi29a
ff514df5a1
Merge branch 'distortion' into 'master'
...
Distortion
See merge request OpenMW/openmw!3536
2023-12-26 10:31:51 +00:00
psi29a
f80bbd4e39
Merge branch 'these-are-the-datas-youre-looking-for' into 'master'
...
Add game-independent VFS directory to CS' VFS
See merge request OpenMW/openmw!3683
2023-12-26 10:21:58 +00:00
Andrei Kortunov
ffffb427f5
Implement crime disposition modifier (bug 4683)
2023-12-26 14:04:23 +04:00
jvoisin
b39a6ae9cd
Merge branch 'smoothbraincriminal' into 'master'
...
End pursue package if the target doesn't have a bounty
See merge request OpenMW/openmw!3677
2023-12-26 09:59:24 +00:00
elsid
851bad4262
Merge branch 'precipitationripples' into 'master'
...
Use fallback weather ripple settings (bug #7292 )
Closes #7292
See merge request OpenMW/openmw!3671
2023-12-26 09:51:23 +00:00
elsid
dc8c979d1a
Merge branch 'avoid_duplication' into 'master'
...
Store generated UI by pointer to avoid redundant processing
See merge request OpenMW/openmw!3680
2023-12-26 09:39:47 +00:00
elsid
71e33cf8b2
Add unit tests for GenericObjectCache
2023-12-25 14:12:16 +01:00
elsid
0d8dc5aabc
Use string_view for VFS lookups
2023-12-25 12:21:01 +01:00
AnyOldName3
01e2e56f97
Add game-independent VFS directory to CS' VFS
...
This should have been like this all along - all the other applications that use the game's VFS do this.
2023-12-24 17:55:49 +00:00
Andrei Kortunov
1ca2a0ef66
Store generated UI by pointer to avoid redundant processing
2023-12-24 20:35:19 +04:00
Andrei Kortunov
81f7149f42
Use a multiplication sign for custom resolution
2023-12-24 19:00:16 +04:00
