search

Shadez / wowarmory

The World of Warcraft Armory is a vast searchable database of information for World of Warcraft - taken straight from the real servers and presented in a user-friendly interface. Since the Armory pulls its data from the actual game servers, it is the most comprehensive and up-to-date database on the characters, arena teams, guilds, and items of World of Warcraft in existence.
http://getmangos.com/community/showthread.php?t=12096
GNU General Public License v3.0
193 stars 183 forks source link

Trinity Patch #151

Closed alcsilian closed 13 years ago

alcsilian commented 13 years ago

Hey. What we do about trinity patch since it doesn't apply? Could you help us out please?!

mihawk90 commented 13 years ago

The Patch itself woks, just apply manually...

Patch-File seems to be broken but you can apply all changes manually

robertyanta commented 13 years ago

need some help, how can i apply the patch manually???, i dont understand, when i type git apply --check wowarmory_patch.patch on root dir of the trinitycore code i just get these errors/warnings:

warning: src/server/game/Achievements/AchievementMgr.cpp has type 100644, expected 100755 error: patch failed: src/server/game/Achievements/AchievementMgr.cpp:1951 error: src/server/game/Achievements/AchievementMgr.cpp: patch does not apply warning: src/server/game/Entities/Item/Item.cpp has type 100644, expected 100755 error: patch failed: src/server/game/Entities/Item/Item.cpp:278 error: src/server/game/Entities/Item/Item.cpp: patch does not apply warning: src/server/game/Entities/Player/Player.cpp has type 100644, expected 100755 error: patch failed: src/server/game/Entities/Player/Player.cpp:4908 error: src/server/game/Entities/Player/Player.cpp: patch does not apply warning: src/server/game/Entities/Player/Player.h has type 100644, expected 100755 error: patch failed: src/server/game/Entities/Player/Player.h:1028 error: src/server/game/Entities/Player/Player.h: patch does not apply warning: src/server/game/Entities/Unit/Unit.cpp has type 100644, expected 100755 error: patch failed: src/server/game/Entities/Unit/Unit.cpp:15177 error: src/server/game/Entities/Unit/Unit.cpp: patch does not apply

mihawk90 commented 13 years ago

I mean not apply via patchfile and git, but apply change by change by hand in VisualStudio or whatever editor you are using. So no automatic applying via git, but manually by hand.

robertyanta commented 13 years ago

ok mihawk90, thanks for your fast anwser, did it and works great, thanks again.... think the topic can be closed now