Diffusion 0 A.D. Public Repository rP23529

Support garrisoned enitites defined in map files.
rP23529
Actions

Description

Support garrisoned enitites defined in map files.

This is adding support to handle garrisoned entities defined in map files by game engine and atlas allowing future extension for atlas ui and solving recreation of entites on init in D1958. Also solving deepfreeze described in D2562.

Differential Revision; https://code.wildfiregames.com/D2597
Ticket: #3008
Patch by: Freagarach
Comments by: elexis

Details

Committed

Silier

Mar 15 2020, 2:54 PM

Differential Revision

D2597: Store Garrison(Holder) in map file.

Parents

rP23528: [i18n] Updated POT and PO files.

Branches

Unknown

Tags

Unknown

Build Status

Buildable 11253
Build 20222: Trigger Windows Autobuild
Build 20221: Post-Commit Build	Jenkins
Build 20220: Post-Commit Build (macOS)	Jenkins

Event Timeline

Silier committed rP23529: Support garrisoned enitites defined in map files..Mar 15 2020, 2:54 PM

Silier added an edge: D2597: Store Garrison(Holder) in map file..Mar 15 2020, 3:11 PM

Harbormaster completed building B11253: rP23529: Support garrisoned enitites defined in map files..Mar 15 2020, 3:28 PM

Freagarach mentioned this in D2562: Fix maps with Garrisoned entities (Sicilia Nomad) following rP22991/D2197 and rP16270.Mar 18 2020, 12:26 PM

elexis mentioned this in D2690: Only store a "Garrison"-tag in map when there is actually Garrison to store..Apr 26 2020, 3:38 PM

Silier mentioned this in rP23634: Do not store empty Garrison tag in map xml files after rP23529.May 7 2020, 6:58 PM

Freagarach mentioned this in rP24161: Store turret positions in map files..Nov 11 2020, 8:41 PM

Freagarach mentioned this in D3096: Fix notes in rP24161..Nov 18 2020, 9:02 PM

Changes (11)

Path

Size

ps/

trunk/

binaries/

data/

mods/

public/

maps/

scenario.rnc

scenario.rng

skirmishes/

Sicilia_Nomad.xml

simulation/

components/

GarrisonHolder.js

interfaces/

GarrisonHolder.js

helpers/

Setup.js

source/

graphics/

MapReader.cpp

MapWriter.cpp

simulation2/

TypeList.h

components/

ICmpGarrisonHolder.cpp

ICmpGarrisonHolder.h

rP23529

View Options

ps/trunk/binaries/data/mods/public/maps/scenario.rnc

View Options

ps/trunk/binaries/data/mods/public/maps/scenario.rng

View Options

ps/trunk/binaries/data/mods/public/maps/skirmishes/Sicilia_Nomad.xml

View Options

ps/trunk/binaries/data/mods/public/simulation/components/GarrisonHolder.js

View Options

ps/trunk/binaries/data/mods/public/simulation/components/interfaces/GarrisonHolder.js

View Options

ps/trunk/binaries/data/mods/public/simulation/helpers/Setup.js

View Options

ps/trunk/source/graphics/MapReader.cpp

View Options

ps/trunk/source/graphics/MapWriter.cpp

View Options

ps/trunk/source/simulation2/TypeList.h

View Options

ps/trunk/source/simulation2/components/ICmpGarrisonHolder.cpp

View Options

ps/trunk/source/simulation2/components/ICmpGarrisonHolder.h

Support garrisoned enitites defined in map files.rP23529Actions

Description

Details

Event Timeline

Changes (11)

rP23529

ps/trunk/binaries/data/mods/public/maps/scenario.rnc

ps/trunk/binaries/data/mods/public/maps/scenario.rng

ps/trunk/binaries/data/mods/public/maps/skirmishes/Sicilia_Nomad.xml

ps/trunk/binaries/data/mods/public/simulation/components/GarrisonHolder.js

ps/trunk/binaries/data/mods/public/simulation/components/interfaces/GarrisonHolder.js

ps/trunk/binaries/data/mods/public/simulation/helpers/Setup.js

ps/trunk/source/graphics/MapReader.cpp

ps/trunk/source/graphics/MapWriter.cpp

ps/trunk/source/simulation2/TypeList.h

ps/trunk/source/simulation2/components/ICmpGarrisonHolder.cpp

ps/trunk/source/simulation2/components/ICmpGarrisonHolder.h

Support garrisoned enitites defined in map files.
rP23529
Actions