mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-14 06:40:40 +00:00
Code Issues Projects Releases Wiki Activity
33,162 Commits 17 Branches 67 Tags
Commit Graph

21680 Commits

Author SHA1 Message Date
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
Alexei Kotov
51b05647e2 Merge branch 'move_files' into 'master' 
Move *.ui files for different applications to different folders

See merge request OpenMW/openmw!3659
 2023-12-24 09:58:24 +00:00
elsid
edaac852d1
Use settings values to declare bool settings 2023-12-24 00:25:18 +01:00
Dave Corley
25f3e09da9 Fix(CS): Correct build issues on some compilers 2023-12-23 15:05:13 -06:00
Dave Corley
33ce7782e9 Feat(worldspacewidget.cpp): Add shortcut to clear selection 2023-12-23 15:05:13 -06:00
Dave Corley
a7f8ee1106 Feat(instancemode.cpp): Implement save/load selection group functions 2023-12-23 15:05:13 -06:00
Dave Corley
23e75bed8f Feat(object.cpp): Make object outline an optional argument when selecting it 2023-12-23 15:05:13 -06:00
Dave Corley
f287914f1e Feat(cell.cpp): Add select/unhide functions in cell.cpp 2023-12-23 15:05:13 -06:00
Dave Corley
8edc148418 Feat(CS): Implement select/unhide functions into interior & exterior 
worldspace widgets
 2023-12-23 15:05:13 -06:00
Dave Corley
94eadd436d Feat(worldspacewidget.cpp): Implement shortcut for visibility switching 
& unhiding all instances
 2023-12-23 15:05:13 -06:00
Dave Corley
9d155afc15 Feat(worldspacewidget.hpp): Add virtual decs for selection functions 2023-12-23 15:05:13 -06:00
Dave Corley
cf098033b9 Feat(Mask.hpp): Add mask for hidden objects 2023-12-23 15:05:13 -06:00
Dave Corley
0ec6dcbf1f Feat(Settings): Implement shortcuts for hiding refs & selection groups 2023-12-23 15:05:13 -06:00
Dave Corley
24443e00bf Feat(CS): Implement selection groups into data model 2023-12-23 15:05:13 -06:00
Alexei Kotov
c6a1196ec7 Merge branch 'editor_int_settings' into 'master' 
Use settings values to declare int settings (#6876)

See merge request OpenMW/openmw!3668
 2023-12-23 15:48:43 +00:00