Commit Graph

34152 Commits (master)
 

Author SHA1 Message Date
Evil Eye 1ed82662ee Don't show nameless higher ranks 1 month ago
AnyOldName3 a179e9c001 The rest of the merge conflict
I didn't notice it as GitLab didn't highlight the diff properly.
1 month ago
AnyOldName3 0d547c5438 Resolve merge conflicts from https://gitlab.com/OpenMW/openmw/-/merge_requests/3893 1 month ago
psi29a c29816f67e Merge branch 'sv-translatation-2024-04-04' into 'master'
Update Swedish translations

See merge request OpenMW/openmw!4004
1 month ago
Joakim Berg c485726046 Update Swedish translations 1 month ago
psi29a d4aeeea52a Merge branch 'capitalize' into 'master'
Capitalize captions

See merge request OpenMW/openmw!3893
1 month ago
Andrei Kortunov e8c3c8115a Capitalize captions in Launcher and Wizard 1 month ago
Andrei Kortunov edb9da5a67 Capitalize in-game setting 1 month ago
AnyOldName3 810e2c44a6 Merge conflict resolution part II 1 month ago
AnyOldName3 48f1f08537 Hide things that depend on present-but-inactive game files
https://gitlab.com/OpenMW/openmw/-/merge_requests/3925#note_1843962919
1 month ago
AnyOldName3 f8224b29d4 Resolve merge conflicts
These were caused by https://gitlab.com/OpenMW/openmw/-/merge_requests/4005

I've had to cherry-pick parts of that MR into this commit, otherwise the CI would yell at me when it noticed the location tags had gone.
1 month ago
Zackhasacat a51b6c7392 Remove menu select 1 month ago
Sam Hellawell d23c10622d Use dynamic cast to check for bone 1 month ago
Zackhasacat da4e6b38a8 Clang format 1 month ago
Zackhasacat a29be8909d Add bindings to select the next menu element 1 month ago
Zackhasacat 6491bb4910 Merge branch 'master' of gitlab.com:openmw/openmw into lua_controller_cursor 1 month ago
Zackhasacat e549490bb1 record crime ID 1 month ago
Alexei Kotov 8027c1e662 Merge branch 'l10n-input-binding' into 'master'
Attempt to fix #7906: l10n name for inputBinding setting renderer taken from action/trigger l10n, not key

Closes #7906

See merge request OpenMW/openmw!4007
1 month ago
Evil Eye d68d20eb1a Disallow Lua activation of inventory objects 1 month ago
Zackhasacat b859fc10e2 Add doc note 1 month ago
Zackhasacat 4ca13a9404 Verify the player 1 month ago
Zackhasacat 5856bc8a0e Add setCrimeLevel 1 month ago
trav5 b0008d22e6 Attempt to fix openmw issue #7906
l10n name is taken not from the ActionInfo/TriggerInfo's 'key' param,
but from the 'l10n' param when making the inputBinding setting renderer
1 month ago
Alexei Kotov 239d8f49d8 Merge branch 'consistent-translations' into 'master'
Do not store 'location' tags in translation files

See merge request OpenMW/openmw!4005
1 month ago
Sam Hellawell 36cccef606 Fix formatting 1 month ago
psi29a 8e1d790919 Merge branch 'widgets_rework' into 'master'
Make widgets more vanilla-friendly

Closes #7875 and #7914

See merge request OpenMW/openmw!3941
1 month ago
psi29a 2529b8c5a9 Merge branch 'megumingreatersigngreatersigngreatersignaqua' into 'master'
Water shader cleanup

See merge request OpenMW/openmw!4000
1 month ago
Andrei Kortunov 8fecbb55ff Do not store 'location' tags in translation files 1 month ago
Sam Hellawell a51d560174 Move bone rename logic to ColladaDescriptionVisitor, undo formatting/refactoring 1 month ago
Benjamin Y a9346d3c8a updated localization files 1 month ago
Benjamin Y 76199e1fb2 Update settingspage.ui with description for PPL 1 month ago
Alexei Kotov f2e0129436 Convert water/ripple defines to camelCase 1 month ago
Alexei Kotov 612177be09 Improve some cryptic naming in the water shader 1 month ago
Alexei Kotov 0be7d7fa4c Reduce the amount of redundant code in the water shader 1 month ago
Alexei Kotov fbe84f4668 Remove underwater fog radialization remnants
The fog is now view-independent so this is not something to concern ourselves as with anymore
1 month ago
Sam Hellawell ceabeab0fd Fix RotateController not updating skeleton 2 months ago
Sam Hellawell 2288a691d2 Replace osgAnimation bone underscore naming at load time, map bone instances, reset root bone transform each frame 2 months ago
Alexei Kotov 3380b806de Merge branch 'haggleraven' into 'master'
Remove superfluous Trading class

See merge request OpenMW/openmw!3996
2 months ago
Alexei Kotov dfdd7aa684 Always queue movement even when there's none 2 months ago
Alexei Kotov 5e99545b9c Don't discard stagger/KO animation movement 2 months ago
psi29a 3a1d0a9649 Merge branch 'timeout_table_filter' into 'master'
Restore !613

See merge request OpenMW/openmw!3990
2 months ago
uramer 3b930e4471 Restore !613 2 months ago
Andrei Kortunov 02e000ab5b Add changelog entries 2 months ago
Andrei Kortunov 1b544b93d2 Do not allow to move resizable windows outside of game window 2 months ago
Andrei Kortunov 939760007e Resize console window on resolution change, not reset it 2 months ago
Andrei Kortunov b3188b593c Disable MyGUI windows snapping 2 months ago
psi29a 99fa1278d2 Merge branch 'codenames' into 'master'
Make binding names layout-independent

See merge request OpenMW/openmw!3993
2 months ago
psi29a b83ffdc357 Merge branch 'i-have-value-too' into 'master'
FIX(CS): Re-add gold value column for objects

See merge request OpenMW/openmw!3991
2 months ago
psi29a 46bf6c12b6 Merge branch 'equipunequipwhatsthedifference' into 'master'
Allow weapon equip/unequip animations to intersect (#7886)

Closes #7886

See merge request OpenMW/openmw!3951
2 months ago
Alexei Kotov aa447a9c68 Merge branch 'localisation-update-fr' into 'master'
French localisation update

See merge request OpenMW/openmw!3999
2 months ago