Add contributor credits. Re-add old behavior of also acquiring properties directly from tileElem in TmxFile2D, if defined.

This commit is contained in:
Lasse Öörni 2017-06-26 13:11:27 +03:00
Родитель 3981a92a05
Коммит ce98afc76e
3 изменённых файлов: 11 добавлений и 1 удалений

Просмотреть файл

@ -74,6 +74,7 @@ Urho3D development, contributions and bugfixes by:
- Danny Boisvert
- Sergey Bosko
- Lisandro Bruzzo
- Thomas Böhm
- Carlo Carollo
- Pete Chown
- Christian Clavet
@ -114,6 +115,7 @@ Urho3D development, contributions and bugfixes by:
- David Palacios
- Alex Parlett
- Jordan Patterson
- Georgii Pelageikin
- Anton Petrov
- Vladimir Pobedinsky
- Franck Poulain

Просмотреть файл

@ -29,6 +29,7 @@ Urho3D development, contributions and bugfixes by:
- Danny Boisvert
- Sergey Bosko
- Lisandro Bruzzo
- Thomas Böhm
- Carlo Carollo
- Pete Chown
- Christian Clavet
@ -69,6 +70,7 @@ Urho3D development, contributions and bugfixes by:
- David Palacios
- Alex Parlett
- Jordan Patterson
- Georgii Pelageikin
- Anton Petrov
- Vladimir Pobedinsky
- Franck Poulain

Просмотреть файл

@ -578,7 +578,13 @@ bool TmxFile2D::LoadTileSet(const XMLElement& element)
for (XMLElement tileElem = tileSetElem.GetChild("tile"); tileElem; tileElem = tileElem.GetNext("tile"))
{
if(tileElem.HasChild("objectgroup"))
if (tileElem.HasChild("properties"))
{
SharedPtr<PropertySet2D> propertySet(new PropertySet2D());
propertySet->Load(tileElem.GetChild("properties"));
gidToPropertySetMapping_[firstgid + tileElem.GetInt("id")] = propertySet;
}
else if (tileElem.HasChild("objectgroup"))
{
XMLElement objectGroup = tileElem.GetChild("objectgroup");