Commit Graph

671 Commits

Author SHA1 Message Date
Shadow 69389645ea quest update 2014-03-10 08:07:16 +02:00
sempoi 49e2be568d Update db_MYSQL.php 2014-03-07 20:47:25 +08:00
Shadow 3cb2ce2782 Update en.php 2014-03-07 07:31:10 +02:00
Shadow ff68e792b7 Update editBuildings.php 2014-03-06 07:38:14 +02:00
Shadow 6718e429b5 Update function.php 2014-03-06 07:36:22 +02:00
Shadow fa52446234 Update database.php 2014-03-06 07:33:26 +02:00
Shadow cca7f5f1b4 credits 2014-03-05 09:01:50 +02:00
Shadow 2b02c0aadf Merge branch 'master' of https://github.com/Shadowss/TravianZ
Conflicts:
	Admin/Templates/village.tpl
2014-03-04 13:47:54 +02:00
Shadow 19767cf6a6 update admin panel 2014-03-04 12:44:25 +02:00
Shadow 66b15135fe Update Session.php 2014-03-04 08:22:58 +02:00
Shadow 77d49433f4 update 2014-03-03 09:57:40 +02:00
Shadow 19b89d433c quest update 2014-03-03 09:53:56 +02:00
Shadow 5fb572f93e Merge branch 'master' of https://github.com/Shadowss/TravianZ 2014-02-26 07:38:23 +02:00
Shadow 923b4b3e18 updates admin 2014-02-26 07:38:09 +02:00
Shadow 841632b3fc Update Profile.php 2014-02-26 07:32:05 +02:00
Shadow 6c94bb2a8b Merge branch 'master' of https://github.com/Shadowss/TravianZ 2014-02-21 15:29:45 +02:00
Shadow 48264ad2db update 2014-02-21 15:29:41 +02:00
Shadow 1e46ecc77c Update Battle.php 2014-02-19 07:37:37 +02:00
Shadow 06af170c47 Update Units.php 2014-02-18 08:26:33 +02:00
Shadow 102d42e731 Merge pull request #95 from armando1980/patch-41
fix lang rally point ok by: Armando
2014-02-17 08:42:24 +02:00
Shadow 57ce864b4d Merge pull request #94 from armando1980/patch-40
fix lang rally point ok by: Armando
2014-02-17 08:41:53 +02:00
Shadow fe94e6325e Merge pull request #93 from armando1980/patch-39
fix lang rally point ok by: Armando
2014-02-17 08:41:45 +02:00
Shadow 0b114cf444 Merge pull request #92 from armando1980/patch-38
fix lang rally point ok by: Armando
2014-02-17 08:41:07 +02:00
Shadow 8e1bec2160 Merge branch 'master' of https://github.com/Shadowss/TravianZ 2014-02-17 08:12:10 +02:00
Shadow 0231274907 lang update 2014-02-17 08:11:54 +02:00
armando1980 636ef7c372 fix lang rally point ok by: Armando 2014-02-16 18:33:47 -05:00
armando1980 f46e71d775 fix lang rally point ok by: Armando 2014-02-16 18:33:30 -05:00
armando1980 d5ea4fdbe5 fix lang rally point ok by: Armando 2014-02-16 18:19:37 -05:00
armando1980 9e135efcb5 fix lang rally point ok by: Armando 2014-02-16 18:15:00 -05:00
Shadow 1996e5df42 Update Building.php 2014-02-16 09:01:00 +02:00
Shadow ef45f955c4 Update Automation.php 2014-02-14 11:41:51 +02:00
Shadow 6996bd7d31 Update Battle.php 2014-02-14 11:30:19 +02:00
Shadow 64b32ed26a Merge branch 'master' of https://github.com/Shadowss/TravianZ 2014-02-13 08:05:22 +02:00
Shadow 80c8d93edf security update 2014-02-13 08:05:11 +02:00
Shadow 2029d40d9a Update Battle.php 2014-02-10 07:42:46 +02:00
Shadow 6b335d4d0a Update Battle.php 2014-02-10 07:39:00 +02:00
Shadow a960a5a50b Update Automation.php 2014-02-10 07:37:17 +02:00
Shadow c8b348e283 Merge branch 'master' of https://github.com/Shadowss/TravianZ 2014-02-03 12:07:46 +02:00
Shadow 4e8a7bf54c folder error 2014-02-03 12:07:13 +02:00
Shadow 7792417362 Update Automation.php 2014-02-02 12:12:59 +02:00
Shadow c9cc7c1f0a Merge pull request #83 from Fannybaws/UpdateCreateUsers
Update create users
2014-01-29 06:43:25 -08:00
Shadow f2d2b187bc Merge pull request #81 from armando1980/patch-34
fix quest 18
2014-01-29 06:42:15 -08:00
Shadow 192166ffbd Merge pull request #74 from armando1980/patch-29
FIXED spies BY Armando
2014-01-29 06:40:12 -08:00
armando1980 65c9504ced I made a small mistake and fixed
I made a small mistake

and fixed
2014-01-28 17:12:25 -05:00
armando1980 accad260c1 fix quest 18 2014-01-27 16:05:41 -05:00
KFCSpike 5c1babcee9 Choose Tribe when creating Users in Admin panel 2014-01-27 20:02:08 +00:00
KFCSpike 82b12a29d4 Add checkbox for Beginner's Protection when creating Users in Admin Panel 2014-01-27 13:30:45 +00:00
Shadow 985cd51fb9 Merge pull request #80 from armando1980/patch-33
fix lost troop when target delete by armando
2014-01-26 21:42:34 -08:00
Shadow 0b89c614bf Merge pull request #78 from armando1980/patch-32
correction level fix by Armando
2014-01-26 21:41:50 -08:00
Shadow 5c0b20681a Merge pull request #73 from Fannybaws/FixEnglishTasks
Fix tasks
2014-01-26 21:40:26 -08:00