Commit Graph

92 Commits

Author SHA1 Message Date
Martin Ambrus 6f3973748c fix: more manual typecastings 2017-10-18 00:59:49 +02:00
Martin Ambrus ac5d3538f8 fix: mysqli_error needs MySQLi connection as parameter 2017-10-17 13:05:13 +02:00
Martin Ambrus 1654ce498f fix: security patching due to mysql injection vulnerabilities everywhere 2017-10-17 12:21:41 +02:00
Martin Ambrus 92b9a7b043 fix: a lot of MySQL calls in templates replaced by MySQLi ones 2017-08-28 23:56:59 +02:00
Martin Ambrus 9261a4a4b2 Merge branch 'master' of https://github.com/evader1337/TravianZ into evader1337-master
# Conflicts:
#	GameEngine/Database/db_MYSQL.php
#	Templates/Build/avaliable.tpl
#	Templates/Message/inbox.tpl
2017-08-28 14:18:24 +02:00
TPLinux 444037f7ff Fix in_array bug in show more buldings in WWV 2017-06-29 15:53:53 +00:00
evader1337 2d26af7c46 Trying to fix this monstrosity #2 2016-09-13 18:54:25 +02:00
cosme12 3c83066222 Master builder fix 2015-08-31 12:12:15 -03:00
cosme12 aed0d130df Master builder fix 2015-08-31 12:10:35 -03:00
cosme12 f7cd705ec2 Update 27_3.tpl 2015-04-08 20:06:42 -03:00
cosme12 57de4f910a Centering upgrade resources 2015-04-08 20:05:10 -03:00
Shadow 3e325ee142 Merge pull request #172 from cosme12/patch-7
Marketplace text fix
2015-04-08 08:11:08 +03:00
cosme12 e45f003088 Marketplace text fix 2015-04-07 20:13:07 -03:00
cosme12 693182399b Building finish alert in Main Building
There was no alert message when clicking the option in the Main Building to finish all construction in exchange of 2 gold.
2015-04-07 19:37:38 -03:00
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
Shadow e202a7e525 update 2014-03-12 09:06:46 +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 4a658a2c13 Update wwupgrade.tpl 2014-03-02 13:25:49 +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
Shadow b7eb44661a Merge pull request #96 from armando1980/patch-42
fix lang rally point ok by: Armando
2014-02-17 08:40:52 +02:00
Shadow 19d51a5cd6 Merge pull request #97 from armando1980/patch-43
fix lang rally point ok by: Armando
2014-02-17 08:40:45 +02:00
Shadow b33cba3fba Merge pull request #98 from armando1980/patch-44
fix lang rally point ok by: Armando
2014-02-17 08:40:39 +02:00
armando1980 776a4d00cb fix lang rally point ok by: Armando 2014-02-16 18:52:16 -05:00
armando1980 2c85eff4a2 fix lang rally point ok by: Armando 2014-02-16 18:51:20 -05:00
armando1980 c976cc0e71 fix lang rally point ok by: Armando 2014-02-16 18:49:58 -05:00
armando1980 3ff3641ef1 fix lang rally point ok by: Armando 2014-02-16 18:45:10 -05:00
Shadow 268d46c782 Update upgrade.tpl 2014-02-16 09:03:37 +02:00
Shadow c20b0a2033 Update availupgrade.tpl 2014-02-16 09:02:45 +02:00
KFCSpike 2b410ca229 No need for trailing dot after exclamation mark either 2013-12-10 18:06:41 +00:00
KFCSpike 35b84a3c22 Just another typo 2013-12-10 18:03:57 +00:00
Shadow d8f144fecc Update 16.tpl 2013-12-09 17:40:17 +02:00
Shadow 59926f6102 Update avaliable.tpl 2013-11-29 15:16:50 +02:00