summaryrefslogtreecommitdiff
path: root/src/gui/char_select.cpp
AgeCommit message (Collapse)AuthorFilesLines
2009-03-25Merge branch 'eathena/master'Bjørn Lindeijer1-17/+18
Conflicts: A lot of files.
2009-03-23Merge branch 'aethyra/master'Bjørn Lindeijer1-9/+8
Conflicts: Many files.
2009-03-23Move all TMWServ-specific code to net/tmwservJared Adams1-2/+4
Also fix several instances where the same net handler was being used for both servers, and a few other related oddities.
2009-03-22Merged the tmwserv client with the eAthena clientBjørn Lindeijer1-16/+338
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!
2009-03-19Make sure positionable dialogs start out centeredJared Adams1-2/+2
2009-03-14Made a label class derived from the guichan label class which utilizesIra Rice1-9/+8
the palette colors. While technically, this can be accomplished through other means, it's rather clumsy overall, and is prone to introducing in programmer errors. This commit finally catches every case where text is used, and applies the text color from the color dialog to each of them appropriately. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-18Introduced a toLower method and grouped string utilsBjørn Lindeijer1-1/+1
The string utility methods are now grouped together in the stringutils.h header. Also, a toLower method was added for convenience.
2009-02-18Move check to a more appropriate placeJared Adams1-2/+2
It shouldn't have been moved to where it was in the first place, as it doesn't have any effecxt on that code, but was originally on the other code (where it is now).
2009-02-18Move check to a more appropriate placeJared Adams1-2/+2
It shouldn't have been moved to where it was in the first place, as it doesn't have any effecxt on that code, but was originally on the other code (where it is now).
2009-02-18Introduced a toLower method and grouped string utilsBjørn Lindeijer1-1/+1
The string utility methods are now grouped together in the stringutils.h header. Also, a toLower method was added for convenience.
2009-02-17Fix small bug in character select dialogJared Adams1-1/+1
That check can probably be removed entirely, as it's inappropriate.
2009-02-17Show money for initial character in char selectJared Adams1-0/+1
2009-02-17Fix small bug in character select dialogJared Adams1-1/+1
That check can probably be removed entirely, as it's inappropriate.
2009-02-15Fixed compiler warningsBjørn Lindeijer1-1/+1
Comparison between signed and unsigned integer expressions.
2009-02-15Fixed compiler warningsBjørn Lindeijer1-1/+1
Comparison between signed and unsigned integer expressions.
2009-02-15Add configurable units systemJared Adams1-5/+17
2009-02-10Fixed header files, as well as removed the unused buddy list class (notIra Rice1-2/+3
useful since buddy lists are tracked through the player relation interface instead) Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-09Mostly whitespace fixesBjørn Lindeijer1-12/+12
Removed tab characters and trailing spaces and added spaces between "if(", "for(", "while(" and "switch(".
2009-02-09Merged with Aethyra master as of 2009-02-09Bjørn Lindeijer1-0/+3
Conflicts: A lot of files...
2009-02-09Mostly whitespace fixesBjørn Lindeijer1-12/+12
Removed tab characters and trailing spaces and added spaces between "if(", "for(", "while(" and "switch(".
2009-02-09Mostly whitespace and formatting changesBjørn Lindeijer1-1/+0
(merged from eAthena client)
2009-02-07Some more include cleanups.Ira Rice1-0/+2
Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-04Went through the gui folder and revised the include statements to notIra Rice1-0/+1
include anything not needed by that specific widget or window. This appears to have cleaned up system performance a bit on my current setup, where it went from idling on 45% in game with opengl down to 30% now. Also moved iptostring to the tostring header, as importing all of network.h is a little overkill to use that function, and it goes along with the basic functions that are in that header file anyways. TODO: find out a way to get rid of warnings when a class doesn't use this function. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-26Merged new and delete buttons, since either one or the other is alwaysIra Rice1-20/+21
enabled, and having both doesn't look as good. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-23Removed unnecessary references to The Mana World in code headersBjørn Lindeijer1-4/+4
This dates back to the old days of TMW, but the usage instructions of GPLv2 don't mention this being necessary. Since it doesn't add anything, avoid the branding in these sections.
2009-01-16Some small layout tweaks, as well as making a few dialogs moreIra Rice1-23/+29
consistent UI-wise (continue-like functionality is always in the bottom right corner, with canceling to the left of it). Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-16Adjusted character selection screen to be a bit more translationIra Rice1-46/+38
friendly, as well as modified the character creation screen to use the layout code. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-15Style cleanups throughout most of the code. Splitting function type fromIra Rice1-8/+4
the function names should no longer be around. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-06Fixed the previous commit to actually use the layout engine.Ira Rice1-43/+24
Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-06Converted the character selection dialog to use the layout widget.Ira Rice1-11/+16
Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-06Added support for internationalizationIra Rice1-30/+33
Merged from the mainline client. Originally implemented by Guillaume Melquiond, starting with commit 1828eee6a6d91fd385ad1e69d93044516493aa91. Conflicts: INSTALL configure.ac src/Makefile.am src/gui/buy.cpp src/gui/confirm_dialog.cpp src/gui/inventorywindow.cpp src/gui/login.cpp src/gui/menuwindow.cpp src/gui/minimap.cpp src/gui/ok_dialog.cpp src/gui/popupmenu.cpp src/gui/register.cpp src/gui/sell.cpp src/gui/setup.cpp src/gui/setup_video.cpp Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-05Handling gender with an enum everywhere.Philipp Sehmisch1-2/+2
(cherry picked from mainline commit d3adc61aa4b4924f82d8cbc23bea26da7257da97) Conflicts: src/net/beinghandler.cpp src/net/charserverhandler.cpp src/player.cpp src/player.h
2008-12-13* Use hair.xml to determine hair colours (#514)Fate1-3/+4
* 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-07Merge commit 'a7c21e6f8add37af7412449742ec55c8daa8571a'Ira Rice1-2/+0
Conflicts: AUTHORS CMakeLists.txt ChangeLog INSTALL README aethyra.cbp configure.ac data/help/changes.txt data/help/commands.txt data/help/header.txt data/help/support.txt src/Makefile.am src/aethyra.rc src/being.cpp src/being.h src/equipment.cpp src/equipment.h src/floor_item.h src/game.cpp src/gui/buddywindow.cpp src/gui/char_select.cpp src/gui/char_server.cpp src/gui/chat.cpp src/gui/chat.h src/gui/equipmentwindow.cpp src/gui/equipmentwindow.h src/gui/gui.cpp src/gui/inventorywindow.cpp src/gui/inventorywindow.h src/gui/itemcontainer.cpp src/gui/itemcontainer.h src/gui/minimap.cpp src/gui/ministatus.cpp src/gui/newskill.cpp src/gui/npc_text.cpp src/gui/npclistdialog.h src/gui/ok_dialog.cpp src/gui/setup_video.cpp src/gui/skill.cpp src/gui/skill.h src/gui/status.h src/gui/table_model.h src/gui/updatewindow.cpp src/gui/viewport.cpp src/inventory.cpp src/inventory.h src/keyboardconfig.cpp src/keyboardconfig.h src/localplayer.cpp src/localplayer.h src/logindata.h src/main.cpp src/map.cpp src/monster.cpp src/monster.h src/net/beinghandler.cpp src/net/beinghandler.h src/net/buysellhandler.cpp src/net/equipmenthandler.cpp src/net/loginhandler.cpp src/net/loginhandler.h src/net/network.h src/net/npchandler.cpp src/net/playerhandler.cpp src/net/protocol.h src/net/tradehandler.cpp src/npc.cpp src/npc.h src/particleemitter.cpp src/particleemitterprop.h src/player.cpp src/player.h src/player_relations.cpp src/resources/imageset.cpp src/resources/imageset.h src/resources/itemdb.cpp src/resources/mapreader.cpp src/resources/monsterinfo.h src/text.cpp src/text.h src/textmanager.cpp src/textmanager.h src/tileset.h src/utils/fastsqrt.h src/utils/strprintf.cpp src/winver.h tools/tmxcopy/Makefile tools/tmxcopy/base64.cpp tools/tmxcopy/base64.h tools/tmxcopy/tostring.h Signed-off-by: Ira Rice <irarice@gmail.com>
2008-11-18Pedantic fixes to the client, where I alphabetized all of the include Ira Rice1-4/+1
statements, as well as removing the new skill dialog, which we do not, nor will we use (if we do, it'd be a new one that we'd make). WARNING!!! This, and all other previous builds have a linker error for the Gnome libraries version 4.3.2 on my setup. It's assumed that this is also the case for other users of this library as well. I'm currently assuming that there's a bug in the compiler itself, and will look into reporting this, but in the mean time, it doesn't build for these users, unfortunately. Sorry about this.
2008-11-16Got rid of CVS/Subversion $Id$ markersBjørn Lindeijer1-2/+0
I don't know why we dealt with these things for so long. Did we ever get anything out of it?
2008-11-16Got rid of CVS/Subversion $Id$ markersBjørn Lindeijer1-2/+0
I don't know why we dealt with these things for so long. Did we ever get anything out of it?
2008-11-01* Use hair.xml to determine hair colours (#514)Fate1-3/+3
* Auto-detect number of hair styles available (#514)
2008-10-27De-hardcoded the number of hair styles.Ira Rice1-2/+2
2008-10-23Cleaned up ColorDB code so that it loads with all other databases, as Ira Rice1-5/+4
well as fixed color cycling.
2008-10-19Fixed a small error that I didn't notice before with de-hardcoding the Ira Rice1-0/+3
colors. Thanks goes to paks for noticing this.
2008-10-15De-hardcoded colors in trunk. Now, all colors are loaded from Ira Rice1-2/+6
colors.xml.
2008-07-18Import of client treeLloyd Bryant1-1/+1
2008-04-25Added client-side email address change ability.Yohann Ferreira1-11/+20
2008-04-19Made the client clean characters information at unlogging to avoid a freeze ↵Yohann Ferreira1-0/+1
when relogging with another account.
2008-04-18Added a change password dialog. State code is to be reworked.Yohann Ferreira1-14/+23
(Once again, I need feedback. Thanks!)
2008-04-11Ported trunk over to Guichan 0.8.0. Based on merge from 0.0 branch, but becauseBjørn Lindeijer1-4/+3
of quite a bit of GUI differences there were additional changes and probably additional issues. You have been warned. ;) Merged revisions 4045-4049,4051-4059 via svnmerge from https://themanaworld.svn.sourceforge.net/svnroot/themanaworld/tmw/branches/0.0 ........ r4045 | b_lindeijer | 2008-04-07 17:23:07 +0200 (Mon, 07 Apr 2008) | 3 lines Upgraded to Guichan 0.8.0 (merge from guichan-0.8 branch, except for gcn::TabbedArea usage) ........ r4059 | b_lindeijer | 2008-04-09 16:25:42 +0200 (Wed, 09 Apr 2008) | 2 lines Fixed problem with row height in shop list box. ........
2008-04-03Added patch fromDavid Athay1-1/+1
postalworker bug id=117 to fix cancel connecting to a sick server.
2008-02-22Merged creation of female characters from Legend of Mazzeroth.Philipp Sehmisch1-5/+45
2007-12-18Updated attribute system to the latest design decisions (removed charisma, ↵Philipp Sehmisch1-9/+7
kept agility in)