36709 Commits

Author SHA1 Message Date
Petr Mikheev
bed84e209b Merge branch 'saveaction' into 'master'
Turn menu.saveGame into a delayed action

See merge request OpenMW/openmw!4924
openmw-50-rc1
2025-09-20 10:39:43 +00:00
Evil Eye
ff79c2d826 Turn menu.saveGame into a delayed action 2025-09-20 10:39:43 +00:00
Alexei Kotov
7d4d3e3c73 Merge branch 'notnpcdating' into 'master'
Translate gamepad actions, part 4

See merge request OpenMW/openmw!4922
2025-09-20 00:17:05 +03:00
Alexei Kotov
e5b5869a21 Merge branch 'kampfpanzer' into 'master'
Add German translations for OMWCombat

See merge request OpenMW/openmw!4921
2025-09-20 00:15:54 +03:00
Alexei Kotov
2ea14570c8 Merge branch 'you-were-supposed-to-tell-me-about-this' into 'master'
CLEANUP: Document addTopic

See merge request OpenMW/openmw!4923
2025-09-15 22:54:43 +03:00
Dave Corley
9a4db2d65f CLEANUP: Document addTopic 2025-09-14 15:32:38 -05:00
Alexei Kotov
1182004937 Use l10n for inventory gamepad actions 2025-09-14 15:46:02 +03:00
Alexei Kotov
b0055ec8e7 Use l10n for map gamepad actions 2025-09-14 03:23:48 +03:00
Alexei Kotov
baf575e594 Add Sex into OpenMW
...as well as the other lines required to expose the race menu gamepad actions to l10n and use them
2025-09-14 01:41:11 +03:00
Alexei Kotov
fbb726cee0 Merge branch 'shooting-at-macs-without-looking' into 'master'
Some MacOS tidying

See merge request OpenMW/openmw!4905
2025-09-14 01:18:50 +03:00
Alexei Kotov
0d260b3c8a Add German translations for OMWCombat 2025-09-14 00:44:05 +03:00
psi29a
28a540d5fd Merge branch 'googleenpassant' into 'master'
Add some missing French translations

See merge request OpenMW/openmw!4918
2025-09-13 13:22:16 +00:00
AnyOldName3
fe97e3c888 Move brew repair and update to architecture-independent script
It installs things now, so these commands are useful.
2025-09-12 18:09:12 +01:00
Alexei Kotov
0471b98436 Add French translations for Doppler factor lines 2025-09-12 12:59:20 +03:00
Alexei Kotov
e70eb1e2e1 Add French lines for OMWCombat 2025-09-12 12:59:20 +03:00
psi29a
9257beea4e Merge branch 'bmdhacks-controller-deslect-bug' into 'master'
Controller tooltip display preferences survive mouse movement

See merge request OpenMW/openmw!4858
2025-09-09 21:00:56 +00:00
Alexei Kotov
8074331637
Merge branch 'gamepadactionl10n' into 'master'
Translate gamepad actions, part 3

See merge request OpenMW/openmw!4916
2025-09-08 19:40:20 +03:00
Alexei Kotov
b3f4287bca Update Swedish Interface lines 2025-09-06 22:15:08 +03:00
AnyOldName3
aa5510fb46 Use CCache in GitHub Actions build again 2025-09-06 17:55:09 +01:00
bmdhacks
072504d3b7 fixed a tooltip bug in spell creation and made controller tooltip toggling a helper function in the window manager 2025-09-06 09:50:27 -07:00
Evil Eye
1403fbce1b
Merge branch 'flatpak-paths' into 'master'
Document Flatpak paths

See merge request OpenMW/openmw!4884
2025-09-06 09:39:42 +00:00
AnyOldName3
998c738ed0 Add some options from the Windows script to the MacOS script
Hopefully, they might even work, too.

Also move ccache installation to the CI script as it's not mandatory to use ccache for local builds.
2025-09-06 01:29:44 +01:00
AnyOldName3
98bb4af0cb Use correct shebang
[[ doesn't work in real sh, only in more advanced shells pretending to be sh.
2025-09-06 01:07:02 +01:00
AnyOldName3
0a2c929a76 Don't meddle with people's git settings
I can't see any reason for this to have been necessary in CI in the first place as we do CI runs for commits on a branch, not for a detached head.
Despite that, I've left it in the Linux and Android scripts as we don't suggest anyone runs those on their own machines.
2025-09-06 00:56:46 +01:00
AnyOldName3
ff60b741a7 Move architecture-independent tool installation to common script 2025-09-06 00:51:52 +01:00
Alexei Kotov
9a92904f11 Use l10n for inventory offer action 2025-09-05 10:11:10 +03:00
Alexei Kotov
1740e6bac4 Use l10n for stats window scroll down action 2025-09-05 10:00:15 +03:00
Alexei Kotov
3159c363a1 Use l10n for trading menu offer action 2025-09-05 09:49:05 +03:00
Alexei Kotov
bd4d844b87 Use l10n for repair gamepad actions 2025-09-05 09:33:22 +03:00
Alexei Kotov
b7d9d01cc8 Use l10n for wait dialog gamepad actions 2025-09-05 09:29:34 +03:00
Alexei Kotov
1ab32749ee Use l10n for travel travel window action 2025-09-05 09:20:16 +03:00
Alexei Kotov
43617286fb Use l10n for scroll down scroll gamepad action 2025-09-05 09:16:21 +03:00
bmdhacks
81fc72a5b8 clang-format 2025-09-04 18:30:35 -07:00
bmdhacks
cf51812a6f Controller cursor highlight fixes
This resolves two issues:
1) Ensure that cursor tooltips stay displayed when buying spells or selling or consuming items and any other place where actions can highlight new items.
2) Ignore small mouse movements if we've just warped the mouse pointer a long distance.  This resolves an issue where slight cursor wiggle will trigger after changing the dpad highlight.
2025-09-04 18:12:58 -07:00
bmdhacks
12aef44fe1 Controller tooltip display preferences survive mouse movement 2025-09-04 18:12:58 -07:00
AnyOldName3
c70a7cd15b Eliminate single-line ccache scripts
They used to be necessary because they selected CMake of the same architecture as the build target, but now we use native ccache, they don't do anything meaningful.

Make things consistent with other platforms and just call ccache directly in the CI script.
2025-09-05 01:01:41 +01:00
AnyOldName3
6cdcbd957a And the same with CMake 2025-09-05 00:56:36 +01:00
AnyOldName3
a4be773e9c Native ccache won't work if we insist on an architecture 2025-09-05 00:56:36 +01:00
AnyOldName3
3bf68d44b7 Try using native CMake and CCache
In principle, CMake should be able to cross-compile just fine and CCache shouldn't care.
Maybe homebrew meddles with the default configuration and this will break things, though.
We shall see.
2025-09-05 00:55:52 +01:00
AnyOldName3
9fe8f3b03c Attempt to use Qt not necessarily from brew
The homebrew package should add qmake to the path, and qmake knows where Qt is.
If this works for brew, it should work for not-brew, too.

This *might* give a trailing /lib on the path CMake sees, but CMake implicitly tries adding a /lib suffix to paths in CMAKE_PREFIX_PATH, so this shouldn't make a difference to anything.
2025-09-05 00:55:52 +01:00
AnyOldName3
f155b0199e Undo part of !4759
https://gitlab.com/OpenMW/openmw/-/merge_requests/4759#note_2606465930 was marked as resolved without really being resolved, so bypassed normal review and was merged prematurely.

We tell developers to run these scripts on their machines, so it's rude to install things we don't have to over the top of an existing installation.
If the existing installation was via brew via the default sources, then it's clever enough not to break things, but if it's using custom sources or the install is outside of brew, it'll either break or overwrite what's there.

The three tools we've historically checked before overwriting all have an upstream MacOS distribution that isn't through brew, so it's decently likely that they exist, and we've never agreed to drop support for them.

I went a little further than the original code:
* I added a check before overwriting brew itself.
  I don't know whether the install script would notice this anyway.
* I added a check to ensure it's specifically Qt 6.x that's already installed as we dropped support for Qt 5.
* I added the checks back to both scripts even though !4759 only removed them from one.
  There only used to be one script, and when it was split, the checks only made it to one copy.

I could have gone further by adding checks for other tools before we install them, but we didn't have these in the past and I couldn't be bothered.

Try ARCHPREFERENCE environment variable

Go back to using subshell

ARCHPREFERENCE won't retroactively relaunch the current shell.

Also use /usr/local/bin/brew as the x86_64 version we just installed isn't added to the path by default.

Fresh shell for brew installer?

escape things better

This commit message was very nearly just emoji or a rant about sh-compatible shells.

what is going on?

Nested quotes?
2025-09-05 00:55:52 +01:00
Alexei Kotov
cac8d59db9 Use l10n for journal gamepad actions 2025-09-05 00:44:58 +03:00
Alexei Kotov
1dbd5fd571
Merge branch 'macos-ci-fixes' into 'master'
MacOS CI fixes and cleanup

See merge request OpenMW/openmw!4913
2025-09-04 23:44:13 +03:00
Alexei Kotov
4252098919
Merge branch 'gamepadactionl10n' into 'master'
Translate gamepad actions, part 2

See merge request OpenMW/openmw!4907
2025-09-04 23:41:28 +03:00
Alexei Kotov
9af71e9575 Merge branch 'unpublished' into 'master'
Don't publish release tag prereleases automatically

See merge request OpenMW/openmw!4911
2025-09-03 19:13:55 +03:00
Alexei Kotov
975e8d7412 Merge branch 'derefkarstaag' into 'master'
Don't dereference a potential end iterator

See merge request OpenMW/openmw!4912
2025-09-03 19:13:23 +03:00
Sarah Sunday
68d0dff890 [CI] Check for cmake for arm, move s3cmd out of arch specific flow 2025-09-02 19:54:38 -05:00
Sarah Sunday
180287dd80 [CI] Do not use ccache executable path, just ref directly 2025-09-02 19:54:38 -05:00
Sarah Sunday
5dfb4994b0 [CI] Rename/fix mac ccache file 2025-09-02 19:54:38 -05:00
Evil Eye
55287a6efe Merge branch 'clang_tidy_19' into 'master'
Use clang-tidy 19

See merge request OpenMW/openmw!4901
2025-09-02 18:46:48 +00:00