mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-24 00:39:49 +00:00
Code Issues Projects Releases Wiki Activity
33,450 Commits 17 Branches 68 Tags
Commit Graph

21864 Commits

Author SHA1 Message Date
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