HomeWildfire Games
Diffusion 0 A.D. Public Repository rP25238

Mixins: Remove the special mercenary technology, apply template changes…
rP25238
Actions

Description

Mixins: Remove the special mercenary technology, apply template changes directly.

Reviewed By: Freagarach

Differential Revision: https://code.wildfiregames.com/D3832

Details

Auditors
Langbart
Committed
wraitiiApr 12 2021, 1:28 PM
Reviewer
Freagarach
Differential Revision
D3832: Mixins: Remove the special mercenary technology, apply template changes directly.
Parents
rP25237: Improve Caratacos' portrait.
Branches
Unknown
Tags
Unknown
Build Status
Buildable 16716
Build 38033: Post-Commit BuildJenkins
Build 38032: Post-Commit Build (macOS)Jenkins

Event Timeline

wraitii committed rP25238: Mixins: Remove the special mercenary technology, apply template changes….Apr 12 2021, 1:28 PM
wraitii added an edge: D3832: Mixins: Remove the special mercenary technology, apply template changes directly..
Harbormaster failed to build B16716: rP25238: Mixins: Remove the special mercenary technology, apply template changes…!Apr 12 2021, 1:30 PM
Langbart raised a concern with this commit.Apr 12 2021, 5:36 PM
Langbart added a subscriber: Langbart.

I get many errors when loading the "Units demo" scenario map with this changeset.

I will attach the interestinglog.html file.

interestinglog.html59 KBDownload

This commit now has outstanding concerns.Apr 12 2021, 5:36 PM
wraitii requested verification of this commit.Apr 12 2021, 5:37 PM

Fixed in rP25245

This commit now requires verification by auditors.Apr 12 2021, 5:37 PM
Langbart resigned from this commit.Apr 12 2021, 5:40 PM

fixed with rP25245

This commit no longer requires audit.Apr 12 2021, 5:40 PM

Changes (37)

PathSize
ps/
trunk/
binaries/
data/
mods/
public/
simulation/
data/
technologies/
templates/
mixins/
units/
athen/
cart/
kush/
mace/
pers/
ptol/
sele/

rP25238

View Options

ps/trunk/binaries/data/mods/public/simulation/data/technologies/unit_mercenary.json

Loading...
View Options

ps/trunk/binaries/data/mods/public/simulation/templates/mixins/merc_cav.xml

Loading...
View Options

ps/trunk/binaries/data/mods/public/simulation/templates/mixins/merc_ele.xml

Loading...
View Options

ps/trunk/binaries/data/mods/public/simulation/templates/mixins/merc_inf.xml

Loading...
View Options

ps/trunk/binaries/data/mods/public/simulation/templates/mixins/mercenary.xml

Loading...
View Options

ps/trunk/binaries/data/mods/public/simulation/templates/units/athen/infantry_javelineer_b.xml

Loading...
View Options

ps/trunk/binaries/data/mods/public/simulation/templates/units/athen/infantry_marine_archer_b.xml

Loading...
View Options

ps/trunk/binaries/data/mods/public/simulation/templates/units/cart/cavalry_spearman_ital_b.xml

Loading...
View Options

ps/trunk/binaries/data/mods/public/simulation/templates/units/cart/cavalry_swordsman_gaul_b.xml

Loading...
View Options

ps/trunk/binaries/data/mods/public/simulation/templates/units/cart/cavalry_swordsman_iber_b.xml

Loading...
View Options

ps/trunk/binaries/data/mods/public/simulation/templates/units/cart/infantry_javelineer_iber_b.xml

Loading...
View Options

ps/trunk/binaries/data/mods/public/simulation/templates/units/cart/infantry_slinger_iber_b.xml

Loading...
View Options

ps/trunk/binaries/data/mods/public/simulation/templates/units/cart/infantry_swordsman_gaul_b.xml

Loading...
View Options

ps/trunk/binaries/data/mods/public/simulation/templates/units/cart/infantry_swordsman_ital_b.xml

Loading...
View Options

ps/trunk/binaries/data/mods/public/simulation/templates/units/kush/cavalry_javelineer_merc_b.xml

Loading...
View Options

ps/trunk/binaries/data/mods/public/simulation/templates/units/kush/infantry_javelineer_merc_b.xml

Loading...
View Options

ps/trunk/binaries/data/mods/public/simulation/templates/units/kush/infantry_maceman_merc_b.xml

Loading...
View Options

ps/trunk/binaries/data/mods/public/simulation/templates/units/mace/cavalry_javelineer_b.xml

Loading...
View Options

ps/trunk/binaries/data/mods/public/simulation/templates/units/mace/infantry_archer_b.xml

Loading...
View Options

ps/trunk/binaries/data/mods/public/simulation/templates/units/mace/infantry_slinger_b.xml

Loading...
View Options

ps/trunk/binaries/data/mods/public/simulation/templates/units/merc_black_cloak.xml

Loading...
View Options

ps/trunk/binaries/data/mods/public/simulation/templates/units/merc_thorakites.xml

Loading...
View Options

ps/trunk/binaries/data/mods/public/simulation/templates/units/merc_thureophoros.xml

Loading...
View Options

ps/trunk/binaries/data/mods/public/simulation/templates/units/pers/kardakes_hoplite.xml

Loading...
View Options

ps/trunk/binaries/data/mods/public/simulation/templates/units/pers/kardakes_skirmisher.xml

Loading...
View Options

ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol/cavalry_javelineer_merc_b.xml

Loading...
View Options

ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol/cavalry_spearman_merc_b.xml

Loading...
View Options

ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol/infantry_archer_b.xml

Loading...
View Options

ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol/infantry_javelineer_b.xml

Loading...
View Options

ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol/infantry_spearman_merc_b.xml

Loading...
View Options

ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol/infantry_swordsman_merc_b.xml

Loading...
View Options

ps/trunk/binaries/data/mods/public/simulation/templates/units/samnite_skirmisher.xml

Loading...
View Options

ps/trunk/binaries/data/mods/public/simulation/templates/units/samnite_spearman.xml

Loading...
View Options

ps/trunk/binaries/data/mods/public/simulation/templates/units/samnite_swordsman.xml

Loading...
View Options

ps/trunk/binaries/data/mods/public/simulation/templates/units/sele/cavalry_spearman_merc_b.xml

Loading...
View Options

ps/trunk/binaries/data/mods/public/simulation/templates/units/sele/infantry_archer_merc_b.xml

Loading...
View Options

ps/trunk/binaries/data/mods/public/simulation/templates/units/sele/infantry_swordsman_merc_b.xml

Loading...
Wildfire Games · Phabricator