Commit Graph

21550 Commits (macos_ci_fix)

Author SHA1 Message Date
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
5 months ago
jvoisin 31ac993374 Merge branch 'allthatglitters' into 'master'
Use NAM9 for stack count

Closes #2566

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

Closes #7585

See merge request OpenMW/openmw!3699
5 months 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
5 months ago
Alexei Kotov 7e162a0d7c Merge branch 'lua_real_frame_time' into 'master'
Pass real frame duration to onFrame

See merge request OpenMW/openmw!3621
5 months 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
5 months 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
5 months 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
5 months ago
psi29a 67955ac55f Merge branch 'treejunk' into 'master'
Discard additional tokens in non-expression contexts

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

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

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

See merge request OpenMW/openmw!2628
5 months ago
uramer 0e2e386dc9 Lua actions take 3 5 months 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
5 months ago
elsid 39dd73263d
Avoid converting UniversalId to a different type via string 5 months 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.
5 months 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
5 months ago
elsid 0fc78aa173
Make ESM::StringRefId compatible with std::string UniversalId 5 months ago
Alexei Kotov abbbd8cf69 Fix interior sun direction (bug #7585) 5 months ago
elsid 088d4ee5ce
Use settings values to declare double settings 5 months ago
elsid fd2fc63dd3
Support heterogeneous lookup in GenericObjectCache 5 months 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.
5 months ago
Evil Eye 02775c490b Discard additional tokens in non-expression contexts 5 months ago
jvoisin c9d4ca5320 Merge branch 'editor_string_settings' into 'master'
Use settings values to declare string settings (#6876)

See merge request OpenMW/openmw!3695
5 months ago
AnyOldName3 647bd2b572 Merge branch 'revert-78a8f9d6' into 'master'
Revert "Merge branch 'skating-olympics' into 'master'"

See merge request OpenMW/openmw!3696
5 months ago
jvoisin dcb403c114 Merge branch 'training' into 'master'
Use modified value for governing attribute training limit (#7742)

Closes #7742

See merge request OpenMW/openmw!3692
5 months ago
Alexei Kotov 30cff6f6ee Avoid crashes upon Weapon::canBeEquipped attack check for the inventory doll 5 months ago
Mads Buvik Sandvei 9d3ede7575 Revert "Merge branch 'skating-olympics' into 'master'"
This reverts merge request !3631
5 months ago
Alexei Kotov f1782ad8df Merge branch 'rm_unused_vfs' into 'master'
Remove unused vfs argument from correctMeshPath

See merge request OpenMW/openmw!3691
5 months ago
Alexei Kotov ca5e7d1ccb Merge branch 'fix_fallout3' into 'master'
Make traits and base data optional for ESM4 NPC

See merge request OpenMW/openmw!3682
5 months ago
Alexei Kotov d5428b23d8 Disable voiced responses to magical friendly hits (bug #7646)
Disable ranged friendly fire
5 months ago
Alexei Kotov 94c052dfef Classify the damage passed to Class::onHit 5 months ago
Evil Eye c6e5a28241 Merge branch 'crime_disposition' into 'master'
Implement crime disposition modifier

Closes #4683

See merge request OpenMW/openmw!3448
5 months ago
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.
5 months ago
jvoisin 291d19af48 Merge branch 'rm_ref_ptr' into 'master'
Avoid using osg::ref_ptr when reference is enough

See merge request OpenMW/openmw!3690
5 months ago
elsid 6a16686107
Use settings values to declare string settings 5 months ago
Alexei Kotov 1834597361 Move friendly fire logic to onHit 5 months ago
Alexei Kotov 1b594d874e Use modified value for governing attribute training limit (#7742) 5 months ago
AnyOldName3 a497d40689 Merge branch 'vfs_string_view' into 'master'
Use string_view for VFS (#6125)

See merge request OpenMW/openmw!3688
5 months ago
Cody Glassman 8f85c9194d lua - add bindings to get frame duration 5 months ago
psi29a a2c6009352 Merge branch 'editor_bool_settings' into 'master'
Use settings values to declare bool settings (#6876)

See merge request OpenMW/openmw!3679
5 months ago
jvoisin f80ba4e28c Apply 1 suggestion(s) to 1 file(s) 5 months ago
elsid 81a483fc7f
Remove unused vfs argument from correctMeshPath 5 months ago
elsid 145f7b5672
Avoid using osg::ref_ptr when reference is enough 5 months ago
psi29a 5d53eb7566 Merge branch 'russianroulette' into 'master'
BulletNifLoader: Handle NiSkinPartition, reduce false-positive collision generation for NiSwitchNode children

See merge request OpenMW/openmw!3634
5 months ago
psi29a ff514df5a1 Merge branch 'distortion' into 'master'
Distortion

See merge request OpenMW/openmw!3536
5 months ago
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
5 months ago
Andrei Kortunov ffffb427f5 Implement crime disposition modifier (bug 4683) 5 months ago