Age | Commit message (Collapse) | Author | Files | Lines | |
---|---|---|---|---|---|
2009-03-25 | Merge branch 'origin/master' | Bjørn Lindeijer | 2 | -0/+102 | |
Conflicts: .mailmap | |||||
2009-03-25 | Merge branch 'eathena/master' | Bjørn Lindeijer | 10 | -130/+183 | |
Conflicts: A lot of files. | |||||
2009-03-24 | Forgot to add eAthena's item handler | Jared Adams | 2 | -0/+102 | |
2009-03-23 | Remove the CHATSKILL struct | Jared Adams | 1 | -9/+0 | |
2009-03-23 | Remove extra function for skill messages | Jared Adams | 1 | -95/+89 | |
2009-03-22 | Move handling of eA skill messages to SkillHandler | Jared Adams | 1 | -1/+129 | |
2009-03-22 | Merged the tmwserv client with the eAthena client | Bjørn Lindeijer | 30 | -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! |