summaryrefslogtreecommitdiff
path: root/src
AgeCommit message (Collapse)AuthorFilesLines
2009-03-29Merge branch 'master' of git@gitorious.org:tmw/mainlinePhilipp Sehmisch113-1231/+1102
2009-03-29Fixed compilation on WindowsPhilipp Sehmisch3-4/+9
2009-03-28Fix output location for CommandHandlerJared Adams4-164/+168
2009-03-28Clean up eAthena party handling a bit moreJared Adams16-130/+127
2009-03-28Make the BuySellWindow eAthena onlyJared Adams2-12/+9
2009-03-28Remove #ifdefs related to Being creationJared Adams5-42/+49
Also move the Monster type offset handling into the eAthena netcode.
2009-03-28Add a sticky button to the Window classJared Adams5-14/+93
The Minimap window uses this so you can froce it to always be open. The Minimap toggle button can be used to show or hide it temporarily, as warping will reset it's visibility based on the sticky state and weather the 'new' map has a minimap.
2009-03-28Allow changing chat tabs with the keyboardJared Adams5-0/+47
Defaults to: [ for previous tab ] for next tab
2009-03-28Some more cleanupBjørn Lindeijer3-68/+67
Renamed Skill_Tab to SkillTab and got rid of MAX_SLOT, using maxSlot instead.
2009-03-28Fixed the wrapping of item and emoticon shortcut windowsBjørn Lindeijer1-4/+4
Take into account incomplete rows.
2009-03-27Make chat wrapJared Adams1-1/+1
2009-03-28Make the full inventory accessible againBjørn Lindeijer4-17/+17
Was broken due to tmwserv having only 50 as opposed to 100 places in the inventory at the moment.
2009-03-28Take the server port out of the updates dirBjørn Lindeijer1-2/+1
It doesn't make much sense to combine the update host with the server port. Either use the update host (and path) or the server and its port. To me it makes more sense that if different servers share the same update host, this data should be shared by the client. Ultimately we should store the updates by their hash, so that we can stick everything in the same place and avoid storing any duplicates.
2009-03-28Removed a lot of useless isVisible() checksBjørn Lindeijer19-53/+7
The draw() method of a widget isn't called when a widget is not visible.
2009-03-27FIx loading of initial map under eAthenaJared Adams1-0/+1
2009-03-27Moved the inventory and storage offset handling into netcodeBjørn Lindeijer13-113/+154
No need to complicate the item containers and inventory classes with a silly offset used by the eAthena server. Also fixed the logToStandardOut option by reading it from the config after the configuration has been initialized.
2009-03-27Clean up some ifdefs and start cleanup of partiesJared Adams13-31/+115
2009-03-27Clean up of most of the Network pointersBjørn Lindeijer37-285/+34
Now that messages can be sent without requiring a pointer to the Network instance, a lot of cleanup was possible.
2009-03-27Made eAthena's Network class statically accessibleBjørn Lindeijer25-117/+69
Now the instance doesn't need to be passed into the MessageOut class anymore. Expect a lot of cleanup in the next commit.
2009-03-27Removed unnecessary parenthesis on constructorsBjørn Lindeijer13-32/+32
2009-03-27Clean up chat and chat tabs some moreJared Adams25-174/+135
2009-03-27Fixed selection shadow not to overlap the emoticonsBjørn Lindeijer2-25/+26
Also fixed positioning for emoticons above the player sprite. Mantis-issue: 675
2009-03-27Fixed inventory window. Not resizable though.Bjørn Lindeijer15-148/+120
Resizing of the inventory window may come back later. Also did some more code cleanups, moving defines to enums, getting rid of eAthena-specific offset handling (to be done in the network layer), etc. Mantis-issue: 666
2009-03-27Gray out the magic bar when magic can't be usedBjørn Lindeijer1-0/+4
Restored code that probably got lost in a merge somewhere. Mantis-issue: 663
2009-03-27Fixed some positioning issuesBjørn Lindeijer15-108/+91
Started with not being able to click NPCs properly, and I ended up correcting the draw positions of overhead text, targets and sprite ordering. It's now a bit more straight-forward. The position of a being is simply in the middle of the sprite at the bottom. When drawing the sprite, an offset remains because all the sprites are compensating for getting drawn half a tile to the left and one tile up.
2009-03-27Removed the unused "logged" button statusBjørn Lindeijer2-12/+3
Seems to be remnant from before we had a proper tabbed area.
2009-03-27Removed all the static initializations of mAlphaBjørn Lindeijer16-16/+16
They happened before the configuration was initialized, so that didn't make any sense. It never showed up as a problem since the value is constantly set in the draw methods anyway.
2009-03-27Simplified and fixed initialization of login dataBjørn Lindeijer4-31/+19
Command line parameters were being overridden by old configuration settings.
2009-03-27Add some const to the chat tabsJared Adams6-8/+8
2009-03-27Fixed position of dots on minimapBjørn Lindeijer9-85/+50
Also made mPx and mPy private and synchronize with mPos on setPosition(). The side effects of setting destination and clearing the path have been removed from setPosition(). Only the tmwserv PlayerHandler seemed to rely on that feature. Mantis-issue: 672
2009-03-27Fixed copyright notices of skin.{h,cpp} filesBjørn Lindeijer2-17/+23
Also some code prettyfication.
2009-03-27Add a close command to WhisperTabJared Adams7-2/+31
2009-03-27Fix a segfault with empty whisper messagesJared Adams1-2/+4
2009-03-27Fix some problems with NPC dialogsJared Adams4-16/+2
NPCListDialog couldn't be opened because of infinite recursion, and it and NPCTextDialog both had resize bugs.
2009-03-27Merge branch 'aethyra/master'Bjørn Lindeijer28-344/+350
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-27Fixed some compiler warningsBjørn Lindeijer5-38/+36
Fixed a faulty == statement that should have been an assignment and a mismatched 'else' block.
2009-03-27Moved choosing of random death message to a functionBjørn Lindeijer3-69/+73
Also dynamically calculated the size of the array, so that you don't have to count the messages manually. :P
2009-03-27Changed the includes for the net/tmwserv/ directoryBjørn Lindeijer49-281/+287
2009-03-27Include statement cleanup for net/ea/ directory.Bjørn Lindeijer38-267/+290
2009-03-26Major clean up of ChatTab handlingJared Adams30-328/+291
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-26Add whisper tabs for TMWServJared Adams1-6/+1
2009-03-26Add WhisperTabsJared Adams8-17/+183
2009-03-26Removed setting and getting parent windows for popup classes, as thisIra Rice2-11/+1
wasn't really useful or used at all. Also removed some unneeded includes in the popup class. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-03-26Removed getting and setting a parent window from the popup class, sinceIra Rice3-18/+3
this currently does not provide any useful functionality to popups, as well as doing anything for that matter. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-03-26Fixed popup comment. This got chopped off some time when it was firstIra Rice1-2/+6
created. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-03-26Some code style commits influenced by TMW commitIra Rice7-37/+53
1715d0afe44a282a356ca88e47c92ec556f094dd Signed-off-by: Ira Rice <irarice@gmail.com>
2009-03-27Removed the unused BuddyList classBjørn Lindeijer4-204/+0
This class would store the buddy list in a file on the client, which is really not that useful. It was removed before in d268447e18c6e3edd80658f8f8d4317740c33af9, but apprently had come back with the merge with mainline.
2009-03-27Fixed name of "UpdateSliders" and reduced redundant docsBjørn Lindeijer6-59/+25
2009-03-27Fixed include structure in resource/ directoryBjørn Lindeijer52-309/+314
There is also a new rule that trivial constructors and destructors should no longer be trivially "documented", since this just takes up space with no gain.
2009-03-26Compile warning fixesBjørn Lindeijer6-37/+33
Mostly unsigned/signed mismatches and an unused variable.