summaryrefslogtreecommitdiff
path: root/world/map/data
diff options
context:
space:
mode:
authorJessica Tölke <jtoelke@mail.upb.de>2011-09-08 20:36:29 +0200
committerJessica Tölke <jtoelke@mail.upb.de>2011-09-08 20:36:29 +0200
commit5ea6c568c86d9c0f76983705258951e2db9974fa (patch)
tree94a402b645140a7bb9fbfa467a73cfb30d880a56 /world/map/data
parent2629fa14c6f7e6a5a7a71f5c784424cf80189f17 (diff)
parentcba4de9a5f7b9de412b9f458c80904cee9764a85 (diff)
downloadserverdata-5ea6c568c86d9c0f76983705258951e2db9974fa.tar.gz
serverdata-5ea6c568c86d9c0f76983705258951e2db9974fa.tar.bz2
serverdata-5ea6c568c86d9c0f76983705258951e2db9974fa.tar.xz
serverdata-5ea6c568c86d9c0f76983705258951e2db9974fa.zip
Merge remote-tracking branch 'testing/master'v2011.09.08
Diffstat (limited to 'world/map/data')
-rw-r--r--world/map/data/001-3.wlkbin22504 -> 22504 bytes
-rw-r--r--world/map/data/010-1.wlkbin18004 -> 18004 bytes
-rw-r--r--world/map/data/011-1.wlkbin19100 -> 19100 bytes
-rw-r--r--world/map/data/011-3.wlkbin3604 -> 3604 bytes
-rw-r--r--world/map/data/012-3.wlkbin109204 -> 109204 bytes
-rw-r--r--world/map/data/024-2.wlkbin40004 -> 40004 bytes
-rw-r--r--world/map/data/024-3.wlkbin0 -> 10004 bytes
-rw-r--r--world/map/data/024-4.wlk1
-rw-r--r--world/map/data/033-1.wlkbin17668 -> 17668 bytes
-rw-r--r--world/map/data/034-1.wlkbin22788 -> 22788 bytes
-rw-r--r--world/map/data/resnametable.txt2
11 files changed, 3 insertions, 0 deletions
diff --git a/world/map/data/001-3.wlk b/world/map/data/001-3.wlk
index 928abfc7..acde31d6 100644
--- a/world/map/data/001-3.wlk
+++ b/world/map/data/001-3.wlk
Binary files differ
diff --git a/world/map/data/010-1.wlk b/world/map/data/010-1.wlk
index 8ae55525..5342c508 100644
--- a/world/map/data/010-1.wlk
+++ b/world/map/data/010-1.wlk
Binary files differ
diff --git a/world/map/data/011-1.wlk b/world/map/data/011-1.wlk
index 2fa117b4..e7c8967b 100644
--- a/world/map/data/011-1.wlk
+++ b/world/map/data/011-1.wlk
Binary files differ
diff --git a/world/map/data/011-3.wlk b/world/map/data/011-3.wlk
index 074f710e..6ab5e57d 100644
--- a/world/map/data/011-3.wlk
+++ b/world/map/data/011-3.wlk
Binary files differ
diff --git a/world/map/data/012-3.wlk b/world/map/data/012-3.wlk
index 2067e6fe..e510b20a 100644
--- a/world/map/data/012-3.wlk
+++ b/world/map/data/012-3.wlk
Binary files differ
diff --git a/world/map/data/024-2.wlk b/world/map/data/024-2.wlk
index 74704a5f..1f63519e 100644
--- a/world/map/data/024-2.wlk
+++ b/world/map/data/024-2.wlk
Binary files differ
diff --git a/world/map/data/024-3.wlk b/world/map/data/024-3.wlk
new file mode 100644
index 00000000..a73afbf6
--- /dev/null
+++ b/world/map/data/024-3.wlk
Binary files differ
diff --git a/world/map/data/024-4.wlk b/world/map/data/024-4.wlk
new file mode 100644
index 00000000..7b0e8cd5
--- /dev/null
+++ b/world/map/data/024-4.wlk
@@ -0,0 +1 @@
+ôô
diff --git a/world/map/data/033-1.wlk b/world/map/data/033-1.wlk
index 2a099a66..d9f0609b 100644
--- a/world/map/data/033-1.wlk
+++ b/world/map/data/033-1.wlk
Binary files differ
diff --git a/world/map/data/034-1.wlk b/world/map/data/034-1.wlk
index dd1f65a1..755435de 100644
--- a/world/map/data/034-1.wlk
+++ b/world/map/data/034-1.wlk
Binary files differ
diff --git a/world/map/data/resnametable.txt b/world/map/data/resnametable.txt
index c9cad372..a86a624d 100644
--- a/world/map/data/resnametable.txt
+++ b/world/map/data/resnametable.txt
@@ -56,6 +56,8 @@
023-1.gat#023-1.wlk#
024-1.gat#024-1.wlk#
024-2.gat#024-2.wlk#
+024-3.gat#024-3.wlk#
+024-4.gat#024-4.wlk#
025-1.gat#025-1.wlk#
025-3.gat#025-3.wlk#
025-4.gat#025-4.wlk#