Commit Graph

21503 Commits (f71862fb7659c959a804b42efb8c007745be5850)

Author SHA1 Message Date
AnyOldName3 647bd2b572 Merge branch 'revert-78a8f9d6' into 'master'
Revert "Merge branch 'skating-olympics' into 'master'"

See merge request OpenMW/openmw!3696
1 year ago
jvoisin dcb403c114 Merge branch 'training' into 'master'
Use modified value for governing attribute training limit (#7742)

Closes #7742

See merge request OpenMW/openmw!3692
1 year ago
Mads Buvik Sandvei 9d3ede7575 Revert "Merge branch 'skating-olympics' into 'master'"
This reverts merge request !3631
1 year ago
Alexei Kotov f1782ad8df Merge branch 'rm_unused_vfs' into 'master'
Remove unused vfs argument from correctMeshPath

See merge request OpenMW/openmw!3691
1 year ago
Alexei Kotov ca5e7d1ccb Merge branch 'fix_fallout3' into 'master'
Make traits and base data optional for ESM4 NPC

See merge request OpenMW/openmw!3682
1 year ago
Evil Eye c6e5a28241 Merge branch 'crime_disposition' into 'master'
Implement crime disposition modifier

Closes #4683

See merge request OpenMW/openmw!3448
1 year ago
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.
1 year ago
jvoisin 291d19af48 Merge branch 'rm_ref_ptr' into 'master'
Avoid using osg::ref_ptr when reference is enough

See merge request OpenMW/openmw!3690
1 year ago
Alexei Kotov 1b594d874e Use modified value for governing attribute training limit (#7742) 1 year ago
AnyOldName3 a497d40689 Merge branch 'vfs_string_view' into 'master'
Use string_view for VFS (#6125)

See merge request OpenMW/openmw!3688
1 year ago
psi29a a2c6009352 Merge branch 'editor_bool_settings' into 'master'
Use settings values to declare bool settings (#6876)

See merge request OpenMW/openmw!3679
1 year ago
elsid 81a483fc7f
Remove unused vfs argument from correctMeshPath 1 year ago
elsid 145f7b5672
Avoid using osg::ref_ptr when reference is enough 1 year ago
psi29a 5d53eb7566 Merge branch 'russianroulette' into 'master'
BulletNifLoader: Handle NiSkinPartition, reduce false-positive collision generation for NiSwitchNode children

See merge request OpenMW/openmw!3634
1 year ago
psi29a ff514df5a1 Merge branch 'distortion' into 'master'
Distortion

See merge request OpenMW/openmw!3536
1 year ago
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
1 year ago
Andrei Kortunov ffffb427f5 Implement crime disposition modifier (bug 4683) 1 year ago
jvoisin b39a6ae9cd Merge branch 'smoothbraincriminal' into 'master'
End pursue package if the target doesn't have a bounty

See merge request OpenMW/openmw!3677
1 year ago
elsid 851bad4262 Merge branch 'precipitationripples' into 'master'
Use fallback weather ripple settings (bug #7292)

Closes #7292

See merge request OpenMW/openmw!3671
1 year ago
elsid dc8c979d1a Merge branch 'avoid_duplication' into 'master'
Store generated UI by pointer to avoid redundant processing

See merge request OpenMW/openmw!3680
1 year ago
elsid 0d8dc5aabc
Use string_view for VFS lookups 1 year ago
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.
1 year ago
Andrei Kortunov 1ca2a0ef66 Store generated UI by pointer to avoid redundant processing 1 year ago
Andrei Kortunov 81f7149f42 Use a multiplication sign for custom resolution 1 year ago
Alexei Kotov 51b05647e2 Merge branch 'move_files' into 'master'
Move *.ui files for different applications to different folders

See merge request OpenMW/openmw!3659
1 year ago
elsid edaac852d1
Use settings values to declare bool settings 1 year ago
Alexei Kotov c6a1196ec7 Merge branch 'editor_int_settings' into 'master'
Use settings values to declare int settings (#6876)

See merge request OpenMW/openmw!3668
1 year ago
Evil Eye af40d7ce80 End pursue package if the target doens't have a bounty 1 year ago
Alexei Kotov 099c39ae87 Use fallback weather ripple settings (bug #7292) 1 year ago
elsid 4067e10f3f
Use gamepad cursor speed setting 1 year ago
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
1 year ago
Alexei Kotov f11c66794b Merge branch 'advancedalchemy' into 'master'
Make ingredient order affect effect order

Closes #7676

See merge request OpenMW/openmw!3667
1 year ago
jvoisin 2873f971a6 Merge branch 'downsized' into 'master'
Remove explicitly sized reads

See merge request OpenMW/openmw!3663
1 year ago
Cody Glassman 187f63d3d3 support postprocess distortion 1 year ago
Alexei Kotov 51cb3b08cb Merge branch 'followthecrab' into 'master'
Stop combat when stacking a new AI package

Closes #7661

See merge request OpenMW/openmw!3665
1 year ago
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.
1 year ago
Evil Eye 532a330aac mac plz 1 year ago
Evil Eye 3e101ab409 Add a variadic getHNOT 1 year ago
elsid 66b1745520
Use settings values to declare int settings 1 year ago
Evil Eye 1223d12b29 Make ingredient order affect effect order 1 year ago
Alexei Kotov 78a8f9d692 Merge branch 'skating-olympics' into 'master'
De-jank stationary animations

Closes #3330

See merge request OpenMW/openmw!3631
1 year ago
Alexei Kotov d97563c830 Merge branch 'csicorruption' into 'master'
Allow ModPCCrimeLevel to clear crimes and cap bounties

Closes #7416

See merge request OpenMW/openmw!3664
1 year ago
Alexei Kotov 7074ea02b7 Merge branch 'qt_fix' into 'master'
Register language selector properly

Closes #7727

See merge request OpenMW/openmw!3666
1 year ago
Evil Eye 8a1ca870eb Stop infighting when gaining new allies 1 year ago
Andrei Kortunov e6690bbcc7 Use CMAKE_CURRENT_SOURCE_DIR instead of CMAKE_SOURCE_DIR 1 year ago
Evil Eye 36b61d7074 Merge branch 'copy-that' into 'master'
Feat(CS): Implement Instance Cloning

See merge request OpenMW/openmw!3654
1 year ago
Andrei Kortunov 2e041073fc Move *.ui files for different applications to different folders 1 year ago
Andrei Kortunov 8d06a99507 Register language selector properly 1 year ago
Mads Buvik Sandvei 00b1cd8c08 Replace movement() with eraseMovementIf() 1 year ago
Mads Buvik Sandvei 5a6dbf8714 Comments 1 year ago