Commit Graph

758 Commits

Author SHA1 Message Date
Martin Ambrus 1c51f2eec0 chore: HTML fixes from Eclipse 2017-08-28 17:31:55 +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
Martin Ambrus c7c01dd424 conflict from resolution from TPLinux 2017-08-28 13:54:46 +02:00
Martin Ambrus 98e695d178 Merge pull request #2 from hardwarelayer/dev
add variable validate for functions:
2017-08-28 13:28:53 +02:00
Martin Ambrus ed0b8031aa fix: spies fixed via armando1980 2017-08-28 13:03:19 +02:00
TPLinux 3961ea2a0c Fi winner redirection 2017-06-29 16:30:40 +00:00
TPLinux 83c26c024b Fix reload crush bug 2017-06-29 08:22:28 +00:00
TPLinux 18c423dd5e Fixing finish all with tow gold from dorf(1,2) 2017-06-29 06:03:17 +00:00
Shadow 0739bfffda Update db_MYSQL.php 2017-01-07 12:20:52 +02:00
Shadow 0bfc9d4812 Update Generator.php 2017-01-07 12:20:35 +02:00
evader1337 5b73417956 Small changes 2016-09-14 15:05:28 +02:00
evader1337 32e016e948 Improved gold packages 2016-09-14 13:27:49 +02:00
evader1337 a402b87a53 Trying to fix this monstrosity #3 2016-09-13 19:55:18 +02:00
evader1337 2d26af7c46 Trying to fix this monstrosity #2 2016-09-13 18:54:25 +02:00
Domen Kajdič 2cf2f3c343 Trying to fix this monstrosity #1 2016-09-13 15:38:14 +02:00
TienTN 1aa5c253b6 add variable validate for functions:
addResourceFields
addVillage
setFieldTaken
register
activate
2016-09-06 22:05:13 +07:00
TienTN b14568c7e0 Fix the session problem
In README note #7
2016-09-04 14:49:47 +07:00
TienTN b37fe776ef 1. Fix to db_MYSQL.php with safe_mysql_fetch_all, and safe_mysql_fetch_array wrappers, to avoid error: fix for Warning: mysql_fetch_all/array() expects parameter 1 to be resource, boolean given
2. Fix to the db_MYSQLi.php in class object declaration(if anybody want to use db_MYSQLi.php again)
2016-08-31 23:07:33 +07:00
uroskn 64aba6ccd2 Removed bunch of dead code from db_MYSQL.php 2016-07-05 03:05:27 +02:00
uroskn 0ea068cfd3 On PHP5.4+ use REQUEST_TIME_FLOAT instead of microtime for starting measurment of page loading time 2016-07-03 12:08:10 +02:00
uroskn 234bd692e4 Page load time is independent on passing second.
Previously page loading time was calculated by taking miliseconds
of current wall clock time. In cases where wall clock went into another
second page loading time was calcualted as negative giving incorrect result.

This patch fixes this by using microtime of wall-clock time in float.
2016-07-03 00:01:15 +02:00
uroskn 1afde368d3 GameEngine and install folders have 777 already set by default 2016-07-02 21:39:28 +02:00
Shadow 7c0aa5a21c fix testing 2016-03-08 11:21:15 +02:00
Shadow ca8fef52f7 update test 2016-03-08 11:19:00 +02:00
Shadow 9ce9cb77c2 update 2016-03-02 08:01:32 +02:00
Shadow b80ef13676 Update Automation.php 2016-02-23 14:16:48 +02:00
Pietro 556b3959ef Update Automation.php 2015-09-04 20:05:48 +02:00
Shadow c07f263232 Merge pull request #190 from cosme12/patch-17
Master builder fix
2015-08-31 21:03:01 +03:00
cosme12 97bea08171 Master builder fix 2015-08-31 12:03:41 -03:00
cosme12 f384cea18d SQL Injection fixed 2015-08-31 11:39:38 -03:00
Shadow c9f0848418 Merge pull request #187 from cosme12/patch-14
Typo little fix
2015-08-27 07:38:26 +03:00
cosme12 b100feee1d Update en.php 2015-08-26 20:32:42 -03:00
cosme12 7570f9ec91 Residence - Palace build 2015-08-26 14:27:30 -03:00
Shadow 467a2b190f fix logo 2015-08-03 10:30:59 +03:00
Tomas Kasparek ec18bd788c fix PHP Fatal error: Cannot redeclare class Generator on PHP 5.5
PHP 5.5 STL introdouced class Generator and PHP interpret thinks we want to redeclare it -> rename Generator class to something else
2015-07-08 13:35:20 +02:00
Shadow faef7e7602 update 2015-06-24 07:55:47 +03:00
Shadow f57b138871 fix sql 2015-06-23 09:37:23 +03:00
Shadow ff5ca62a1e credits 2015-06-22 08:20:34 +03:00
Shadow a8835c03cd Update en.php 2015-05-27 08:27:14 +03:00
Shadow 9ddcade822 credits 2015-05-27 08:26:36 +03:00
cosme12 50b1967cbc Dont save empty chat message 2015-04-08 12:25:58 -03:00
Shadow 3e325ee142 Merge pull request #172 from cosme12/patch-7
Marketplace text fix
2015-04-08 08:11:08 +03:00
cosme12 8ac499ac68 Marketplace text fix 2015-04-07 20:16:50 -03:00
cosme12 bdb523cb6b Building at random positions fix
Typing something like ```dorf2.php?a=25&id=20000&c=d6F``` where ```id=``` is the position in the village will get you an error if the id is higher than 40 ( not including WW id=99). ```Unknown column 'f20000t' in 'field list'```  
So I added this restriction when building. Although it fixes the problem, you can still build at WW position, bugging your building and not being able to use, or demolish it.
2015-04-07 17:42:06 -03:00
Shadow 7d9098d7c9 Fix vacation mode #2 2015-03-19 12:36:24 +02:00
Shadow e366960f43 Fix vacation mode 2015-03-17 14:09:48 +02:00
Shadow 99270daa21 gpack update
Now you can implement T4 graphic in T3.6 version
2014-12-02 12:54:37 +02:00
Shadow ceb85298c1 Update en.php 2014-10-06 11:18:21 +03:00
Shadow 034b935f57 Update en.php 2014-10-06 11:15:45 +03:00
Shadow 5c7e0cbd5d Update en.php 2014-10-06 10:34:12 +03:00