multiple update,delete,optimise and rewrite + templates #66

Closed
wants to merge 66 commits into
from

Conversation

Projects
None yet
2 participants
Collaborator

GameEngine commented Dec 15, 2011

No description provided.

GameEngine and others added some commits Nov 21, 2011

Update README
Signed-off-by: GameEngine <paul.navalassie@gmail.com>
Optimize query
Now multivillage.tpl use just one query
Contributor

inblackhole commented Dec 16, 2011

Wow, so many modifications.
but it seems not very easy to merge to advocaite' master.


$ git checkout GameEngine
Switched to branch 'GameEngine'

$ git pull
remote: Counting objects: 174, done.
remote: Compressing objects: 100% (35/35), done.
remote: Total 112 (delta 84), reused 102 (delta 74)Receiving objects: 43% (49/
Receiving objects: 45% (51/112)
Receiving objects: 100% (112/112), 37.81 KiB, done.
Resolving deltas: 100% (84/84), completed with 53 local objects.
From https://github.com/GameEngine/Travianx

  • f45e872...5ed7dd8 master -> GameEngine/master (forced update)
    Auto-merging GameEngine/Village.php
    Merge made by recursive.
    GameEngine/Account.php | 112 +++--
    GameEngine/Alliance.php | 616 +++++++++++++++------------
    GameEngine/Automation.php | 51 +--
    GameEngine/BBCode.php | 8 +-
    GameEngine/Database/db_MYSQL.php | 675 +++++++++++++++--------------
    GameEngine/Form.php | 75 +++-
    GameEngine/Generator.php | 189 +++++----
    GameEngine/Lang/en.php | 1 +
    GameEngine/Lang/fr.php | 388 +++++++++++++++++
    GameEngine/Logging.php | 93 +++--
    GameEngine/Profile.php | 135 ++++--
    GameEngine/Ranking.php | 417 ++++++++++--------
    GameEngine/Session.php | 10 +-
    GameEngine/Village.php | 5 +-
    GameEngine/functions.php | 23 +-
    Templates/Ajax/mapscroll.tpl | 192 ++++++---
    Templates/Ajax/mapscroll2.tpl | 170 +++++---
    Templates/Build/16_troops.tpl | 2 +-
    Templates/Build/25_2.tpl | 2 +-
    Templates/Build/26_2.tpl | 4 +-
    Templates/Build/37.tpl | 9 +-
    Templates/Build/37_hero.tpl | 205 ++++++---
    Templates/Build/38.tpl | 6 +-
    Templates/Build/39.tpl | 6 +-
    Templates/Map/mapview.tpl | 308 +++++++------
    Templates/Map/mapviewlarge.tpl | 328 ++++++++-------
    Templates/Map/vilview.tpl | 49 ++-
    Templates/a2b/newdorf.tpl | 4 +-
    Templates/dorf3/1.tpl | 3 +-
    Templates/footer.tpl | 14 +-
    Templates/header.tpl | 35 +-
    Templates/links.tpl | 2 +-
    Templates/menu.tpl | 7 +-
    Templates/movement.tpl | 51 ++-
    Templates/production.tpl | 14 +-
    Templates/quest.tpl | 44 +-
    Templates/res.tpl | 2 -
    Templates/troops.tpl | 11 +-
    activate.php | 10 +-
    ajax.php | 31 +-
    allianz.php | 8 +-
    dorf3.php | 121 +-----
    gpack/travian_default/lang/en/compact.css | 41 ++
    karte2.php | 97 ++---
    manual.php | 43 +--
    unx.js | 115 ++++-
    46 files changed, 2832 insertions(+), 1900 deletions(-)
    create mode 100644 GameEngine/Lang/fr.php

$ git checkout advocaite
Switched to branch 'advocaite'

$ git merge --no-commit GameEngine
Removing AC_OETags.js
Auto-merging GameEngine/Automation.php
Removing GameEngine/Data/buidata.php_backup_postpercup
Removing GameEngine/Data/buidata.php_backup_postrespalfix
Removing GameEngine/Data/buidata.php_nk
Removing GameEngine/favicon.ico
Auto-merging Templates/Building.tpl
CONFLICT (content): Merge conflict in Templates/Building.tpl
Auto-merging Templates/links.tpl
Auto-merging Templates/multivillage.tpl
CONFLICT (content): Merge conflict in Templates/multivillage.tpl
Removing gpack/download/travian_default.zip
Auto-merging gpack/travian_default/lang/en/compact.css
CONFLICT (content): Merge conflict in gpack/travian_default/lang/en/compact.css
Auto-merging install/data/constant_format.tpl
CONFLICT (content): Merge conflict in install/data/constant_format.tpl
Auto-merging login.php
Removing testmysql.php
Removing uncrypt.js

Automatic merge failed; fix conflicts and then commit the result.

Collaborator

GameEngine commented Dec 16, 2011

yes but not much change is very important especially at its clarity makes it a winner

update failed .... I expect one can

the problem of some Vienda modification date file freezes (updated on git and a shift with my pc that had a bug)

@GameEngine GameEngine closed this Dec 16, 2011

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment