mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-02-22 23:09:43 +00:00
Code Issues Releases Wiki Activity
33078 commits 108 branches 68 tags 135 MiB
Commit graph

33078 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
jvoisin
c3dfc8c213 Merge branch 'detour_alloc' into 'master' 
Use RecastGlobalAllocator for Detour

See merge request OpenMW/openmw!3678
 2023-12-26 13:44:00 +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
ccbc7e6c72 Merge branch 'gcc_cache_size' into 'master' 
Reduce ccache size for gcc to 3G

See merge request OpenMW/openmw!3686
 2023-12-26 10:23:16 +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
elsid
3363616f56
Remove redundant startsWith function 2023-12-25 11:43:02 +01:00
elsid
8fe0832b38
Replace check for normalized distance =~ value by distance > 0 
We just need to make sure player moved, for how long is not important.

To avoid failures like: https://gitlab.com/OpenMW/openmw/-/jobs/5815281969:

TEST playerForwardRunning		FAILED [string "test.lua"]:80: [string "player.lua"]:44: Normalized forward runned distance: 0.782032 ~= 1.000000
 2023-12-25 11:15:41 +01:00
elsid
e5af4322c7
Add flag to print all openmw output in integration tests 2023-12-25 10:52:01 +01:00
Andrei Kortunov
f2c284688b Make content selector tooltip localizable 2023-12-25 11:29:36 +04:00
elsid
60940e7561
Fill absent values with previous present 
Due to OSG stats reporting usage and implementation for some attributes values
are missing on loading screens.
 2023-12-24 22:58:37 +01:00
elsid
c6b7dfc23a
Convert to float to compute stdev 2023-12-24 22:55:11 +01:00
elsid
26ffde0c04
Reduce ccache size for gcc to 3G 
To avoid having jobs being unable to generate the cache like
https://gitlab.com/OpenMW/openmw/-/jobs/5766643208:

Creating cache Ubuntu_GCC.ubuntu_22.04.v1-3-non_protected...
apt-cache/: found 1082 matching artifact files and directories
ccache/: found 7443 matching artifact files and directories
FATAL: write ../../../cache/OpenMW/openmw/Ubuntu_GCC.ubuntu_22.04.v1-3-non_protected/archive_991882895: no space left on device
Failed to create cache
 2023-12-24 22:22:24 +01:00
elsid
03a7643301
Add option to show timeseries delta graph to osg_stats.py 
To see spikes in a single frame and correlate them with frame duration.
 2023-12-24 22:15:10 +01:00