summaryrefslogtreecommitdiff
path: root/src/gui/itemshortcutcontainer.cpp
AgeCommit message (Collapse)AuthorFilesLines
2009-02-15Removed unnecessary parenthesis at constructorsBjørn Lindeijer1-1/+1
When not passing any parameters to constructors, there is no reason for using parenthesis.
2009-02-09Merged with Aethyra master as of 2009-02-09Bjørn Lindeijer1-3/+7
Conflicts: A lot of files...
2009-02-09Merged with Aethyra master as of 2009-01-27Bjørn Lindeijer1-62/+95
Conflicts: Almost everywhere.
2009-02-07Some more include cleanups.Ira Rice1-1/+0
Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-04A few more pointers which weren't getting deleted.Ira Rice1-0/+1
Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-30Exposed most gui elements to take alpha values. There are still a fewIra Rice1-2/+6
spots that could also be fixed up as well, but require other methods to fix them (the filled color rectangles on the progress bars, as well as the text on them as well, as an example). Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-26Cleaned up inventory includes, as well as adding right click popup menusIra Rice1-6/+27
to the item shortcut container. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-26Little bit of include cleanups.Ira Rice1-0/+1
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-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-20Changed item popup drawing to be based on the mouse position, not windowIra Rice1-14/+4
position. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-20Modified the item shortcut bar to show item popups based on a suggestionIra Rice1-15/+67
made by Jarvellis. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-12Some code style cleanups, as well as uncommented the font setting forIra Rice1-10/+5
the emote shortcut window (which I meant to test before committing. Don't remove this line, as text drawing behavior is rather crazy without it). Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-12Some rather pedantic changes. Unified all naming for emoticons in theIra Rice1-3/+3
code so that only one term is used everywhere (to simplify maintainability), as well as corrected several variable names and comments where there was copy/pasted code, but it wasn't corrected. Also moved emote shortcuts back to where they were originally, to reduce player confusion when the next build comes around. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-10Made a few more window components use a transparency under OpenGL, asIra Rice1-0/+3
well as some code style cleanups in the skill dialog. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-09Now, the real stage 2.0 of smiley window.Forge1-34/+2
All is done, and all files are now in the tree. (ok, copyright of new files is still opened... do as you want, if you care) Signed-off-by: Forge <jgrimbert@free.fr>
2009-01-06Fixed font colors in inventory and shortcut windowBjørn Lindeijer1-0/+1
They were not explicitly set to black. Because the bitmap font used to be black, these bugs didn't show up earlier. With the introduction of true type fonts, the text can be any color anywhere.
2008-12-29Added support for True Type Fonts using GUIChan's inbuilt SDLTrueTypeIra Rice1-0/+1
class. NOTE: This commit adds a brand new dependency (SDL_TTF). Make sure to install it, regenerate your config files, reconfigure, and then install before attempting to compile. Signed-off-by: Ira Rice <irarice@gmail.com>
2008-12-07Merge commit 'a7c21e6f8add37af7412449742ec55c8daa8571a'Ira Rice1-1/+3
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-25Miscellaneous TMW change commits. Missed these changes before because of Ira Rice1-1/+3
a confusion on git.
2008-11-22Added ability to add equipment to the shurtcut barNikos Giagtzoglou1-2/+4
Patch by Nikos, with some improvements.
2008-11-18Pedantic fixes to the client, where I alphabetized all of the include Ira Rice1-3/+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-07-18Import of client treeLloyd Bryant1-1/+1
2008-06-12Merged revisions 3738 via svnmerge from Bjørn Lindeijer1-5/+8
https://themanaworld.svn.sourceforge.net/svnroot/themanaworld/tmw/trunk ........ r3738 | b_lindeijer | 2007-11-16 00:44:01 +0100 (Fri, 16 Nov 2007) | 3 lines Moved item icon from ItemInfo class to the Item class, so that it can be loaded on demand. Results in faster startup time and reduced memory usage. ........
2008-05-06Dont allow dragging of empty placeholders.Dennis Friis1-0/+2
2008-04-29* Fixed issue with determining whether chat input is focused (method no longerBjørn Lindeijer1-0/+2
virtual). * Fixed sometimes rendering with the wrong font. * Fixed warnings about hiding virtual method, Window now always deletes its children (the option not to do so was never used anyway).
2008-04-24Make shortcut container ID based instead of slot based. Fixes items shifting ↵Dennis Friis1-5/+9
around often causing equipment to be lost.
2008-04-12Fixed display of item shortcut container. gcn::Widget::setWidth is no longerBjørn Lindeijer1-4/+2
virtual.
2007-12-05Fix drawing of very high fringe tiles by keeping track of the maximum tileBjørn Lindeijer1-0/+1
height.
2007-08-22Fixed an arithmetic exception in ItemShortcutContainer::draw.Bjørn Lindeijer1-3/+5
Changed default sitting key back to 's'. Fixed a problem with all equipment being interpreted as weapon sprite.
2007-08-21mantis id=118 - Added Item Shortcut Bar.Joshua Langley1-0/+222
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2025-02-24 00:08:52 +0000