summaryrefslogtreecommitdiff
path: root/src/net/ea/playerhandler.cpp
AgeCommit message (Collapse)AuthorFilesLines
2009-03-27Clean up chat and chat tabs some moreJared Adams1-1/+2
2009-03-27Merge branch 'aethyra/master'Bjørn Lindeijer1-5/+4
Conflicts: src/beingmanager.cpp src/gui/confirm_dialog.cpp src/gui/inventorywindow.cpp src/gui/inventorywindow.h src/gui/label.cpp src/gui/label.h src/gui/popup.cpp src/gui/popup.h src/gui/scrollarea.cpp src/gui/skin.cpp src/gui/skin.h src/gui/speechbubble.cpp src/gui/window.cpp src/gui/window.h src/localplayer.h src/main.cpp src/net/ea/playerhandler.cpp src/resources/ambientoverlay.h src/resources/dye.cpp src/resources/imagewriter.cpp src/resources/itemdb.cpp src/shopitem.cpp
2009-03-27Moved choosing of random death message to a functionBjørn Lindeijer1-55/+58
Also dynamically calculated the size of the array, so that you don't have to count the messages manually. :P
2009-03-27Include statement cleanup for net/ea/ directory.Bjørn Lindeijer1-26/+28
2009-03-26Major clean up of ChatTab handlingJared Adams1-2/+2
ChatTabs now manage their own adding/removal from the chat window, which lost most of it's chat related messages. Whisper handling is stil done by the ChatWindow, but it no longer manages any other tabs. ChannelTab handling is now the sole responsability of the Channels they are attached to. The general tab is handled by Game.
2009-03-25Merge branch 'eathena/master'Bjørn Lindeijer1-21/+24
Conflicts: A lot of files.
2009-03-22Merged the tmwserv client with the eAthena clientBjørn Lindeijer1-0/+417
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!