All Activity

And, if dropping your commits doesn’t work for some reason, you can also try resetting your local branch to a few commits earlier in the history. Then try steps 2 and 3 again. View the history to choose where to go with: git log --oneline Then: git reset --hard <commit-hash> Then:

Ah, you edited the main branch of your repo.... The classical workflow would be to not make any of your edits there but on dedicated branches. Assuming we still want to use your main to rebase all local branches --since @guerringuerrin confirmed this worked for him, I'm guessing this was indeed due to something, probably rights, preventing you to pull lfs assets from 0AD's main repo storage-- here is what you could do: Drop all commits you did on main locally Force push your own main branch Try again to sync your main with 0AD's main using the web UI

Trying to sync in the web UI gives me this error message: Merge Failed: There was a conflict while merging. Hint: Try a different strategy. And all fixes for it I found are for conflicts with the same repo, not with a parent repo. A comment similar to git merge upstream/main doesn't seem to exist for git-lfs

Having this problem some days ago I did this and it worked

That I keep asking you to test out with me, yet you never do

Hello, the mod is now available on mod.io and through the mod downloader. In the future refrain from using 0ad>=0.28.0 as it causes issues (You cannot guarantee what will happen in the future)

if only we had a mod that did it already....

@DesertRose I had the same issue. I think I fixed it by doing a git lfs pull as recommended by @Stan`, but it would only work doing so from my own fork. Sync your main branch's fork from the web UI, then use it to re-base any local branches.

Wonder if all those new maps could be part of @andy5995's community maps mod

Try to to git-lfs pull maybe Basically the issue is that your fork needs to be updated, because new art assets were pushed on main.

When I try to pull the changes made to my fork by sync it to 0ad:main I get the error: Downloading binaries/data/mods/public/art/meshes/props/caryatid.dae (101 KB) Error downloading object: binaries/data/mods/public/art/meshes/props/caryatid.dae (4758e69): Smudge error: Error downloading binaries/data/mods/public/art/meshes/props/caryatid.dae (4758e699101e3ab0b367bc4557a5fe155b395df3a28d3c3ecc3c5d7bb4b45565): batch response: Repository or object not found: https://gitea.wildfiregames.com/DesertRose/0ad-DR_fork.git/objects/batch Check that it exists and that you have proper access to it Errors logged to '/home/tre/git/0ad/0ad-DR_fork/.git/lfs/logs/20260321T085833.61052115.log'. Use `git lfs logs last` to view the log. error: external filter 'git-lfs filter-process' failed Have this error for a few days now. Is that an issue I can fix myself, or is this on the remote's side? I can't find any helpful info online.

Usually not, but yesterday I travelled over 900 km by train to vote in my country (my country usually don't accept to vote remotely). Anyway, please vote on this poll. Thanks for your time. https://strawpoll.com/3RnYXRMVWye

happy for you, nice that you can have a good sleeping schedule (I want to be this punctual for sleeping )

Already done: I think I'll write all steps that I followed. Not now, it's almoast midnight. Anyway, on GIMP I used color curves. The standard curve is y = x, I used y = 32 * nroot(4, x / 32). So for high mountains, behavior is nearly asymptotic. You can see that Himalayan is nearly flat, like a mesa. But, this is not sufficient. In a 512x512 Himalaya is so near to the coast that I can't do a passage between India and South-East of Asia.

I'd try to reduce contrast on the heightmap and try again, to reduce a lot of the extreme height differences.

While experimenting with an Asia map, I decided to push the size up to 1024x1024 — and honestly, it's a game changer. At 512x512, a continent like Asia feels cramped and loses a lot of its geographic character; with 1024x1024 there's actual room to breathe, to place mountain ranges, small seas, like Black and Red ones, and biomes in a way that makes the map feel like a real place rather than a compressed approximation. A map of this scale could support larger teams, longer games, and genuinely epic campaigns across Central Asia, India, or the Silk Road. Would anyone be up for playing something this large? (I don't know how to create a poll, please can any admin do it or maybe answer in this thread)

De acuerdo, pero ¿qué está pasando? ¿Qué versión de 0ad? ¿Hay algún error?

Gracias por la info. Puse el mod pero... No me ejecuta, o eso creo

Battle management/micro isn't your enemy. Spamming meaningless clicks might be. I know a lot of players that love micro with freehand formation for example, which is a excellent feature. I'd love to have more features like this, I hope the selection box targeting will be in this category.

Couldn't units be balanced in a way where sniping is less important? Then you wouldn't have to really worry about any of this

That's an interesting analysis, it makes me think of priorities. That feature in the game is like having a high-end bike but only ever using one gear, while obsessing over automate a fan at higher revolutions to so it blows more air towards your face. Just saying.

Are you sure it's not only a gamer mouse with multi-click macro buttons? Do you have some code or proof about it?

Autosnipe existed but nobody uses it anymore and it probably doesn't work in R28 @ffm2 had some click counter script in python which you might be interested in

I think their size was modeled after AoE3 ships. I agree, they need to be smaller, but that will make them look unrealistic.