summaryrefslogtreecommitdiff
path: root/src/gui
AgeCommit message (Collapse)AuthorFilesLines
2008-12-31Fixed OSX fullscreen hangDavid Athay1-2/+2
2009-01-01Made trade window resizableBjørn Lindeijer4-29/+53
Also fixed overlap between description label and the buttons and added the SDL_ttf library to the Code::Blocks project file.
2008-12-31Synchronized font size with mainlineBjørn Lindeijer1-1/+1
2008-12-29Removed a duplicate file that was overlooked.Ira Rice1-171/+0
Signed-off-by: Ira Rice <irarice@gmail.com>
2008-12-29Added support for True Type Fonts using GUIChan's inbuilt SDLTrueTypeIra Rice9-65/+717
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-29Increased text chunk cache size to improve performance when a lot of text is ↵Philipp Sehmisch1-1/+1
on the screen. (cherry picked from mainline commit 483c76d1b2433bc34f67406a10bf409fb2daafe1)
2008-12-29Image alpha should also be set to 1, in case it was changed before.Bjørn Lindeijer2-8/+8
(cherry picked from mainline commit 0962fc8b567279a6e97e13e4b3f2f9f2ffe304c0)
2008-12-29Added support for alpha blending to true type font drawing.Philipp Sehmisch1-0/+7
(cherry picked from mainline commit 89a1dcb59be3e531cc0761c32d1aa70e141d4a12)
2008-12-29Fixed double-free of true-type resources.Guillaume Melquiond1-2/+5
(cherry-picked from mainline)
2008-12-29Fixed two compiler warnings about deprecated char*Bjørn Lindeijer1-2/+2
2008-12-29Added support for True Type Fonts.Eugenio Favalli6-65/+327
(cherry-picked from mainline)
2008-12-26Fixed a potential leak in setup, changed the default border color toIra Rice1-0/+3
white for wallpapers (matches our wallpapers better), and fixed the effect manager. Signed-off-by: Ira Rice <irarice@gmail.com>
2008-12-20Enabled video mode switching, as well as got rid of an old, unneededIra Rice1-2/+31
check in the ColorDB. Signed-off-by: Ira Rice <irarice@gmail.com>
2008-12-17Remember windows visibility.Eugenio Favalli1-0/+2
(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 Lindeijer8-72/+45
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 the unused NewSkillDialogBjørn Lindeijer2-262/+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-14Removed ChargeDialogBjørn Lindeijer2-105/+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-13Code style reformattingBjørn Lindeijer8-178/+142
Got rid of "void" in functions that take no arguments and removed the newline after the return type of a method in many places.
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-13Fixed alignment (patch by Scraggy - Mantis #384) and spelling error.David Athay1-2/+2
(cherry picked from eAthena client)
2008-12-13Added ability to add equipment to the shurtcut barBjørn Lindeijer2-10/+8
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-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-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-09Fixed two issues with the chat message parsingBjørn Lindeijer1-6/+17
Don't treat anything starting with "Welcome" as a server message, for example messages starting with a name that starts with "Welcome" shouldn't belong in that category. Put the nick in the right place for global announcements. Signed-off-by: Bjørn Lindeijer <bjorn@lindeijer.nl>
2008-12-09Make the window shortcuts configurableJared Adams1-6/+6
2008-12-09Fixed two issues with the chat message parsingBjørn Lindeijer1-7/+11
Don't treat anything starting with "Welcome" as a server message, for example messages starting with a name that starts with "Welcome" shouldn't belong in that category. Put the nick in the right place for global announcements. Signed-off-by: Bjørn Lindeijer <bjorn@lindeijer.nl>
2008-12-09Removed the unused NewSkillDialogBjørn Lindeijer2-262/+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>
2008-12-08Small maps used to scroll as well as big maps. Fixed.Ira Rice1-2/+2
Signed-off-by: Ira Rice <irarice@gmail.com>
2008-12-08Code reformattingBjørn Lindeijer1-4/+1
I wish I had never fallen for this weird style, and I hope removing it will prevent others from introducing new code like this. :-)
2008-12-08Code reformattingBjørn Lindeijer1-4/+1
I wish I had never fallen for this weird style, and I hope removing it will prevent others from introducing new code like this. :-)
2008-12-08Introduced another template to make deleting all values in a container easier.Bjørn Lindeijer4-10/+4
Inspired by qDeleteAll() from Qt. Conflicts: ChangeLog src/beingmanager.cpp src/channelmanager.cpp src/gui/skill.cpp src/map.cpp src/resources/monsterinfo.cpp (cherry picked from mainline)
2008-12-08Fixed speech bubbles, which broke on the last merger.Ira Rice1-0/+1
Signed-off-by: Ira Rice <irarice@gmail.com>
2008-12-08Compacted the inventory window layout.Ira Rice2-22/+8
Signed-off-by: Ira Rice <irarice@gmail.com>
2008-12-08Clip the minimap image to within its windowBjørn Lindeijer1-10/+14
The image wasn't clipped so it would draw beneath the map name and on top of the window border.
2008-12-08Don't scroll past the edges of the minimapBjørn Lindeijer1-0/+12
When centering the minimap on the player, it would often happen that the minimap scrolled past its edge. Based on a patch by QOAL.
2008-12-08Clip the minimap image to within its windowBjørn Lindeijer1-10/+14
The image wasn't clipped so it would draw beneath the map name and on top of the window border.
2008-12-08Don't scroll past the edges of the minimapBjørn Lindeijer1-0/+12
When centering the minimap on the player, it would often happen that the minimap scrolled past its edge. Based on a patch by QOAL.
2008-12-07Added some initialization and removed ChargeDialogIra Rice2-106/+0
Many member variables of LocalPlayer were not being initialized properly. In general this shouldn't have caused any problems, but it's bad style. The ChargeDialog was removed. This class was long dead anyway. Signed-off-by: Bjørn Lindeijer <bjorn@lindeijer.nl> Conflicts: src/Makefile.am src/game.cpp src/gui/chargedialog.cpp src/gui/chargedialog.h src/localplayer.cpp src/localplayer.h Signed-off-by: Ira Rice <irarice@gmail.com>
2008-12-07Fixed inconsistency in default window sizesBjørn Lindeijer9-20/+21
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>
2008-12-07Tweaked 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.
2008-12-07Merge commit 'a7c21e6f8add37af7412449742ec55c8daa8571a'Ira Rice24-96/+389
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-12-07Some code reformattingBjørn Lindeijer1-1/+1
2008-12-07Added some initialization and removed ChargeDialogBjørn Lindeijer2-105/+0
Many member variables of LocalPlayer were not being initialized properly. In general this shouldn't have caused any problems, but it's bad style. The ChargeDialog was removed. This class was long dead anyway. Signed-off-by: Bjørn Lindeijer <bjorn@lindeijer.nl>
2008-12-07Fixed inconsistency in default window sizesBjørn Lindeijer9-21/+22
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>
2008-12-07Use widgetResized to adjust chat window contentsBjørn Lindeijer2-6/+4
Previously was using the logic() method, adjusting window contents 100 times per second.
2008-12-07Tweaked 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.
2008-12-07Some small updates and reformattingBjørn Lindeijer1-1/+0