mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-31 14:45:35 +00:00
Code Issues Releases Wiki Activity
33036 commits 108 branches 66 tags 134 MiB
Commit graph

21593 commits

Author SHA1 Message Date
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
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
Evil Eye
af40d7ce80 End pursue package if the target doens't have a bounty 2023-12-23 15:50:36 +01:00
Alexei Kotov
099c39ae87 Use fallback weather ripple settings (bug #7292) 2023-12-23 11:46:08 +03:00
elsid
4067e10f3f
Use gamepad cursor speed setting 2023-12-22 19:24:02 +01:00
AnyOldName3
8cafcf702f Merge branch 'sdl_errors' into 'master' 
Handle and log some controller related SDL errors (#7728)

Closes #7728

See merge request OpenMW/openmw!3669
 2023-12-22 14:57:21 +00:00
Alexei Kotov
f11c66794b Merge branch 'advancedalchemy' into 'master' 
Make ingredient order affect effect order

Closes #7676

See merge request OpenMW/openmw!3667
 2023-12-22 08:25:24 +00:00
jvoisin
2873f971a6 Merge branch 'downsized' into 'master' 
Remove explicitly sized reads

See merge request OpenMW/openmw!3663
 2023-12-21 22:50:10 +00:00
Cody Glassman
187f63d3d3 support postprocess distortion 2023-12-21 10:56:38 -08:00
Alexei Kotov
51cb3b08cb Merge branch 'followthecrab' into 'master' 
Stop combat when stacking a new AI package

Closes #7661

See merge request OpenMW/openmw!3665
 2023-12-21 07:08:36 +00:00
elsid
78a0e0eb3b
Handle and log some controller related SDL errors 
SDL_GameControllerNameForIndex may return nullptr indicating an error which
causes a crash when passed to log.
 2023-12-21 02:19:24 +01:00
Evil Eye
532a330aac mac plz 2023-12-20 13:58:43 +01:00
Evil Eye
3e101ab409 Add a variadic getHNOT 2023-12-20 12:28:34 +01:00
elsid
66b1745520
Use settings values to declare int settings 2023-12-20 12:26:36 +01:00
Evil Eye
1223d12b29 Make ingredient order affect effect order 2023-12-20 11:56:12 +01:00
Alexei Kotov
78a8f9d692 Merge branch 'skating-olympics' into 'master' 
De-jank stationary animations

Closes #3330

See merge request OpenMW/openmw!3631
 2023-12-20 12:35:41 +03:00
Alexei Kotov
d97563c830 Merge branch 'csicorruption' into 'master' 
Allow ModPCCrimeLevel to clear crimes and cap bounties

Closes #7416

See merge request OpenMW/openmw!3664
 2023-12-20 08:24:14 +00:00
Alexei Kotov
7074ea02b7 Merge branch 'qt_fix' into 'master' 
Register language selector properly

Closes #7727

See merge request OpenMW/openmw!3666
 2023-12-20 04:15:17 +00:00
Evil Eye
8a1ca870eb Stop infighting when gaining new allies 2023-12-19 21:23:10 +01:00
Andrei Kortunov
e6690bbcc7 Use CMAKE_CURRENT_SOURCE_DIR instead of CMAKE_SOURCE_DIR 2023-12-19 19:58:52 +04:00
Evil Eye
36b61d7074 Merge branch 'copy-that' into 'master' 
Feat(CS): Implement Instance Cloning

See merge request OpenMW/openmw!3654
 2023-12-19 11:27:51 +00:00
Andrei Kortunov
2e041073fc Move *.ui files for different applications to different folders 2023-12-19 15:21:08 +04:00
Andrei Kortunov
8d06a99507 Register language selector properly 2023-12-19 10:20:31 +04:00
Mads Buvik Sandvei
00b1cd8c08 Replace movement() with eraseMovementIf() 2023-12-18 22:50:45 +01:00
Mads Buvik Sandvei
5a6dbf8714 Comments 2023-12-18 22:43:45 +01:00
Evil Eye
94b129cc62 Stop combat when stacking a new AI package 2023-12-18 22:18:26 +01:00
Evil Eye
77cf9284b7 Allow ModPCCrimeLevel to clear crimes and cap bounties 2023-12-18 21:52:17 +01:00
Alexei Kotov
7922f0e7f8 Merge branch 'editor_modifier_settings' into 'master' 
Use settings values to declare modifier settings (#6876)

See merge request OpenMW/openmw!3656
 2023-12-18 00:37:55 +00:00
jvoisin
2c1810c6db Merge branch 'hoteltransylvania' into 'master' 
Outlaw vampires and werewolves (bugs #7723, #7724)

Closes #7723 and #7724

See merge request OpenMW/openmw!3661
 2023-12-17 19:08:32 +00:00
Evil Eye
88731f864e Add imports 2023-12-17 15:21:12 +01:00
Evil Eye
37415b0382 Don't use getExact to read structs 2023-12-17 15:16:32 +01:00
Evil Eye
dbf9d42cc5 Remove sized reads from essimporter 2023-12-17 14:03:45 +01:00
Evil Eye
a9e6e63c4e Remove fixed size reads 2023-12-17 13:00:14 +01:00
Alexei Kotov
82982bbc05 Outlaw vampires and werewolves (bugs #7723, #7724) 2023-12-15 23:46:10 +03:00
jvoisin
ec480db9ac Merge branch 'constanteffect' into 'master' 
For constant enchantments, allow on-self range for any effect (bug #7643)

Closes #7643

See merge request OpenMW/openmw!3657
 2023-12-15 13:35:47 +00:00
Alexei Kotov
46dc290b75 Merge branch 'more_localizable' into 'master' 
Make hardcoded strings in Launcher and Wizard localizable

See merge request OpenMW/openmw!3630
 2023-12-15 04:41:31 +00:00
Alexei Kotov
ba7932f21c Merge branch 'fix_cs_settings_key_bindings_page' into 'master' 
Fix CS Key Binding settings page

See merge request OpenMW/openmw!3655
 2023-12-15 03:31:55 +00:00
jvoisin
c969aa42b7 Merge branch 'aifollow' into 'master' 
Base AiFollow activation range on follow distance (bug #7685)

Closes #7685

See merge request OpenMW/openmw!3652
 2023-12-14 20:14:20 +00:00
Alexei Kotov
27bd70a976 For constant enchantments, allow on-self range for any effect (bug #7643) 2023-12-14 15:55:24 +03:00
elsid
a29ae07957
Fix CS Key Binding settings page 
This got broken by e07d8f3066. Creating QGridLayout with parent and setting it
later has not the same effect.
 2023-12-14 00:29:18 +01:00
elsid
11db9eec1d
Use settings values to declare modifier settings 2023-12-13 23:29:35 +01:00