ArtUrlWWW

Dear Valhalla developers! Please, update git://github.com/Tasssadar/Valhalla-Project.git dual-spec for fix merge error with new version of the original mangos repo.

I have try it. Big thanks for developers. But now "scripted" only 5 creatures and normally work only one - his id is the 28094 - orange tank. Other creatures doesn't work - on dragon I can sit but dragon don't move. About the guns - I can sit in, but after that I can't get out with guns - need to relogin for get out with guns. About the tanks (not about the 28094) - attack functions doesn't work, any tank from the patch is aggressive for the player for default. It is still damp patch...

I have try this, AND THIS WORK!!! BIG REGARDS!!!

But how? How to make patches from files, what merged with CONFLICT? Where I can found sources?

Hello. I download new source from original mangos repo and I try to pull dual-spec branch from the git://github.com/Tasssadar/Valhalla-Project.git and I have many conflicts: Auto-merging src/game/AggressorAI.cpp Auto-merging src/game/BattleGroundMgr.cpp Auto-merging src/game/CharacterHandler.cpp CONFLICT (content): Merge conflict in src/game/CharacterHandler.cpp Auto-merging src/game/Chat.cpp Auto-merging src/game/Chat.h Auto-merging src/game/ConfusedMovementGenerator.cpp CONFLICT (content): Merge conflict in src/game/ConfusedMovementGenerator.cpp Auto-merging src/game/Creature.cpp CONFLICT (content): Merge conflict in src/game/Creature.cpp Auto-merging src/game/Creature.h CONFLICT (content): Merge conflict in src/game/Creature.h Auto-merging src/game/CreatureEventAI.cpp Auto-merging src/game/DBCStores.cpp CONFLICT (content): Merge conflict in src/game/DBCStores.cpp Auto-merging src/game/DBCStores.h Auto-merging src/game/DBCStructure.h Auto-merging src/game/DBCfmt.h Auto-merging src/game/FleeingMovementGenerator.cpp CONFLICT (content): Merge conflict in src/game/FleeingMovementGenerator.cpp Auto-merging src/game/GameObject.cpp Auto-merging src/game/GameObject.h Auto-merging src/game/GridNotifiers.cpp Auto-merging src/game/Group.h Auto-merging src/game/GroupHandler.cpp Auto-merging src/game/HomeMovementGenerator.cpp CONFLICT (content): Merge conflict in src/game/HomeMovementGenerator.cpp Auto-merging src/game/Level3.cpp CONFLICT (content): Merge conflict in src/game/Level3.cpp Auto-merging src/game/MiscHandler.cpp Auto-merging src/game/MotionMaster.cpp CONFLICT (content): Merge conflict in src/game/MotionMaster.cpp Auto-merging src/game/MovementHandler.cpp CONFLICT (content): Merge conflict in src/game/MovementHandler.cpp Auto-merging src/game/Object.cpp CONFLICT (content): Merge conflict in src/game/Object.cpp Auto-merging src/game/Object.h CONFLICT (content): Merge conflict in src/game/Object.h Auto-merging src/game/ObjectMgr.cpp Auto-merging src/game/ObjectMgr.h Auto-merging src/game/Opcodes.cpp CONFLICT (content): Merge conflict in src/game/Opcodes.cpp Auto-merging src/game/Pet.cpp Auto-merging src/game/Pet.h Auto-merging src/game/PetHandler.cpp Auto-merging src/game/Player.cpp Auto-merging src/game/Player.h CONFLICT (content): Merge conflict in src/game/Player.h Auto-merging src/game/PointMovementGenerator.cpp CONFLICT (content): Merge conflict in src/game/PointMovementGenerator.cpp Auto-merging src/game/RandomMovementGenerator.cpp CONFLICT (content): Merge conflict in src/game/RandomMovementGenerator.cpp Auto-merging src/game/ReactorAI.cpp Auto-merging src/game/SharedDefines.h CONFLICT (content): Merge conflict in src/game/SharedDefines.h Auto-merging src/game/Spell.cpp CONFLICT (content): Merge conflict in src/game/Spell.cpp Auto-merging src/game/Spell.h CONFLICT (content): Merge conflict in src/game/Spell.h Auto-merging src/game/SpellAuras.cpp Auto-merging src/game/SpellEffects.cpp CONFLICT (content): Merge conflict in src/game/SpellEffects.cpp Auto-merging src/game/SpellHandler.cpp CONFLICT (content): Merge conflict in src/game/SpellHandler.cpp Auto-merging src/game/TargetedMovementGenerator.cpp CONFLICT (content): Merge conflict in src/game/TargetedMovementGenerator.cpp Auto-merging src/game/Unit.cpp Auto-merging src/game/Unit.h CONFLICT (content): Merge conflict in src/game/Unit.h Auto-merging src/game/Vehicle.cpp Auto-merging src/game/WaypointMovementGenerator.cpp CONFLICT (content): Merge conflict in src/game/WaypointMovementGenerator.cpp Auto-merging src/game/World.cpp Auto-merging src/game/World.h Auto-merging src/game/WorldSession.h Auto-merging src/game/debugcmds.cpp CONFLICT (content): Merge conflict in src/game/debugcmds.cpp Auto-merging src/mangosd/mangosd.conf.dist.in Auto-merging src/shared/Database/SQLStorage.cpp CONFLICT (content): Merge conflict in src/shared/Database/SQLStorage.cpp Auto-merging win/VC80/mangosd.vcproj Automatic merge failed; fix conflicts and then commit the result. How I can fix CONFLICT errors with my hands? But vehicle branch pulled on original mangos correctly

You can make patch with your hands (sorry my bad English ) For this do this steps cd YOURFOLDER git clone git://github.com/Tasssadar/Valhalla-Project.git mkdir patches cd patches git format-patch origin/vehicle ce7dae7565a981a9b5694966ed0fc492e7a02c63 ce7dae7565a981a9b5694966ed0fc492e7a02c63 - it's hash of the latest commit, see on http://github.com/Tasssadar/Valhalla-Project/commits/vehicle And in folder YOURFOLDER/patches you get all patches from first commit on repo to last commit. For example 3030--vh1-VEHICLE-PATCH.patch

Hello. When you clean you master repo git://github.com/Tasssadar/Valhalla-Project.git ? I mean, when I will can make git clone git://github.com/Tasssadar/Valhalla-Project.git cd mangos git checkout -b vehicle git pull git://github.com/Tasssadar/Valhalla-Project.git vehicle ???

Good, but TC2 is for the 3.1.3 version client? And in TC2 repo haven't file src/gave/Vehicle.cpp Where is his vehicle source?

What is the TC2??? May be TC2 - it's repo? If yes, what is the TC2 URL to download?

What is the wintergrasp and TC2? May be TC2 - it's repo? If yes, what is the TC2 URL to download? Detailed description: I download insiders repo. Next, I made patch from your vehicle branch, named as the 3030--vh1-VEHICLE-PATCH.patch Next, I compiled server and apply SQL patches on DB tables Next, I have applay patch on insider's repo and fix any problems with my hands ))) Next, I start the server and gone to the Ulduar. Next, I click on the tank (cursor turns into a green arrow pointing down) Next, I see what I printscreen and attached picture above

What is the wintergrasp and TC2? May be TC2 - it's repo? If yes, what is the TC2 URL to download? Detailed description: I download insiders repo. Next, I made patch from your vehicle branch, named as the 3030--vh1-VEHICLE-PATCH.patch Next, I compiled server and apply SQL patches on DB tables Next, I have applay patch on insider's repo and fix any problems with my hands ))) Next, I start the server and gone to the Ulduar. Next, I click on the tank (cursor turns into a green arrow pointing down) Next, I see what I printscreen and attached picture above

RESULT OF THE MY WORK. Why when I click on machine (green symbol), machine says, "Hello, ... (login)"? I have lose with this patch 9 hours...

I try ask again How to get files from the http://github.com/Tasssadar/Valhalla-Project/commit/465f756222119cb00c0eea4e0435be8f90376681#diff-41commit as all modified files or one united diff file???

No, I don't know ))) And the second question - that I could not apply the patch to correct my repository. Then, how to get with GIT can get the files modified in this patch? For example, files with commit http://github.com/Tasssadar/Valhalla...5be8f90376681? Ie get the files themselves, displayed on the page http://github.com/Tasssadar/Valhalla...5be8f90376681?

Thank you. But now I use http://github.com/insider42/mangos repo. I need to applay your patches on this repo. I like this repo for reqular updates and many patches. Can you make your repo like the http://github.com/insider42/mangos? With more patches, vehicle and "dual spec" - all in one? It so happens that when you apply to the original repository of mangos patch on the vehicle of your repository is not possible to put a patch on the dual-spec. Could you make a repository with these two patches simultaneously with the patch from the repository http://github.com/insider42/mangos? And the second question - that I could not apply the patch to correct my repository. Then, a commando GIT can get the files modified in this patch? For example, files with commit http://github.com/Tasssadar/Valhalla-Project/commit/465f756222119cb00c0eea4e0435be8f90376681? Ie get the files themselves, displayed on the page http://github.com/Tasssadar/Valhalla-Project/commit/465f756222119cb00c0eea4e0435be8f90376681?