summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2009-02-16read hairstyle and gender from the looks change methodRoderic Morris1-1/+9
2009-02-09Mostly whitespace and formatting changesBjørn Lindeijer31-117/+103
(merged from eAthena client)
2009-01-28Added channel highlighting upon activity. Added /kick command to get rid of ↵David Athay5-10/+39
users from a channel
2009-01-25Fixed offset of right-click hitboxes and made NPCs without sprites clickable.Philipp Sehmisch3-11/+16
2009-01-18Added current map filename to debug window.Philipp Sehmisch3-14/+25
2009-01-15Fix bug with item links.David Athay1-1/+1
2009-01-14Added linking to item's just using [Item Name] in chatDavid Athay5-2/+65
2009-01-13Added new file to other build systemsDavid Athay2-0/+4
2009-01-13Added WoW style item adding to chat window. Right Ctrl and Left click to put ↵David Athay11-15/+153
the item in the chat input. Left click the item link to show a popup description, and click the link again to remove the popup.
2009-01-13Correct headers of Legend of Mazzeroth filesThorbjørn Lindeijer4-34/+34
2009-01-05Re-enabled buddy windowDavid Athay4-3/+19
2009-01-05Merged with 'master'Bjørn Lindeijer96-1312/+1310
2009-01-05Add buddy windowDavid Athay4-52/+35
2009-01-05Fix typo in updatehost reported by Jaxad.Dennis Friis1-1/+1
(cherry picked from eAthena client)
2008-12-17Remember windows visibility.Eugenio Favalli2-4/+14
(cherry picked from eathena client repository, commits 88af5cb15a02a26f4a5990ba3ef4df46e572bff4, 19ee623c0a1fdd333ef5b945ea887c983c829b1e, f924885ea0db5842b080610ec63e61a4bcc2a30c) Conflicts: src/gui/itemshortcutwindow.cpp src/gui/window.cpp
2008-12-17Reintroduced window name propertyBjørn Lindeijer19-30/+51
Still used in the eAthena client and it seems saner to me to have it.
2008-12-17Code reformattingBjørn Lindeijer25-188/+144
Mainly making sure 'const std::string &' is used everywhere instead of 'std::string const &'. The former has always been the preferred order in this project.
2008-12-14Tweaked some configuration defaultsBjørn Lindeijer2-9/+9
Scrolling is now a bit less lazy and the scroll radius is 0. In my opinion this is a better default. Framerate limiter is now off by default, since it makes the game appear a bit choppy. It's basically only useful for laptops anyway, and not too hard to find. (cherry picked from eAthena branch, commit c56bc78b5f5676784265dff8ed5334884e8dcc39) Conflicts: src/main.cpp
2008-12-14Fixed inconsistency in default window sizesBjørn Lindeijer8-10/+11
The default window sizes were all too small, since they were specified in content size. On pressing "Reset Windows", the sizes would be interpreted as such and apply alright. The inconsistency is now removed, and the default window sizes are always the size of the whole widget now, not just the contents. Signed-off-by: Bjørn Lindeijer <bjorn@lindeijer.nl> (cherry picked from eAthena branch, commit 72f5288682f46af1f7c04c002172178c880e060b) Conflicts: src/gui/chat.cpp src/gui/equipmentwindow.cpp src/gui/inventorywindow.cpp src/gui/ministatus.cpp src/gui/setup.cpp src/gui/skill.cpp src/gui/trade.cpp src/gui/window.cpp
2008-12-14Removed unnecessary c_str()Bjørn Lindeijer1-1/+1
2008-12-14Code reformatting to conform to line lengthBjørn Lindeijer1-39/+57
2008-12-14Obscure precise home directory name when making screenshotsFate1-4/+9
(cherry picked from commit 7d5c6124e9c9cf447286eaa58afe17adf6c1a81d)
2008-12-14Removed the unused NewSkillDialogBjørn Lindeijer5-271/+0
Won't be introduced based on eAthena anyway, I think even with tmwserv we have different plans now. Signed-off-by: Bjørn Lindeijer <bjorn@lindeijer.nl> (cherry picked from eAthena branch, commit bab09df7a8347f39221b2a87487dcd128a686def) Conflicts: src/game.cpp
2008-12-14Make the window shortcuts configurableJared Adams3-10/+28
(cherry picked from commit 4f2749ab2782fdece3c098b1a52b69cb37eea9eb)
2008-12-14Code reformattingBjørn Lindeijer12-238/+144
I wish I had never fallen for this weird style, and I hope removing it will prevent others from introducing new code like this. :-) (cherry picked from eAthena branch, commit 68760426532b9ca4c6939d7a7b8faa1586ee82e0) Conflicts: src/being.cpp src/being.h src/gui/tabbedcontainer.cpp src/particle.cpp src/particle.h
2008-12-14Removed ChargeDialogBjørn Lindeijer6-120/+0
The ChargeDialog was removed. This class was long dead anyway. (cherry picked from eAthena client commit 719e2b02bc6833198d6af2d3c95de96ef95f876d) Conflicts: src/CMakeLists.txt src/Makefile.am src/game.cpp src/localplayer.cpp src/localplayer.h src/net/charserverhandler.cpp tmw.cbp Signed-off-by: Bjørn Lindeijer <bjorn@lindeijer.nl>
2008-12-13Fixed confusion between username and characterBjørn Lindeijer1-20/+26
Passing --playername would set both the username as well as the name of the character to play with. Now --username sets the username while --character is used for choosing the character. Also made it so that the login dialog won't show up when username and password are passed from the command line, unless login fails.
2008-12-13Got rid of confusing --default parameterBjørn Lindeijer1-19/+6
It was only used to automatically choose the character. For choosing the character, --playername can be used.
2008-12-13Only require a restart to switch to full screen with OpenGL on Windows, sinceBjørn Lindeijer1-0/+11
it works fine in Linux without having to reinitialize the OpenGL state. Adapted change by kraant from Aethyra. (cherry picked from eAthena client)
2008-12-13Mantis #406 by jaxad0127David Athay4-14/+34
(cherry picked from eAthena client) Conflicts: src/monster.cpp src/resources/monsterinfo.h
2008-12-13Fixed crash when map layer has too many tiles.Bjørn Lindeijer1-1/+7
(cherry picked from eAthena client)
2008-12-13Included some documentation for the shortcut window by Vq.Bjørn Lindeijer2-0/+16
(cherry picked from eAthena client) Conflicts: ChangeLog
2008-12-13fixed some compilation problems reported by Jaxad, updated project file to ↵Philipp Sehmisch2-79/+33
new code::blocks format.
2008-12-13Fixed alignment (patch by Scraggy - Mantis #384) and spelling error.David Athay1-2/+2
(cherry picked from eAthena client)
2008-12-13Added support for being effects through the eAthena levelup message, and checkBjørn Lindeijer8-4/+163
whether the being exists before referencing it. Re-enabled proper MP bar display. Improved handling of a warp to the same map. (patch by Fate) (cherry picked from eAthena client, the part about the levelup message doesn't apply, and we now seem to have a second "effect manager"...) Conflicts: ChangeLog src/being.cpp src/being.h src/engine.cpp src/engine.h src/gui/ministatus.cpp src/net/beinghandler.cpp src/net/playerhandler.cpp src/net/protocol.h
2008-12-13The "name" property of the map is now used as caption of the minimap window ↵Philipp Sehmisch1-11/+6
when it exists. (cherry picked from eAthena client, replacing 'mapname' property handling)
2008-12-13Make sure to initialize joystick enabled stateBjørn Lindeijer3-48/+31
Joystick enabled state could end up uninitialized on unsuccesfully trying to open a joystick. In addition, the enabled state wasn't actually used in the accessor methods for the joystick buttons.
2008-12-13Delete resources after removing from the orphan list, to avoid double frees ↵Fate1-1/+1
during recursion
2008-12-13Updated INSTALL file to mention gitBjørn Lindeijer1-5/+4
Also got rid of autogen.sh and instructed to use 'autoreconf -i' instead. Conflicts: INSTALL (cherry picked from eAthena client. autogen.sh was already done here)
2008-12-13Added ability to add equipment to the shurtcut barBjørn Lindeijer4-20/+24
Patch by Nikos, with some improvements. Conflicts: NEWS src/gui/itemcontainer.cpp src/itemshortcut.cpp (cherry picked from eAthena client, not functional here yet)
2008-12-13Added Fate to the authorsBjørn Lindeijer1-0/+1
Conflicts: AUTHORS (cherry picked from eAthena client)
2008-12-13Center large minimaps on playerBjørn Lindeijer1-20/+21
Based on a patch by QOAL. (cherry picked from eAthena client) Conflicts: src/gui/minimap.cpp
2008-12-13Fixed compile error with GCC 4.4 reported by Martin Michlmayr.Bjørn Lindeijer1-5/+1
(cherry picked from eAthena client) Conflicts: ChangeLog
2008-12-13Do not activate shortcuts if tradewindow is visible.Dennis Friis1-8/+12
Conflicts: ChangeLog src/game.cpp (cherry picked from eAthena client)
2008-12-13* Use hair.xml to determine hair colours (#514)Fate4-25/+108
* Auto-detect number of hair styles available (#514) Conflicts: ChangeLog src/being.cpp src/being.h src/gui/char_select.cpp (cherry picked from eAthena client)
2008-12-13Moved gender and hair style back to BeingBjørn Lindeijer4-33/+48
These properties should also apply to NPCs and possibly even monsters in the future.
2008-12-07Fix background on resolutions other than 800x600Bjørn Lindeijer1-1/+10
The image is now centered and a gray background is drawn behind it so that parts that are not covered by the image don't show redrawing issues. (cherry picked from eAthena commit 07c2da75b7d994ab097e7c50d865bee929623685) Conflicts: src/main.cpp
2008-12-07Fixed wrapping in some cases, removed draw methodBjørn Lindeijer4-53/+21
The 'draw' method was confusingly named, and was actually for updating the GUI after a resize. Its functionality has been merged into 'widgetResized'. The wrapping was broken in the case where text was added to the NPC dialog, cause it was added to an already wrapped string, causing the wrapping to become permanent. Sorry for all the reformatting. Signed-off-by: Bjørn Lindeijer <bjorn@lindeijer.nl> (cherry picked from eAthena commit 43eb6ba950dd8bf978e539c7c7460ef5096438de) Conflicts: src/gui/npclistdialog.cpp src/gui/npclistdialog.h
2008-12-07Made NPC dialogues resizeable.Ira Rice4-7/+94
Conflicts: src/gui/inventorywindow.cpp src/gui/npc_text.cpp (cherry picked from eAthena commit 523eed88816298b1660ecb9e67db80776e4007bb)
2008-12-07Removed unnecessary weight check in itemdb loaderLloyd Bryant1-3/+3
(cherry picked from Aethyra commit e3fef730b69e4edc328e6105ea48b9774631563d)