This fixes an oversight from d655455304. During a code deduplication, a
check was removed. When looking at the lobby as a dialog (while in
gamesetup), it should be impossible to try to join a game.
(cherry picked from commit 6ac5c376ea)
Signed-off-by: Itms <itms@wildfiregames.com>
This is an oversight from 415304db8a and #6660.
This forgotten template cropped up in #7525. It does not contain the
needed components to interact correctly with the player.
(cherry picked from commit 95fb0f9ed0)
Signed-off-by: Itms <itms@wildfiregames.com>
On low vertical resolutions when playing games with 8 players in 4
different teams, the summary will overflow the available vertical space.
This commit ensures that in such a case the buttons below the summary
are still clickable by ensuring they stay always on top of the summary.
(cherry picked from commit 4d19935f48)
Signed-off-by: Itms <itms@wildfiregames.com>
This fixes the vertical alignment of the team summarized values on the
summary screen.
Fixes#7527
(cherry picked from commit 8b40ce59ad)
Signed-off-by: Itms <itms@wildfiregames.com>
This lead to an error because `addressee` is `undefined`.
Defect introduced in dcb8ef9b52.
Fixes#7466
Reported-by: @Langbart
(cherry picked from commit 068346b502)
Signed-off-by: Itms <itms@wildfiregames.com>
If the new entity did not have Promotion, we would fail to do so.
Not doing this caused ghost units to appear when promoting inside a GarrisonHolder.
Fixes#7472, reported by Langbart.
(cherry picked from commit 1d6f7f3837)
Signed-off-by: Itms <itms@wildfiregames.com>
AI's chat messages are always received by every client. It's not
necesarry to warn about them.
Defect introduced in e04506814a.
Refs: #7466
(cherry picked from commit 8292b0c646)
Signed-off-by: Itms <itms@wildfiregames.com>
The hack uses per-vertex lighting for translucent objects. In the
future we need to use a separate shader.
(cherry picked from commit cf9bc03ee9)
Signed-off-by: Itms <itms@wildfiregames.com>
b90280855f added an additional label to the bottom of the game setup
page for indicating that a game is started from a saved state. This
reduced the space available for tooltips and looked oddly placed.
This commit changes that, by resizing the `SavedGameLabel` and
`GameSettingWarning` objects dynamically so they only take the space
necessary to display their caption. It also tweaks the vertical margins
of the tooltip to allow more lines to be shown at once.
While this still doesn't allow to show all tooltips on low resolutions,
it's now better than with Alpha 26.
(cherry picked from commit 73af7e61dd)
Signed-off-by: Itms <itms@wildfiregames.com>
This prevents mods from mutating this value and revealing the map.
Part of this commit is written by @phosit.
(cherry picked from commit c9e76efe7b)
Signed-off-by: Itms <itms@wildfiregames.com>
Introduced in d9d1f1bbeb.
This allowed draining an enemies metal resources by ordering spy-request
for that player.
Fixes#7230.
(cherry picked from commit 015aa0349b)
Signed-off-by: Itms <itms@wildfiregames.com>
Ideally the AI would try to carry on and recover gracefully but the code is setup in such a way that this seems like it would lead to a lot of different bugs down the line.
With help from @langbart on QA and code.
Fixes#7425
(cherry picked from commit c20ca02911)
Signed-off-by: Itms <itms@wildfiregames.com>
The current code could end up with savegameID being undefined, false, a filename string, or null depending on the code path taken.
Adapt C++ in consequence.
(cherry picked from commit a8fc3cf254)
Signed-off-by: Itms <itms@wildfiregames.com>
Docks are generic and have all ship entities. This comes to play notably when
they are captured. This is currently not the case for special docks (Crannog and
Cothon). For consistency they are given ship entities that are trainable by
other civilizations.
Also, the Crannog was not updated with the naval overhaul and still had the
trireme and bireme entities. They are now removed.
Fixes#7426
(cherry picked from commit 5c25b6f644)
Signed-off-by: Itms <itms@wildfiregames.com>
This increases the height StoneButtons and TabButtons, so that a
double-spaced caption does fit on them without significant overflow.
Exempt from that are the StoneButtons resembling lists in the main menu
and the in-game menu, as changing their height didn't feel right and we
don't need double-spaced captions for them anyway, as they're wide
enough.
The height of StoneButtons got increased from 28px to 32px, while the
height of TabButtons got increased from 30px to 34px.
(cherry picked from commit 33e9cd6126)
Signed-off-by: Itms <itms@wildfiregames.com>
Since 71a61d5f50, formations regularly regroup. However, units already at their correct offset should remain idle. This doesn't happen as we cannot check if we are at destination.
This exposes that and handles things properly... Unfortunately UnitAI has already left the IDLE state at this point, so we still get counted as no-longer idle for a turn.
To fix this, try and detect that particular situation without triggering infinite loops.
(cherry picked from commit 2f7ac026c1)
Signed-off-by: Itms <itms@wildfiregames.com>
Deduplicate a check by moving it to isSlotAvailable.
Based on a patch by @elexis.
(cherry picked from commit eafcb814cd)
Signed-off-by: Itms <itms@wildfiregames.com>
Failed to notice that name and controllable were sometimes changed.
(cherry picked from commit e15ffd70b7)
Signed-off-by: Itms <itms@wildfiregames.com>
Include new/updated skirmish maps and brand new random maps by @real_tabasco_sauce
Revert name and description strings only
(cherry picked from commit da761ca501)
Signed-off-by: Itms <itms@wildfiregames.com>
- Apply Scale
- Rename mesh from Circle to viking_longship
- Remove useless material
- Add prop-projectile-prop point
Reported by: @Langbart
Fixes#7424
(cherry picked from commit bce3a2a170)
Signed-off-by: Itms <itms@wildfiregames.com>
based on a patch by: aeonios
`off` means that the territory visibility cannot be changed
`hidden` means that it's hidden by default but can be enabled
`visible` means it's visible by default
(cherry picked from commit fd78034885)
Signed-off-by: Itms <itms@wildfiregames.com>
This improves the alignment of the items of the top menu in-game. Icons
are now better centered and don't overflow anymore and the build label
text doesn't stack on low resolutions anymore either.
(cherry picked from commit 1aeb19b535)
Signed-off-by: Itms <itms@wildfiregames.com>
The intent of this branch was to not change the names when a saved game
is loaded. So that one can see who was where in the saved game.
It was implemented wrong: The names didn't change when no savegame was
loaded and changed when a saved game was loaded.
This commit make the soved game case and no saved game case consistent.
Defect introduced in b90280855f.
(cherry picked from commit fb9b02a9ba)
Signed-off-by: Itms <itms@wildfiregames.com>
There is no way to show the `PlayerColor` as disabled. As the player
color is vilible without this it can simble be hidden when it is
disabled.
Defect introduced in b90280855f.
(cherry picked from commit 5c860c3121)
Signed-off-by: Itms <itms@wildfiregames.com>
`PlayerData` didn't contain the playerNames when serialized because they
should not be loaded when a new game is made. This lead to the issue
that client didn't receive the initial player names of saved games.
Now `fromInitAttributes` gets as a second parameter whether the
initAttributus are from persistent settings.
Defect introduced in b90280855f.
(cherry picked from commit b52c1c137f)
Signed-off-by: Itms <itms@wildfiregames.com>
When a saved game gets loaded ai's aren't always selectable. This lead
to errors when an ai actually gets selected.
Defect introduced in b90280855f
(cherry picked from commit 199aa8ac35)
Signed-off-by: Itms <itms@wildfiregames.com>
`GameSettingsWarning` where only rendered when the settings change. When
a saved game is loaded it's possible this setting is enablet without the
setting being changed.
Defect introduced in b90280855f.
(cherry picked from commit 8636e4d0fd)
Signed-off-by: Itms <itms@wildfiregames.com>
Itms