TravianZ

xinyin025/TravianZ

Fork 0

mirror of https://github.com/Shadowss/TravianZ.git synced 2026-06-30 17:44:22 +00:00

Commit Graph

Select branches

Hide Pull Requests

Shadowss-patch-1

Shadowss-patch-2

Shadowss-patch-3

Shadowss-patch-4

Shadowss-patch-5

TravianZ_Refactor

fix/waiting-loop-timing

lietuvis10-patch-1

lietuvis10-patch-10

lietuvis10-patch-11

lietuvis10-patch-2

lietuvis10-patch-3

lietuvis10-patch-4

lietuvis10-patch-5

lietuvis10-patch-6

lietuvis10-patch-7

lietuvis10-patch-8

lietuvis10-patch-9

master

refactor/split-sendunitsComplete

#100

#101

#102

#103

#104

#105

#106

#107

#108

#109

#11

#110

#111

#116

#118

#119

#120

#121

#124

#132

#133

#134

#136

#137

#138

#141

#143

#145

#146

#147

#148

#149

#150

#152

#156

#160

#170

#171

#172

#173

#174

#175

#176

#177

#180

#181

#182

#183

#186

#187

#188

#19

#190

#191

#192

#193

#194

#195

#196

#199

#200

#201

#202

#205

#206

#207

#208

#209

#212

#213

#214

#215

#216

#217

#218

#22

#220

#221

#222

#223

#224

#225

#226

#227

#228

#229

#230

#231

#232

#233

#234

#235

#236

#237

#238

#239

#240

#241

#242

#243

#244

#247

#248

#251

#252

#253

#254

#256

#257

#258

#259

#260

#261

#262

#264

#268

#269

#270

#271

#272

#273

#274

#276

#277

#278

#28

#280

#281

#282

#283

#284

#287

#288

#289

#307

#308

#309

#310

#311

#317

#321

#33

#36

#41

#43

#44

#48

#49

#50

#51

#53

#55

#56

#58

#59

#61

#63

#65

#70

#73

#81

#82

#88

#96

#99

8.3.3

8.3.3-BETA-b2

8.3.3-BETA-b3

8.3.3-BETA-b4

8.3.4

v10-full-refactor

6ba2da8da7 Update constant_format.tpl sempoi 2014-03-08 15:47:47 +08:00
0e6b45d605 Update constant_format.tpl sempoi 2014-03-08 15:46:15 +08:00
9c4ffbf024 Merge pull request #113 from sempoi/patch-2 Shadow 2014-03-07 15:14:24 +02:00
49e2be568d Update db_MYSQL.php sempoi 2014-03-07 20:47:25 +08:00
49607c28cd Update overview.tpl Shadow 2014-03-07 09:19:09 +02:00
3cb2ce2782 Update en.php Shadow 2014-03-07 07:31:10 +02:00
a54eb1ff91 reports Shadow 2014-03-06 08:58:12 +02:00
5d17534bf4 Update footer.tpl Shadow 2014-03-06 08:37:11 +02:00
ff68e792b7 Update editBuildings.php Shadow 2014-03-06 07:38:14 +02:00
6718e429b5 Update function.php Shadow 2014-03-06 07:36:22 +02:00
fa52446234 Update database.php Shadow 2014-03-06 07:33:26 +02:00
ddb54bceff Update village.tpl Shadow 2014-03-06 07:30:35 +02:00
cca7f5f1b4 credits Shadow 2014-03-05 09:01:35 +02:00
c042ed3e46 Merge pull request #112 from sempoi/patch-1 Shadow 2014-03-05 07:39:01 +02:00
e47b06f51b Merge pull request #110 from armando1980/patch-47 Shadow 2014-03-05 07:38:36 +02:00
0ef09aea78 Update sql.sql Shadow 2014-03-05 07:37:59 +02:00
fcc9766d41 update Shadow 2014-03-05 07:35:53 +02:00
39ae245e5e Update player_top10.tpl sempoi 2014-03-05 11:59:23 +08:00
de0e9d4bbd report for admin armando1980 2014-03-04 19:00:45 -05:00
1108059ea0 update Shadow 2014-03-04 13:52:13 +02:00
2b02c0aadf Merge branch 'master' of https://github.com/Shadowss/TravianZ Shadow 2014-03-04 13:47:54 +02:00
19767cf6a6 update admin panel Shadow 2014-03-04 12:44:25 +02:00
f343a4a791 Update village.tpl Shadow 2014-03-04 09:00:14 +02:00
5a9570c65f Update village.tpl Shadow 2014-03-04 08:56:42 +02:00
ecbb939898 Update dorf1.php Shadow 2014-03-04 08:23:49 +02:00
e662499675 Update dorf2.php Shadow 2014-03-04 08:23:47 +02:00
68c267ff1c Update dorf3.php Shadow 2014-03-04 08:23:44 +02:00
66b15135fe Update Session.php Shadow 2014-03-04 08:22:58 +02:00
044a3530fd Update sql.sql Shadow 2014-03-04 08:22:01 +02:00
92b360b83a Update newsbox1.tpl Shadow 2014-03-03 10:16:33 +02:00
77d49433f4 update Shadow 2014-03-03 09:57:40 +02:00
19b89d433c quest update Shadow 2014-03-03 09:53:44 +02:00
fb1aa636be Update newsbox1.tpl Shadow 2014-03-03 07:39:18 +02:00
956c2cc50b Update process.php Shadow 2014-03-03 07:37:54 +02:00
3ca619d2ea Update constant_format.tpl Shadow 2014-03-03 07:37:20 +02:00
b1b16f9d89 Update config.tpl Shadow 2014-03-03 07:36:41 +02:00
078abb4b47 Update newsbox2.tpl Shadow 2014-03-02 13:26:07 +02:00
4a658a2c13 Update wwupgrade.tpl Shadow 2014-03-02 13:25:49 +02:00
4397a2e9e0 Update newsbox2.tpl Shadow 2014-02-27 11:33:03 +02:00
902cc9b12e Update editServerSet.tpl Shadow 2014-02-26 08:22:35 +02:00
5fb572f93e Merge branch 'master' of https://github.com/Shadowss/TravianZ Shadow 2014-02-26 07:38:23 +02:00
923b4b3e18 updates admin Shadow 2014-02-26 07:38:09 +02:00
841632b3fc Update Profile.php Shadow 2014-02-26 07:32:05 +02:00
6c94bb2a8b Merge branch 'master' of https://github.com/Shadowss/TravianZ Shadow 2014-02-21 15:29:45 +02:00
48264ad2db update Shadow 2014-02-21 15:29:41 +02:00
895dab25e1 Update winner.php Shadow 2014-02-21 08:06:17 +02:00
575a536214 Update winner.php Shadow 2014-02-20 07:37:31 +02:00
c408f02aa7 Update newdorf.tpl Shadow 2014-02-19 12:42:51 +02:00
04f317d658 Update 27_3.tpl Shadow 2014-02-19 08:07:45 +02:00
cdbf094a0a Update wwupgrade.tpl Shadow 2014-02-19 08:02:22 +02:00
684652267f Merge pull request #103 from armando1980/patch-46 Shadow 2014-02-19 08:01:40 +02:00
1e46ecc77c Update Battle.php Shadow 2014-02-19 07:37:37 +02:00
012695f8b1 fix trade npc by armando armando1980 2014-02-18 15:26:18 -05:00
06af170c47 Update Units.php Shadow 2014-02-18 08:26:33 +02:00
102d42e731 Merge pull request #95 from armando1980/patch-41 Shadow 2014-02-17 08:42:24 +02:00
57ce864b4d Merge pull request #94 from armando1980/patch-40 Shadow 2014-02-17 08:41:53 +02:00
fe94e6325e Merge pull request #93 from armando1980/patch-39 Shadow 2014-02-17 08:41:45 +02:00
0b114cf444 Merge pull request #92 from armando1980/patch-38 Shadow 2014-02-17 08:41:07 +02:00
b7eb44661a Merge pull request #96 from armando1980/patch-42 Shadow 2014-02-17 08:40:52 +02:00
19d51a5cd6 Merge pull request #97 from armando1980/patch-43 Shadow 2014-02-17 08:40:45 +02:00
b33cba3fba Merge pull request #98 from armando1980/patch-44 Shadow 2014-02-17 08:40:39 +02:00
80f346236e Merge pull request #99 from armando1980/patch-45 Shadow 2014-02-17 08:40:31 +02:00
8e1bec2160 Merge branch 'master' of https://github.com/Shadowss/TravianZ Shadow 2014-02-17 08:12:10 +02:00
0231274907 lang update Shadow 2014-02-17 08:11:54 +02:00
776a4d00cb fix lang rally point ok by: Armando armando1980 2014-02-16 18:52:16 -05:00
2c85eff4a2 fix lang rally point ok by: Armando armando1980 2014-02-16 18:51:20 -05:00
c976cc0e71 fix lang rally point ok by: Armando armando1980 2014-02-16 18:49:58 -05:00
3ff3641ef1 fix lang rally point ok by: Armando armando1980 2014-02-16 18:45:10 -05:00
636ef7c372 fix lang rally point ok by: Armando armando1980 2014-02-16 18:33:47 -05:00
f46e71d775 fix lang rally point ok by: Armando armando1980 2014-02-16 18:33:30 -05:00
d5ea4fdbe5 fix lang rally point ok by: Armando armando1980 2014-02-16 18:19:37 -05:00
9e135efcb5 fix lang rally point ok by: Armando armando1980 2014-02-16 18:15:00 -05:00
268d46c782 Update upgrade.tpl Shadow 2014-02-16 09:03:37 +02:00
c20b0a2033 Update availupgrade.tpl Shadow 2014-02-16 09:02:45 +02:00
0cf063ba19 Update dorf2.php Shadow 2014-02-16 09:01:55 +02:00
fae5e45551 Update dorf1.php Shadow 2014-02-16 09:01:48 +02:00
1996e5df42 Update Building.php Shadow 2014-02-16 09:01:00 +02:00
ef45f955c4 Update Automation.php Shadow 2014-02-14 11:41:51 +02:00
7274234b7e Update def_end.tpl Shadow 2014-02-14 11:33:23 +02:00
6996bd7d31 Update Battle.php Shadow 2014-02-14 11:30:19 +02:00
64b32ed26a Merge branch 'master' of https://github.com/Shadowss/TravianZ Shadow 2014-02-13 08:05:22 +02:00
80c8d93edf security update Shadow 2014-02-13 08:05:11 +02:00
7ee6731e01 Merge pull request #89 from armando1980/patch-37 Shadow 2014-02-12 09:47:01 +02:00
9a6af85bdd it's fixed if you choice skip. by Armando armando1980 2014-02-11 18:55:56 -05:00
3293b6f94d Update 5.tpl Shadow 2014-02-11 13:13:28 +02:00
e43de8face Update index.php Shadow 2014-02-11 08:26:26 +02:00
9f5c09678d Update indexnews.tpl Shadow 2014-02-11 08:25:34 +02:00
2029d40d9a Update Battle.php Shadow 2014-02-10 07:42:46 +02:00
6b335d4d0a Update Battle.php Shadow 2014-02-10 07:39:00 +02:00
a960a5a50b Update Automation.php Shadow 2014-02-10 07:37:17 +02:00
c8b348e283 Merge branch 'master' of https://github.com/Shadowss/TravianZ Shadow 2014-02-03 12:07:46 +02:00
4e8a7bf54c folder error Shadow 2014-02-03 12:07:13 +02:00
7792417362 Update Automation.php Shadow 2014-02-02 12:12:59 +02:00
fbec5c065e Update village.tpl Shadow 2014-01-31 08:38:03 +02:00
5c1e103431 Update admin.php Shadow 2014-01-31 08:29:17 +02:00
31faf6f924 Merge branch 'master' of https://github.com/Shadowss/TravianZ Shadow 2014-01-31 08:20:42 +02:00
15182ecb3d fix some things in admin panel Shadow 2014-01-31 08:14:15 +02:00
c9cc7c1f0a Merge pull request #83 from Fannybaws/UpdateCreateUsers Shadow 2014-01-29 06:43:25 -08:00
94f9e374ae Merge pull request #82 from armando1980/patch-35 Shadow 2014-01-29 06:42:27 -08:00
f2d2b187bc Merge pull request #81 from armando1980/patch-34 Shadow 2014-01-29 06:42:15 -08:00

... 18 19 20 21 22 ...