AnyOldName3
|
a179e9c001
|
The rest of the merge conflict
I didn't notice it as GitLab didn't highlight the diff properly.
|
2024-04-08 13:43:42 +01:00 |
|
AnyOldName3
|
0d547c5438
|
Resolve merge conflicts from https://gitlab.com/OpenMW/openmw/-/merge_requests/3893
|
2024-04-08 13:37:36 +01:00 |
|
AnyOldName3
|
810e2c44a6
|
Merge conflict resolution part II
|
2024-04-07 22:34:17 +01:00 |
|
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.
|
2024-04-07 21:59:54 +01:00 |
|
AnyOldName3
|
baab28440e
|
Russian translations from Capo
|
2024-03-08 01:49:23 +00:00 |
|
AnyOldName3
|
c23e5e1059
|
I guess these aren't wired up as a dependency of the build
I know the qm generation is so maybe it needs another look
|
2024-03-06 00:47:31 +00:00 |
|
Andrei Kortunov
|
3971abf5e6
|
Minor launcher improvements (feature 7843)
|
2024-02-20 14:02:59 +04:00 |
|
psi29a
|
744cd50520
|
Merge branch 'decoupled-audio' into 'master'
Add option to use camera as sound listener
Closes #5944
See merge request OpenMW/openmw!3836
|
2024-02-13 09:18:18 +00:00 |
|
Epoch
|
6486f3f2cf
|
Add option to use camera as sound listener
|
2024-02-13 09:18:18 +00:00 |
|
AnyOldName3
|
5913ca67d5
|
.ts files, too
|
2024-02-11 23:53:58 +00:00 |
|
Andrei Kortunov
|
7e345436f4
|
Localize Launcher and Wizard
|
2024-02-01 09:47:25 +04:00 |
|