summaryrefslogtreecommitdiff
path: root/src/net/ea
AgeCommit message (Collapse)AuthorFilesLines
2009-03-25Merge branch 'origin/master'Bjørn Lindeijer2-0/+102
Conflicts: .mailmap
2009-03-25Merge branch 'eathena/master'Bjørn Lindeijer10-130/+183
Conflicts: A lot of files.
2009-03-24Forgot to add eAthena's item handlerJared Adams2-0/+102
2009-03-23Remove the CHATSKILL structJared Adams1-9/+0
2009-03-23Remove extra function for skill messagesJared Adams1-95/+89
2009-03-22Move handling of eA skill messages to SkillHandlerJared Adams1-1/+129
2009-03-22Merged the tmwserv client with the eAthena clientBjørn Lindeijer30-0/+3997
This merge involved major changes on both sides, and as such took several weeks. Lots of things are expected to be broken now, however, we now have a single code base to improve and extend, which can be compiled to support either eAthena or tmwserv. In the coming months, the plan is to work towards a client that supports both eAthena and tmwserv, without needing to be recompiled. Conflicts: Everywhere!