Commit Graph

266 Commits

Author SHA1 Message Date
Shadow 8e6a39a900 Merge branch 'master' of https://github.com/Shadowss/TravianZ
Conflicts:
	GameEngine/Lang/en.php
2014-05-12 08:45:37 +03:00
Shadow e337ac2b4d update 2014-05-12 08:43:32 +03:00
Shadow 554f02389c Merge pull request #155 from armando1980/patch-51
fix lang tempalte/build by: Armando
2014-05-12 08:42:02 +03:00
Shadow 8a8354914e Merge pull request #156 from armando1980/patch-52
fix lang tempalte/build by: Armando
2014-05-12 08:41:57 +03:00
Shadow 98189504cd Merge pull request #157 from armando1980/patch-53
fix lang tempalte/build by: Armando
2014-05-12 08:41:53 +03:00
Shadow 33335ef434 Merge pull request #158 from armando1980/patch-54
fix lang tempalte/build by: Armando
2014-05-12 08:41:50 +03:00
Shadow 67e2a4dabf Merge pull request #159 from armando1980/patch-55
fix lang tempalte/build by: Armando
2014-05-12 08:41:35 +03:00
Shadow c48bd508a1 Merge pull request #160 from armando1980/patch-56
fix lang tempalte/build by: Armando
2014-05-12 08:41:32 +03:00
Shadow f6249e72c9 Merge pull request #161 from armando1980/patch-57
fix lang tempalte/build by: Armando
2014-05-12 08:41:29 +03:00
armando1980 1646b7468e fix lang tempalte/build by: Armando 2014-05-10 12:35:44 -04:00
armando1980 daface8021 fix lang tempalte/build by: Armando 2014-05-10 09:10:32 -04:00
armando1980 513fcde7f3 fix lang tempalte/build by: Armando 2014-05-10 09:01:32 -04:00
armando1980 522def1809 fix lang tempalte/build by: Armando 2014-05-10 00:25:03 -04:00
armando1980 c5ef8c3c97 fix lang tempalte/build by: Armando 2014-05-10 00:21:04 -04:00
armando1980 75cc5664f8 fix lang tempalte/build by: Armando 2014-05-10 00:19:16 -04:00
armando1980 e95c8dc483 fix lang tempalte/build by: Armando 2014-05-10 00:17:06 -04:00
armando1980 c875dd3f2e fix lang tempalte/build by: Armando 2014-05-10 00:00:49 -04:00
sempoi 4b6401af9f Update medal.php 2014-03-18 23:56:44 +08:00
Shadow 9731d1a2d6 Update medal.php 2014-03-12 14:23:39 +02:00
Shadow 9c111ab081 Update medal.php 2014-03-12 14:17:16 +02:00
Shadow 267380f38a Update medal.php 2014-03-12 14:15:00 +02:00
Shadow feac499c54 Update profile.tpl 2014-03-12 14:02:59 +02:00
Shadow 9258cab333 Update profile.tpl 2014-03-12 14:02:12 +02:00
Shadow 2bfa7d320d Update medal.php 2014-03-12 13:55:54 +02:00
Shadow c4679fa1a6 Update medal.php 2014-03-12 13:55:16 +02:00
Shadow dad72579bd Update menu.tpl 2014-03-12 13:54:44 +02:00
Shadow 6b73de8eed vacation mode 2014-03-12 09:23:20 +02:00
Shadow 4d0aec158e update 2014-03-12 09:12:17 +02:00
Shadow e202a7e525 update 2014-03-12 09:06:46 +02:00
Shadow ed391d14fc vacation mode disabled 2014-03-12 08:45:52 +02:00
Shadow 84f48f8d24 update 2014-03-12 08:43:17 +02:00
Shadow e641d9e9d4 vacation mode but i will disable it just implemented but will be disabled 2014-03-12 08:40:59 +02:00
Shadow b94e054bdd Merge pull request #134 from sempoi/patch-22
Update mapscroll2.tpl
2014-03-10 08:29:48 +02:00
Shadow d91f503e26 Merge pull request #133 from sempoi/patch-21
Update mapscroll.tpl
2014-03-10 08:29:43 +02:00
Shadow 69389645ea quest update 2014-03-10 08:07:16 +02:00
sempoi 37d4d564c9 Update mapscroll2.tpl 2014-03-08 20:24:03 +08:00
sempoi c52ec838a3 Update mapscroll.tpl 2014-03-08 20:21:20 +08:00
Shadow 49607c28cd Update overview.tpl 2014-03-07 09:19:09 +02:00
Shadow 5d17534bf4 Update footer.tpl 2014-03-06 08:37:11 +02:00
sempoi 39ae245e5e Update player_top10.tpl 2014-03-05 11:59:23 +08:00
Shadow 92b360b83a Update newsbox1.tpl 2014-03-03 10:16:33 +02:00
Shadow 19b89d433c quest update 2014-03-03 09:53:56 +02:00
Shadow fb1aa636be Update newsbox1.tpl 2014-03-03 07:39:18 +02:00
Shadow 078abb4b47 Update newsbox2.tpl 2014-03-02 13:26:07 +02:00
Shadow 4a658a2c13 Update wwupgrade.tpl 2014-03-02 13:25:49 +02:00
Shadow 4397a2e9e0 Update newsbox2.tpl 2014-02-27 11:33:03 +02:00
Shadow c408f02aa7 Update newdorf.tpl 2014-02-19 12:42:51 +02:00
Shadow 04f317d658 Update 27_3.tpl 2014-02-19 08:07:45 +02:00
Shadow cdbf094a0a Update wwupgrade.tpl 2014-02-19 08:02:22 +02:00
armando1980 012695f8b1 fix trade npc by armando 2014-02-18 15:26:18 -05:00