Code Monkey home page Code Monkey logo

Comments (5)

blueboy avatar blueboy commented on August 31, 2024

Which code are you trying to merge?

I've just merged the latest https://github.com/cmangos/mangos-wotlk 'cmangos-wotlk' core with the playerbot code on https://github.com/blueboy/portal 'blueboy/portal' and there were no issues. Further this merged code compiled and ran fine.

If you are trying to merge the latest cmangos-wotlk with an existing server build (core+playerbot) that was originally supported by the MaNGOS foundation (i.e https://github.com/mangos/MaNGOS-Foundation), then I'm not surprised that your getting tons of merge conflicts. Although both cores shared commits, the code formatting of each was quite different and not mergeable, without extensive resolution. My advice is for you to build a new server, using fresh code from 'cmangos-wotlk' and 'blueboy/portal' githubs

Hope this helps

from portal.

Somecat avatar Somecat commented on August 31, 2024

Ok cool :). Ya i think i was using the new cmangs release (always hard to sort out after a fall out hehe). Ya, I will start over and see what happens. Btw I am no merge expert but all you have to do is pull it over the master (wotlk) right?

from portal.

Somecat avatar Somecat commented on August 31, 2024

Error 3 error LNK2019: unresolved external symbol "public: virtual __thiscall PlayerbotMgr::~PlayerbotMgr(void)" (??1PlayerbotMgr@@UAE@XZ) referenced in function "public: virtual void * __thiscall PlayerbotMgr::`vector deleting destructor'(unsigned int)" (??_EPlayerbotMgr@@UAEPAXI@Z) C:\Mangos\portal\win\VC110\CliRunnable.obj mangosd

get a ton of those link errors. Is there something i am missing =/?

from portal.

blueboy avatar blueboy commented on August 31, 2024

Hi,

If you 'git clone' the cmangos-wotlk first to your local repository (I've called mine cmangos)

git clone https://github.com/cmangos/mangos-wotlk.git cmangos
(The default active branch will be the 'master')

cd cmangos

If you then 'git pull' the playerbot code, it will automatically merge the remote code with the current active branch i.e 'master'. If you want to be more specific, you can define which remote branch you wish to use and also which local branch you wish to use.

git pull https://github.com/blueboy/portal.git // pull the remote master to the current active branch

git pull https://github.com/blueboy/portal.git new-ai:master // pull the remote new-ai branch to the local master

There is a good reason for the link issues (unresolved external errors) you are getting in your second question.

'VC110': There is currently no playerbot support for VS2012. That doesn't mean that playerbot will not work, it's just that there is no declaration of playerbot files in 'game.vcxproj' & 'game.vcxproj.filters' inside the VC110 folder. I will update these shortly, but if you want to get ahead, take a look at the same files in the VC100 folder. Then copy and paste the playerbot sections across. This should resolve your link errors when building the game library.

@edit I have now added playerbot support for VC110. Let us know if it works for you.

Hope this helps

from portal.

blueboy avatar blueboy commented on August 31, 2024

I have received no adverse feedback to the code revision I commited here: 4f587fc

I guess no news is good news ;) ... so I will consider this issue closed.

from portal.

Related Issues (20)

Recommend Projects

  • React photo React

    A declarative, efficient, and flexible JavaScript library for building user interfaces.

  • Vue.js photo Vue.js

    🖖 Vue.js is a progressive, incrementally-adoptable JavaScript framework for building UI on the web.

  • Typescript photo Typescript

    TypeScript is a superset of JavaScript that compiles to clean JavaScript output.

  • TensorFlow photo TensorFlow

    An Open Source Machine Learning Framework for Everyone

  • Django photo Django

    The Web framework for perfectionists with deadlines.

  • D3 photo D3

    Bring data to life with SVG, Canvas and HTML. 📊📈🎉

Recommend Topics

  • javascript

    JavaScript (JS) is a lightweight interpreted programming language with first-class functions.

  • web

    Some thing interesting about web. New door for the world.

  • server

    A server is a program made to process requests and deliver data to clients.

  • Machine learning

    Machine learning is a way of modeling and interpreting data that allows a piece of software to respond intelligently.

  • Game

    Some thing interesting about game, make everyone happy.

Recommend Org

  • Facebook photo Facebook

    We are working to build community through open source technology. NB: members must have two-factor auth.

  • Microsoft photo Microsoft

    Open source projects and samples from Microsoft.

  • Google photo Google

    Google ❤️ Open Source for everyone.

  • D3 photo D3

    Data-Driven Documents codes.