Commit Graph

1325 Commits

Author SHA1 Message Date
Shadow 0cf063ba19 Update dorf2.php 2014-02-16 09:01:55 +02:00
Shadow fae5e45551 Update dorf1.php 2014-02-16 09:01:48 +02: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 7274234b7e Update def_end.tpl 2014-02-14 11:33:23 +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 7ee6731e01 Merge pull request #89 from armando1980/patch-37
it's fixed if you choice skip. by Armando
2014-02-12 09:47:01 +02:00
armando1980 9a6af85bdd it's fixed if you choice skip. by Armando 2014-02-11 18:55:56 -05:00
Shadow 3293b6f94d Update 5.tpl 2014-02-11 13:13:28 +02:00
Shadow e43de8face Update index.php 2014-02-11 08:26:26 +02:00
Shadow 9f5c09678d Update indexnews.tpl 2014-02-11 08:25:34 +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 fbec5c065e Update village.tpl 2014-01-31 08:38:03 +02:00
Shadow 5c1e103431 Update admin.php 2014-01-31 08:29:17 +02:00
Shadow 31faf6f924 Merge branch 'master' of https://github.com/Shadowss/TravianZ
Conflicts:
	Admin/admin.php
2014-01-31 08:20:42 +02:00
Shadow 15182ecb3d fix some things in admin panel 2014-01-31 08:14:15 +02:00
Shadow c9cc7c1f0a Merge pull request #83 from Fannybaws/UpdateCreateUsers
Update create users
2014-01-29 06:43:25 -08:00
Shadow 94f9e374ae Merge pull request #82 from armando1980/patch-35
Reverting Task 18
2014-01-29 06:42:27 -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 8c721901d0 Reverting Task 18 2014-01-27 16:07:28 -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 ffd063362f Added TODO 2014-01-27 19:01:26 +00:00
KFCSpike 5f2036b719 Include LANG file in admin.php 2014-01-27 19:00:28 +00:00
KFCSpike 955d44aae4 Tweaks to font stuff 2014-01-27 14:49:22 +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
armando1980 c2d5612a1f fix lost troop when target delete by armando
solution loss and troops when you attack the target you delete the account
2014-01-26 20:02:56 -05:00
armando1980 64d8f15dbd correction level fix by Armando
correction level if the building was destroyed or attacked by catapults or billowing or demolished while the level of the building was upgrade
2014-01-26 12:17:21 -05:00
KFCSpike 553268eb8a Task 20 - Q20_RESP1 and Q20_RESP2 - Thanks for the correct fix armando1980 2014-01-26 11:12:11 +00:00
KFCSpike bf0d8591d3 Reverting Task 20 2014-01-26 10:56:55 +00:00
KFCSpike ccc811721f Task 7 - Tweak 2014-01-25 21:14:24 +00:00
Shadow 59baabd1e5 Merge pull request #76 from armando1980/patch-31
FIXED spies in Combat Simulator BY Armando
2014-01-25 13:00:30 -08:00
KFCSpike c0d24d45b7 Tasks 4 and 5 - bold SERVER_NAME 2014-01-25 21:00:14 +00:00
Shadow a45f260631 Merge pull request #72 from armando1980/patch-28
add option Spanish by Armando
2014-01-25 13:00:02 -08:00
Shadow 6d53f1af0a Merge pull request #75 from armando1980/patch-30
fix report when spies not return
2014-01-25 12:59:41 -08:00
Shadow c431a0a4ca Merge pull request #71 from armando1980/patch-27
fix correct population in oasis
2014-01-25 12:57:52 -08:00
armando1980 a74fdede6c FIXED spies in Combat Simulator BY Armando 2014-01-25 14:25:24 -05:00
armando1980 1e56769a38 fix report when spies not return 2014-01-25 13:40:06 -05:00