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 |
|
uramer
|
c23858bf1c
|
Merge branch 'playercontrols' into 'master'
Remove duplicate ToggleWeapon trigger handler registration
See merge request OpenMW/openmw!3705
|
2023-12-30 08:11:38 +00:00 |
|
Alexei Kotov
|
91a01ae1e2
|
Remove duplicate ToggleWeapon trigger handler registration
|
2023-12-30 03:23:27 +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 |
|
Cody Glassman
|
c53abd870b
|
Merge branch 'waterscatter' into 'master'
Use sun visibility for sunlight scattering (bug #7309)
Closes #7309
See merge request OpenMW/openmw!3478
|
2023-12-28 22:18:03 +00:00 |
|
elsid
|
088d4ee5ce
|
Use settings values to declare double settings
|
2023-12-28 22:08:04 +01:00 |
|
elsid
|
7a817d3147
|
Apply project naming styleguide to GenericObjectCache
|
2023-12-28 21:58:42 +01:00 |
|
elsid
|
45b1b4f1e0
|
Remove redundant ObjectCacheMap alias
|
2023-12-28 21:58:42 +01:00 |
|
elsid
|
7b1ee2780b
|
Use ranged for loops in GenericObjectCache
|
2023-12-28 21:58:42 +01:00 |
|
elsid
|
2f0613c8d4
|
Remove user defined destructor for GenericObjectCache
|
2023-12-28 21:58:42 +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 |
|
elsid
|
2a797cb4e4
|
Merge branch 'CompositeMapRendererFreeze' into 'master'
Implement fix for the CompositeMapRender freeze
Closes #7696
See merge request OpenMW/openmw!3626
|
2023-12-28 09:37:12 +00:00 |
|
alekulyn
|
f71862fb76
|
Remove unnecessary code
|
2023-12-27 22:30:04 -06:00 |
|
alekulyn
|
310b8206dd
|
Fix #7696
|
2023-12-27 22:15:48 -06: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 |
|
Alexei Kotov
|
0b5823d5b7
|
Merge branch 'osg_stats_timeseries_delta' into 'master'
Add timeseries delta graph to osg_stats.py
See merge request OpenMW/openmw!3685
|
2023-12-27 20:25:38 +00: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 |
|
Cody Glassman
|
9991836aa9
|
Merge branch 'more_than' into 'master'
Update custom-shader-effects.rst to reflect new change
See merge request OpenMW/openmw!3693
|
2023-12-27 17:14:34 +00:00 |
|
Abdu Sharif
|
b2f972df3d
|
Update custom-shader-effects.rst to reflect new change
|
2023-12-27 17:14:33 +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 |
|
Evil Eye
|
8064a81569
|
Merge branch 'integration_tests' into 'master'
Replace check for normalized distance =~ value by distance > 0 in the integration tests
See merge request OpenMW/openmw!3684
|
2023-12-27 11:40:28 +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 |
|
AnyOldName3
|
4567374e1f
|
Merge branch 'localize_tooltip' into 'master'
Make content selector tooltip localizable
See merge request OpenMW/openmw!3687
|
2023-12-26 18:38:35 +00:00 |
|
Cody Glassman
|
8f85c9194d
|
lua - add bindings to get frame duration
|
2023-12-26 09:15:55 -08:00 |
|