Commit Graph

33951 Commits (0873eb6e62c4190017c3a6411bb61f5293e7e4f1)
 

Author SHA1 Message Date
Arnaud Dochain b34dac1a27 Launcher and Wizard french localisation 9 months ago
psi29a f9e957ea0e Merge branch 'esm4scvr' into 'master'
ESM4: Make script local variable loading more reliable

See merge request OpenMW/openmw!3967
9 months ago
Evil Eye a4625ea784 Deduplicate dialogue filter parsing 9 months ago
Evil Eye cb92d34ddd Reorder RefData members to decrease its size 9 months ago
Evil Eye fb4edda45d Validate INFO filters when loading the record 9 months ago
psi29a c6921d5292 Merge branch 'notarget' into 'master'
Don't run target-specific spell infliction code when there's no target (#7926)

Closes #7926

See merge request OpenMW/openmw!4019
9 months ago
Sam Hellawell c3420ed306 Fix build 9 months ago
Sam Hellawell 8c2c66d59e .nif check, matrix mult feedback, auto usage, reuse NodeMap typedef 9 months ago
Alexei Kotov 8751203849 Don't run target-specific spell infliction code when there's no target (#7926) 9 months ago
Evil Eye 2f6acbd7da Deregister the player before loading a new one 9 months ago
psi29a 8037a6e765 Merge branch 'portable-launcher' into 'master'
Portable Launcher (plus a whole slew of bugs fixes for problems I found that I suspect aren't on the tracker)

Closes #6846

See merge request OpenMW/openmw!3925
9 months ago
psi29a 49b974763f Merge branch 'imthefactornow' into 'master'
Don't show nameless higher ranks

Closes #7923

See merge request OpenMW/openmw!4014
9 months ago
psi29a 9db56c8bc4 Merge branch 'usedontactivate' into 'master'
Disallow Lua activation of inventory objects

See merge request OpenMW/openmw!4009
9 months ago
psi29a 3942d7fb7e Merge branch 'lua_crime_bounty' into 'master'
Lua: Add setCrimeLevel to types.Player

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

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

See merge request OpenMW/openmw!3893
9 months ago
Andrei Kortunov e8c3c8115a Capitalize captions in Launcher and Wizard 9 months ago
Andrei Kortunov edb9da5a67 Capitalize in-game setting 9 months ago
AnyOldName3 810e2c44a6 Merge conflict resolution part II 9 months ago
AnyOldName3 48f1f08537 Hide things that depend on present-but-inactive game files
https://gitlab.com/OpenMW/openmw/-/merge_requests/3925#note_1843962919
9 months 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.
9 months ago
Sam Hellawell d23c10622d Use dynamic cast to check for bone 9 months ago
Zackhasacat e549490bb1 record crime ID 9 months 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
9 months ago
Evil Eye d68d20eb1a Disallow Lua activation of inventory objects 9 months ago
Zackhasacat b859fc10e2 Add doc note 9 months ago
Zackhasacat 4ca13a9404 Verify the player 9 months ago
Zackhasacat 5856bc8a0e Add setCrimeLevel 9 months 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
9 months ago
Alexei Kotov 239d8f49d8 Merge branch 'consistent-translations' into 'master'
Do not store 'location' tags in translation files

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

Closes #7875 and #7914

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

See merge request OpenMW/openmw!4000
9 months ago
Andrei Kortunov 8fecbb55ff Do not store 'location' tags in translation files 9 months ago
Sam Hellawell a51d560174 Move bone rename logic to ColladaDescriptionVisitor, undo formatting/refactoring 9 months ago
Alexei Kotov f2e0129436 Convert water/ripple defines to camelCase 9 months ago
Alexei Kotov 612177be09 Improve some cryptic naming in the water shader 9 months ago
Alexei Kotov 0be7d7fa4c Reduce the amount of redundant code in the water shader 9 months 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
9 months ago
Sam Hellawell ceabeab0fd Fix RotateController not updating skeleton 9 months ago
Sam Hellawell 2288a691d2 Replace osgAnimation bone underscore naming at load time, map bone instances, reset root bone transform each frame 9 months ago
Alexei Kotov 3380b806de Merge branch 'haggleraven' into 'master'
Remove superfluous Trading class

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

See merge request OpenMW/openmw!3990
9 months ago
uramer 3b930e4471 Restore !613 9 months ago