In D4188#178168, @Stan wrote:

@Freagarach @Angen @Langbart @wraitii can someone test this so it can be committed?

I have investigated the problem for ticket #6201 and I think it starts with this changeset version.

Start 0ad -> single player -> matches. (This should work multiplayer too, if other players have this patch applied.)

Ok

Create a game with 4 players including yourself. Set yourself and another player to team 1. Set the rest to team 2.

Ok, tested it as well with some different map types/maps/ number of players. Works.
It also shows correctly the territory of newly gained allies after the start of the game when you use diplomacy to make an enemy an ally.

Under the "map" tab, there's a new option "allied view". Enable it and start the game.

Yes.

A game should start and you can see your allies.

Yes

Exit and start a new game, with settings in step 2. Select "Revealed map". Allied map should now be selected too. Deselecting Allied map should deselect revealed map.

Yes, works.

Deselect Revealed map. Select Explored map and allied view. Start a game. You should see what your allies see and the rest of the map. But you shouldn't see what your enemies see

Yes.

Tested it only with a woman and a soldier on the Median Oases(2) map for the Persian civilization and I got the sound when clicking on the treasure.
PS: The actual act of picking up the treasure makes no sound, only when I command the person via mouse to pick up the treasure is a sound omitted. That's how it should be, right?

In D3958#177810, @Schweini wrote:

@Langbart, if you could test the changes I just made, that would be great!
I sadly don't have 2 machines ready right now (or could I just open up another account ?), so I can't test it, but I think it's right.

I have noticed a problem in the lobby.
If I have two instances and the one instance that joined the game resigns first and presses "Quit", it is transported to the main page and not the lobby page.

Just played the tutorial at rP25799 + D4175 and in the end all objects remained visible.
https://pasteall.org/media/1/1/11c4d7568a39cf0360620e119606b3f4.png

Seems to work for me.

Could #6226 be related o this changeset?

In D3958#177586, @Schweini wrote:

• Quit to campaign menu, when in campaign session

To avoid the line break for Greek you would have to make the buttons even longer, it might be a better solution to focus more on height and keep the line break.

In D3958#173567, @Langbart wrote:

I can't find any problems with this patch. Should be added before the feature freeze - Deadline: 06/06/2021.

In D4161#177442, @Freagarach wrote:

In D4161#177352, @Langbart wrote:

• Everything disappears in the end

Did you alt-tab?

Here is a comparison for elephants, you can see a little less rotation in the lower left corner with the patch applied.

On the left side rP25779 and on the right side rP25779+D4154

In D4161#177358, @wraitii wrote:

Fix button not existing.

The results speak for themselves:

the batch problem I described in ticket #6188 is gone and it also shows that the tutorial has been completed.

Right, what do you think of different icons?

Why keep the "Known issues" button? We got the FAQ button.
Since you have resized the buttons, it breaks the consistency with all other buttons, normally they are 28 pixels high. Except for the mapBrowser, there the size is 30 pixels.

It addresses the main problems like moving large groups from one wood line to another or sending large batches from your CC to a specific wood line. They don't get lost anymore and that is a good thing. I think you should commit it.

Looking good

In rP25767#53023, @marder wrote:

Found a problem:
EMBASSIES AND MERCENARY CAMPS is too long, it gets cut down to EMBASSIES AND MERCENARY.
We either need to add a line break or shorten the title.

In D4135#177037, @marder wrote:

120 seems excessive to me, but maybe some people want it that way.

Played a test game and it seems that everything works according to the test plan.
Maybe Relics should not have the symbol either? (the Scenario map Units Demo is great for testing such things)

This is definitely better than the current situation, a small problem I noticed that makes it hard to keep your wood gatherers organised:
I got a group of 26 ladies and ordered them to chop those trees trees, two ladies would go the other way.

It's good that the soldier drops resources first, otherwise that would be extra loot for my opponent.

I applied this patch to my working copy rP25764.
At first glance it works better than the current SVN version, but I noticed a problem with ladies not chopping wood. They were produced in the CC and moved specifically to one tree. Another group of ladies were also ordered to chop wood at this tree, although they arrived later at this destination, then the first group of 6 ladies produced from the CC, they chopped wood.

In rP25726#52946, @Stan wrote:

@Edwarf reported the number techs give the impression that it's on a wrong phase.

This is a fun bug, but when I apply your patch to my working copy, I can no longer mass produce heroes with the AutoQueue feature. Also tested it with war dogs and some other units seems to work all right.

Update icons

Added new icons from @marder and renamed the old icons instead of deleting them.

These new icons don't stand out as well on certain backgrounds as the old ones did.

Apply the patch and compile the game

OK

Make sure GUI looks the same
Compare performance, especially for GUI heavy page

Can't see any differences.
https://pasteall.org/media/0/a/0aadcb35c1f61ff6a022367de626e1dd.jpg

The images from Barracks, Stable, Elephant stable and Heroes look a bit too dark. For the Stable and the Elephant Stable, the rank symbols are not as clearly visible as in the Barracks image.

@Nescio would you like to make some comments before adding it to the game?

The added new pics to zip file in D4107 look great (war dogs, fishing, formations, ...).
Optional:

• war_elephants: I would include an Indian and an African version, since it is described in the text - war_elephants.txt.
• For city walls one could add some soldiers on to the walls since it is described in the text.

It does not create a segmentation fault for me anymore (rP25733+D4113).
PS: Besides testing it for Capture the Relic also tested it with 'Wonder`, Regicide, Conquest Units, Conquest Structure, Conquest Civic Center and Conquest.

The .txt file for Iphicrates, Pericles, Savanna Biome, Scout Towers, Themistocles and Viriato still exits but are empty --> leading to be still displayed.

works.

see D4094

I get a segmentation fault` when starting a match:

I have changed the xml file for the minimap buttons, I think this looks more consistent with your new map flare addition. All buttons are 115 in height and width.

In D1751#175289, @Stan wrote:

I don't think observers should be able to so pings. I imagine they could ruin the game for no reason.

The map flare as an observer can be done via the minimap button but it does not work via hotkey. Map flares was not possible with diffID 17960 at all.

The errors are gone when I apply this patch to my working copy and start the Arctic biome on Cantabrian Highlands.

In D4032#175087, @Stan wrote:

Can you still click on it where the text is ?

In D4032#175060, @Stan wrote:

So with 1200 maxpop it overlaps? (Long strings should be checked too)

In D4032#175030, @Stan wrote:

How does it look on 1024x768?

In D1017#174771, @Stan wrote:

Is this still accurate ? Maybe @Langbart could take it on?

Removing additional fonts

Tested this morning with rP25661 and diffID 17960, could not find any problem.
Worth mentioning: only if I place a marker at the border, it is visible above the minimap square. I guess its okay.

Very good.

I noticed a problem #6200

In D4052#174269, @wraitii wrote:

Yeah there are problems. Might not update for the next release at all, given.

Applied patch D4052 to my working copy rP25634
Problem at Building GnuTLS...`

In D4045#174034, @Langbart wrote:

When I change GLuint m_TerrainTexture = 0 at line 63 in the file MinimapTexture.h.

When I change GLuint m_TerrainTexture = 0 at line 63 in the file MinimapTexture.h.

Tested it with: rP25621+D4047

Apply the patch and compile the game

Ok rP25621+D4045

Make sure the minimap works (and all its functions, including terrain rendered correctly) in the game and Atlas

When I start a skirmish match on the map Gallic Highlands (2) it results in segmentation fault.

see D4036

When I add D4036 to my working copy rP25609 I get different biomes when I select Random, this solves the problem described in ticket #6190.

Apply the patch and compile the game

Ok

Comprare the render metric in the main menu with a lot of elements (Structure Tree or something similar where FPS is the lowest)
Comprare the render metric during a match

Procedure:

1. add 'profiler2.autoenable = true' to user.cfg file
2. run the following command '0ad/binaries/system/pyrogenesis -mod=public -replay-visual=PATH'
3. open profiler2.html in browser (but only when the loading screen disappears and the actual replay starts)
4. replay begins, choose 'Darayavahush III' and click 'Follow Player'
5. replay ends, click 'Save Live Report to file'
6. save the file profiler2.jsonp from the log folder

Make sure GUI looks the same

Yes, it does.

The first upload listed a lot of files that I didn't even touch, let's see if I can undo that.

With changeset rP25076 I get different Biomes when I select Random, but with changeset rP25077 I get only Alpine biomes for the map Mainland (see #6190).

Apply the patch and compile the game

Ok.

Make sure all GUI looks the same, including gray elements and charts

https://pasteall.org/media/8/b/8bae76c2cb7c99d4c834a49a391e3951.jpg

I can't find any problems with this patch. Should be added before the feature freeze - Deadline: 06/06/2021.

After applying D4030 to my working copy rP25594, the problem disappeared.

A test gives me :

Testing rP25585+D4020+D4022
Seems the title is visible twice.

Hopefully this makes it into the next version, when testing with my working copy rP25585 I get some errors on startup.

Apply the patch and compile the game

Ok.

Make sure charts look the same

I could not find any differences.
https://pasteall.org/media/8/b/8b2eaefe3c7099260838858a5d19eda2.jpg

In D3994#173371, @Langbart wrote:

I probably should create ticket for it.