Commit graph

37 commits

Author SHA1 Message Date
Nimetu
dee80dc90e Merge with develop 2016-08-25 22:18:35 +03:00
kervala
dabd3b2fdb Merge with develop 2016-07-25 10:46:09 +02:00
Nimetu
85838aec19 Merge with develop 2016-07-24 16:09:25 +03:00
Nimetu
0be0a1e9e7 Merge with develop 2016-07-23 11:28:22 +03:00
Riasan
8aefb645e1 Fix: right text align by Info Window 2016-07-19 20:54:54 +02:00
kervala
ca0346645b Merge with develop 2016-07-19 09:42:54 +02:00
Nimetu
0d571e617e Backed out changeset: 61529eb4c24f 2016-07-18 23:44:47 +03:00
Riasan
8f15a04d2d Fix: Right Text Align by Map and Rewspwan Windows 2016-07-18 20:14:20 +02:00
Nimetu
25f6f1980f Merge with develop 2016-07-09 14:59:22 +03:00
kervala
a3b8a2749e Merge with develop 2016-07-09 13:48:03 +02:00
Riasan
391706c1d8 Fix: Bad Position of Text after fix the Text High 2016-07-02 23:07:47 +02:00
kervala
7df642535b Merge with develop 2016-07-01 10:42:21 +02:00
kervala
120d2d7dba Merge with develop 2016-06-26 19:43:53 +02:00
Nimetu
1bff654c7b Merge with develop 2016-06-16 23:32:47 +03:00
Nimetu
8f9d7078bd Merge with develop 2016-06-12 12:49:14 +03:00
kervala
ed03eb0a02 Merge with develop 2016-05-24 11:25:04 +02:00
Nimetu
3530beb7fe Merge with develop 2016-05-05 15:01:10 +03:00
kervala
aa59952038 Merge with develop 2016-05-04 10:09:49 +02:00
kervala
910c6dc7b9 Merge with develop 2016-04-12 15:43:47 +02:00
kervala
a98e6b1fee Merge with develop 2016-04-09 13:02:40 +02:00
Nimetu
6a258886fe Merge with develop 2016-03-22 12:23:04 +02:00
kervala
f192068bc4 Merge with develop 2016-03-16 19:15:11 +01:00
kervala
0e1cbe909c Merge with develop 2016-03-15 12:37:11 +01:00
kervala
df7917c012 Merge with develop 2016-03-15 00:08:40 +01:00
kaetemi
4eb9d884d0 Merge with develop 2016-03-10 12:09:18 +01:00
kervala
794b91022e Merge with develop 2016-03-05 11:51:08 +01:00
Nimetu
94d2d95efa Merge with develop 2016-03-01 22:39:10 +02:00
kervala
cfba5be067 Changed: Updated world_editor_classes.xml 2016-02-21 17:28:43 +01:00
kervala
990a966504 Changed: Guild missions 2016-02-21 13:51:09 +01:00
kervala
179c6e4e04 Changed: Minor changes 2016-02-21 13:50:44 +01:00
kervala
21da88a762 Merge with develop 2016-02-20 20:44:23 +01:00
kervala
16cacef922 Merge with develop 2016-02-20 19:57:43 +01:00
kervala
3ab60af016 Merge with develop 2016-02-13 23:43:04 +01:00
Nimetu
30454c9ef5 Merge with develop 2016-02-13 17:36:57 +02:00
kervala
f7046f21b1 Merge with develop 2016-02-08 14:37:34 +01:00
kervala
59dcd867e9 Merge with develop 2016-02-03 21:58:58 +01:00
kervala
198759a880 Fixed: Use same XML files as on Atys 2016-01-24 17:08:32 +01:00