xinyin025/TravianZ
1
0
Fork 0
mirror of https://github.com/Shadowss/TravianZ.git synced 2026-07-06 04:44:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,432 Commits 20 Branches 6 Tags
eccbf047157072f72560c71758cc2fc47006acf0
Commit Graph

2432 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Vladyslav eccbf04715 Displaying an artefact image 
Now all images of artefacts are displayed with different distances. With this fix, all images will be displayed with the same distance.
 2018-01-07 15:41:07 +02:00
Martin Ambrus 7f4a4e4a30 Merge pull request #466 from itrack/master 
Fix PHP 7.2 warning count
 2018-01-07 13:03:37 +01:00
Shadow 5fa97d6be3 Merge pull request #465 from velhbxtyrj/patch-6 
Correcting the description of the building
 2018-01-07 10:22:42 +02:00
Alex Stoica 7b67bed84e Fix multiSort create_function is deprecated in PHP 7.2 2018-01-07 03:07:07 +00:00
Vladyslav 293202729f Correcting the description of the building 
Here I will set an example from the server of Martin and mine. The picture crawls on the table. I checked a lot and came to the conclusion that this is the most optimal solution. Since other solutions require too many corrections. Since I can not add images here I opened a new issue for this https://github.com/Shadowss/TravianZ/issues/464 According to my observations, nothing else has worsened anywhere.
 2018-01-06 22:15:03 +02:00
Martin Ambrus 68c491509c Merge pull request #461 from velhbxtyrj/patch-5 
Embellishment treasury. Part 2
 2018-01-06 13:50:57 +01:00
Martin Ambrus f486a1fee8 Merge pull request #460 from velhbxtyrj/patch-4 
Embellishment treasury. Part 1
 2018-01-06 13:50:40 +01:00
Martin Ambrus a4b48348e4 Merge pull request #459 from velhbxtyrj/patch-3 
Create the right amount of artefacts
 2018-01-06 13:50:08 +01:00
Martin Ambrus 21eaab00ed Merge pull request #458 from velhbxtyrj/patch-2 
Oasis is written twice
 2018-01-06 13:48:15 +01:00
Martin Ambrus cadc8a5c95 Merge pull request #456 from velhbxtyrj/patch-1 
This centers the picture in the middle
 2018-01-06 13:44:09 +01:00
Alex Stoica 4c16c01781 Fix more PHP 7.2 non-countable types 2018-01-06 05:41:30 +00:00
Alex Stoica bea610cfde Fix PHP 7.2 non-countable types 2018-01-06 05:26:26 +00:00
Alex Stoica 8e2fb18c33 Fix warning count in Ranking 
Fix Warning: count(): Parameter must be an array or an object that implements Countable in GameEngine/Ranking.php on line 279
 2018-01-07 04:10:13 +02:00
Vladyslav 6457c67dbc Embellishment treasury. Part 2 
Removed unnecessary (empty) line in the bottom of the table with the artefacts on page Large artefacts.
 2018-01-06 02:15:58 +02:00
Vladyslav 2f9b96e226 Embellishment treasury. Part 1 
Removed unnecessary (empty) line in the bottom of the table with the artefacts on page Small artefacts .
 2018-01-06 02:15:25 +02:00
Vladyslav b75d8f7f63 Create the right amount of artefacts 
Now a unique artefact of a fool is created. Also all artefacts are created in quantity, as in my question here https://github.com/Shadowss/TravianZ/issues/251#issuecomment-340287258
 2018-01-06 02:00:11 +02:00
Vladyslav 5ccbe54642 Oasis is written twice 
Now it is displayed normally. https://github.com/Shadowss/TravianZ/issues/457
 2018-01-05 23:06:52 +02:00
Vladyslav c89ce43b27 This centers the picture in the middle 
This addition to this issue https://github.com/Shadowss/TravianZ/issues/429 which is shown in this comment https://github.com/Shadowss/TravianZ/issues/429#issuecomment-354162612
 2018-01-05 20:28:26 +02:00
Shadow 573cd02c80 Update text.tpl 2018-01-04 07:51:33 +02:00
Martin Ambrus f49c3bc95e Merge pull request #447 from AL-Kateb/master 
Fixed bakery wrong calculation Issue #408
 2018-01-04 00:08:07 +01:00
AL-Kateb f5a3bf8ab0 Fixed bakery wrng calculation Issue #408 2018-01-03 20:53:40 +00:00
Shadow 1f2186c1a2 UPDATE README 2018-01-03 14:05:10 +02:00
Martin Ambrus af2ffba5aa Merge pull request #446 from AL-Kateb/master 
Fixed hero does not gain XP when he dies in battle issue #445
 2018-01-02 09:58:35 +01:00
AL-Kateb de1f19b5d6 Fixed hero does not gain XP when he dies in battle issue #445 2018-01-01 22:08:04 +00:00
Martin Ambrus ab1dcbdd15 Merge pull request #444 from AL-Kateb/master 
Prevent user from illegally founding a new village with 0 settlers
 2018-01-01 21:51:12 +01:00
AL-Kateb caf9112314 Prevent user from illegally founding a new village with 0 settlers 2018-01-01 19:02:25 +00:00
Martin Ambrus 75db4ba081 Merge pull request #442 from AL-Kateb/master 
NPC button no longer appears when total resources is not enough
 2018-01-01 14:33:32 +01:00
AL-Kateb 0f2847a533 Restored Templates/text.tpl 2017-12-31 18:38:57 +00:00
AL-Kateb 00da54dcae Minor fix, corrected upgrade.tpl for NPC button 2017-12-31 18:29:20 +00:00
AL-Kateb 5466aa2af1 NPC button no longer appears if combined resources are not enough 2017-12-31 18:19:05 +00:00
Shadow 0696b3127b Merge pull request #439 from AL-Kateb/master 
Fixing units doubling when evasion is active
 2017-12-29 00:11:27 +02:00
AL-Kateb a254572a43 Fixed deleting trade routes after village is conquered 2017-12-28 15:21:07 +00:00
AL-Kateb ddc2e62472 Fixed loosing 1 level when there are only few catapults 2017-12-27 14:38:40 +00:00
AL-Kateb be8f683417 Cleanup 2017-12-27 10:59:01 +00:00
AL-Kateb 4d00b4ad1c Fixed units doubling when evasion is active 2017-12-27 10:23:57 +00:00
Martin Ambrus f5c8b858d9 fix: minimum width set for reports to fix squishy tables 2017-12-26 20:48:43 +01:00
Martin Ambrus 2e17dc6042 fix: wrong icon width causes arrow in troops movement 2 go 2 next line 
#429
 2017-12-26 20:38:07 +01:00
Martin Ambrus 28d82c5257 fix: contents in reports + rally point now correctly scrollable 2017-12-26 20:32:27 +01:00
Martin Ambrus 77cc7b1d16 fix: rally point not destroyed correctly when taking over a village 
#427
 2017-12-26 20:29:40 +01:00
Martin Ambrus 879e4952ce fix: fail to delete heroes from a village that's being removed via Admin 2017-12-26 20:27:30 +01:00
Martin Ambrus 56680344ec fix: treasuries with artifacts must be destroyable, villages must not 
#425
 2017-12-26 20:03:28 +01:00
Martin Ambrus 765914d863 fix: villages with artifacts must not be destroyed 
#425
 2017-12-26 19:58:34 +01:00
Martin Ambrus ed916d8994 fix: enabling scrolling only for reports, not for all content 2017-12-26 19:03:55 +01:00
Martin Ambrus 317e92f2f4 fix: enable scrolling in reports to see all attack / spy results data 2017-12-26 18:30:57 +01:00
Martin Ambrus 33b47f4319 fix: hero attributes incorrectly adjusted on levelling up 
#341
 2017-12-26 17:38:01 +01:00
Martin Ambrus 1f1b876651 fix: any alliance owner can edit any alliance forum data 
#410
 2017-12-26 17:01:21 +01:00
Martin Ambrus bdb705c69b fix: 2 catapults destroy a level 20 building 
#423
 2017-12-26 16:40:50 +01:00
Martin Ambrus c32bdc53a2 docs: warning about non-upgradability 2017-12-12 15:23:35 +01:00
Martin Ambrus 342ae0f0e4 fix: prisoners caching returned wrong number of prisoners 
#421
 2017-12-07 14:03:11 +01:00
Martin Ambrus 3b31bb05e9 fix: forum topic creation MySQL 5.7 incompatibility 
#420
 2017-12-07 12:59:42 +01:00