diff options
| author | Led Mitz <smoothshifter@tuta.io> | 2015-01-01 01:06:09 +0000 |
|---|---|---|
| committer | Led Mitz <smoothshifter@tuta.io> | 2015-01-01 01:06:09 +0000 |
| commit | 85390d339df51a7968075098ca4424c2a3902ce9 (patch) | |
| tree | 87d6c92967ccd40934351ea175f68eab1298001f | |
| parent | 313587e0604b2917d572539b10d79489eeca8743 (diff) | |
| parent | a09cb6171598500ca09d29e614410cf12d1c64c0 (diff) | |
| download | clientdata-85390d339df51a7968075098ca4424c2a3902ce9.tar.gz clientdata-85390d339df51a7968075098ca4424c2a3902ce9.tar.bz2 clientdata-85390d339df51a7968075098ca4424c2a3902ce9.tar.xz clientdata-85390d339df51a7968075098ca4424c2a3902ce9.zip | |
Merge branch 'barbarians' into 'master'
Added Barbarians song to Rager camp and west adjacent map
See merge request legacy/clientdata!533
| -rw-r--r-- | maps/033-1.tmx | 2 | ||||
| -rw-r--r-- | maps/034-1.tmx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/maps/033-1.tmx b/maps/033-1.tmx index ff10be04..2b5adce7 100644 --- a/maps/033-1.tmx +++ b/maps/033-1.tmx @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="138" height="128" tilewidth="32" tileheight="32" infinite="0" nextlayerid="8" nextobjectid="8"> <properties> - <property name="music" value="explorers-melody.ogg"/> + <property name="music" value="Barbarians.ogg"/> <property name="name" value="snow Path"/> </properties> <tileset firstgid="1" source="../tilesets/collision.tsx"/> diff --git a/maps/034-1.tmx b/maps/034-1.tmx index e8ec63ee..f0a21035 100644 --- a/maps/034-1.tmx +++ b/maps/034-1.tmx @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="178" height="128" tilewidth="32" tileheight="32" infinite="0" nextlayerid="8" nextobjectid="13"> <properties> - <property name="music" value="explorers-melody.ogg"/> + <property name="music" value="Barbarians.ogg"/> <property name="name" value="Snow Forest"/> <property name="overlay0image" value="graphics/images/ambient/snow.png"/> <property name="overlay0parallax" value="2.4"/> |