Sorry for the late reply @wraitii .
I just tested your changes and everything works as expected.

Build was aborted.

Build failure - The Moirai have given mortals hearts that can endure.

Build failure - The Moirai have given mortals hearts that can endure.

This should work for the option.

Successful build - Chance fights ever on the side of the prudent.

Successful build - Chance fights ever on the side of the prudent.

Successful build - Chance fights ever on the side of the prudent.

Successful build - Chance fights ever on the side of the prudent.

Successful build - Chance fights ever on the side of the prudent.

Successful build - Chance fights ever on the side of the prudent.

Successful build - Chance fights ever on the side of the prudent.

Minor change

Add forgotten preprocessor

I sadly couldn't get the the hook to work without changing too much of the code, so I've let it be. It would probably the best if you did it.

Improve on wraitii's feedback

There is a way to set up a configuration hook to reload things without adding the code in JS, if you're up for that (otherwise I'll see if I can do it myself), but that's a minor thing.

I would be up for doing this, sure. I want to get to know the codebase more anyways :D.
If you could just point me in the right direction? Thanks!

There is a way to set up a configuration hook to reload things without adding the code in JS, if you're up for that (otherwise I'll see if I can do it myself), but that's a minor thing.

Successful build - Chance fights ever on the side of the prudent.

Successful build - Chance fights ever on the side of the prudent.

Improved on Stan's feedback and moved the code that emulates the right-click so it can be done without restarting

Successful build - Chance fights ever on the side of the prudent.

Successful build - Chance fights ever on the side of the prudent.

Rework solution based on wraitii's feedback

I'll update the diff in a second.

First, I would probably do the change in LoadHotkeys: when FindScancode returns UNIFIED_CTRL, you'd instead use UNIFIED_SUPER. It should work the same, but it would work better with the in-game editor.

I have worked on this yesterday and it works much better now, you don't even need a restart.
I am only unsure about the Engine.ReloadHotkeys() call I made in the options.js file.

In D1849#168973, @Schweini wrote:

After looking at it, I don't think this should be done as it's confusing when Ctrl appears when you type in Super or the other way around. The user should already know that those actions are changed, so I would let it be as it is.

Secondly, you would probably need to change the key names in the hotkey editor, too, because CTRL would need to show as SUPER. I'm not sure if it's better to do that in C++, in CHotkeyPicker, or in JS.

After looking at it, I don't think this should be done as it's confusing when Ctrl appears when you type in Super or the other way around. The user should already know that those actions are changed, so I would let it be as it is.

Thanks for the feedback!

Successful build - Chance fights ever on the side of the prudent.

Successful build - Chance fights ever on the side of the prudent.

Thanks for the patch :)
I have 2 suggestions to improve on this:

• First, I would probably do the change in LoadHotkeys: when FindScancode returns UNIFIED_CTRL, you'd instead use UNIFIED_SUPER. It should work the same, but it would work better with the in-game editor.
• Secondly, you would probably need to change the key names in the hotkey editor, too, because CTRL would need to show as SUPER. I'm not sure if it's better to do that in C++, in CHotkeyPicker, or in JS.

Successful build - Chance fights ever on the side of the prudent.

Successful build - Chance fights ever on the side of the prudent.

Build failure - The Moirai have given mortals hearts that can endure.

• Merge branch 'master' of https://www.github.com/0ad/0ad

Build failure - The Moirai have given mortals hearts that can endure.

I am going to commit this, but with a suffix for spidermonkey, as well as using numbers (instead of tentative dates) for the suffixes.

Thanks! I'll try to commit this during the week, we have some bank holidays...

Build failure - The Moirai have given mortals hearts that can endure.

In D2649#115710, @Itms wrote:

[…] Currently if devs forget to bump the value of LIB_VERSION for SpiderMonkey, it won't build, because it won't find the archive.

Hoist bundled lib versions to top of file. Add version suffix for nvtt as well.

And one final idea: maybe the nvtt version should have a wildfiregames suffix so that it gets rebuilt when we add some patches, like I will do in D2563.