 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 |
|
|
armando1980
|
5a2237611f
|
FIXED spies BY Armando
if the defender does not have spies, the attacker will not die spies. FIXED BY Armando
|
2014-01-25 13:15:18 -05:00 |
|
|
KFCSpike
|
c1a218de8d
|
Task25 - Tweak wording
|
2014-01-25 17:36:28 +00:00 |
|
|
KFCSpike
|
dea90bf8ef
|
Task24 - Tweak wording
|
2014-01-25 17:32:25 +00:00 |
|
|
KFCSpike
|
e3e1273d12
|
Task22 - Tweak wording
|
2014-01-25 17:29:12 +00:00 |
|
|
KFCSpike
|
a13e232551
|
Task21 - Tweak wording
|
2014-01-25 17:16:03 +00:00 |
|
|
KFCSpike
|
859cee7991
|
Task20 - fix response
|
2014-01-25 15:54:25 +00:00 |
|
|
KFCSpike
|
2ee434ef58
|
Task18 - Military, fix errors in messages
|
2014-01-25 15:19:57 +00:00 |
|
|
KFCSpike
|
e235c2eca7
|
Task15 - Tweak
|
2014-01-25 15:00:44 +00:00 |
|
|
KFCSpike
|
8407c75f6b
|
Task14 - Tweak
|
2014-01-25 14:56:49 +00:00 |
|
|
KFCSpike
|
091cf894a7
|
Task13 - Tweak message to correctly show server name
|
2014-01-25 14:54:39 +00:00 |
|
|
KFCSpike
|
5fb25fd137
|
Task12 - Tweak message to correctly show server name
|
2014-01-25 14:44:21 +00:00 |
|
|
KFCSpike
|
fff0c8e115
|
Task11 - Tweak messages
|
2014-01-25 14:38:50 +00:00 |
|
|
KFCSpike
|
ee959662c9
|
Task10 - Beginners Protection might not be days so tweak the message
|
2014-01-25 14:28:48 +00:00 |
|
|
KFCSpike
|
f792db7a32
|
Task9 - Use SERVER_NAME instead of Travian, tweak message, and don't say extend all resource tiles to 1 as this is said in order
|
2014-01-25 14:07:12 +00:00 |
|
|
KFCSpike
|
e8d8489836
|
Task9 - Use SERVER_NAME instead of Travian
|
2014-01-25 13:55:11 +00:00 |
|
|
KFCSpike
|
1681f079a8
|
Task 7 - Tweak response when completed
|
2014-01-25 13:49:17 +00:00 |
|
|
KFCSpike
|
4f9436e5c5
|
Task 6 uses SERVER_NAME when referencing the menu choice when completed - changing left menu to also use SERVER_NAME and moving the plus link above the Game Rules link
|
2014-01-25 13:30:14 +00:00 |
|
|
KFCSpike
|
178e58aef1
|
Task6 - Tweak completion message
|
2014-01-25 13:10:57 +00:00 |
|
|
KFCSpike
|
2482a2874b
|
Task 4 - Billions is a bit optimistic
|
2014-01-25 12:54:14 +00:00 |
|