~stratagus/wargus/+git/wargus-github:master

Last commit made on 2024-04-28
Get this branch:
git clone -b master https://git.launchpad.net/~stratagus/wargus/+git/wargus-github

Branch merges

Branch information

Name:
master
Repository:
lp:~stratagus/wargus/+git/wargus-github

Recent commits

df4f60e... by shinra-electric <email address hidden>

Add black_title.png to CMakeLists

65c1457... by Matthias Schwarzott <email address hidden>

human mission 10: Convert attacker units with wrapped CreateUnit

With the original TransformUnit the unit-peasant become unit-attack-peasant
only in GameCycle=2.
But the Defeat-Trigger that counts them is already executed in in GameCycle=1.
This trigger then counts 0 units of type 'unit-attack-peasant' and the
mission is lost.

This happens since https://github.com/Wargus/stratagus/pull/626 was
merged: b5e5bb0c6a18ccbf ("Merge pull request #626 from zzam/trigger-each-cycle")

Before the code was fragile but it worked due to the ordering of
triggers.

Closes: https://github.com/Wargus/wargus/issues/458

970f948... by Jarod42 <email address hidden>

Improve translate/fr_FR.po

a0dba98... by Joris Dauphin <email address hidden>

Merge pull request #456 from zzam/map-fl-triggers

Maps: Fix not-working triggers and code-typo

d978f82... by Matthias Schwarzott <email address hidden>

Fix typo of variable Tilesets

Introduced in a7b4b05237434339 ("Highgrounds support for wargus. (#446)")

225c296... by Matthias Schwarzott <email address hidden>

maps/fl: Load custom triggers

The triggers have been assigned to a string of code but never been evaluated

7bd0e56... by Matthias Schwarzott <email address hidden>

De: Fix color identifier in german texts

Wargus did just abort when displaying these strings in UI.

0123183... by Jarod42 <email address hidden>

Removal of `menu::setDirty(true)` (removed from Stratagus with Guichan 0.9.0 update).

d834e66... by Joris Dauphin <email address hidden>

Merge pull request #453 from zzam/diplomacy-crash

Diplomacy Menu: Avoid removed SetDisabledColor

41358dd... by Matthias Schwarzott <email address hidden>

Diplomacy Menu: Avoid removed SetDisabledColor

Game did just exit when pressing F9.
Now that SetDisabledColor was removed from GuiChan,
fall back to SetBaseColor for the disabled Checkboxes.