summaryrefslogtreecommitdiff
path: root/src/gui
AgeCommit message (Collapse)AuthorFilesLines
2009-01-05Image alpha should also be set to 1, in case it was changed before.Bjørn Lindeijer2-8/+8
(cherry picked from mainline commit 0962fc8b567279a6e97e13e4b3f2f9f2ffe304c0)
2009-01-05Added support for alpha blending to true type font drawing.Philipp Sehmisch1-0/+7
(cherry picked from mainline commit 89a1dcb59be3e531cc0761c32d1aa70e141d4a12)
2009-01-05Fixed double-free of true-type resources.Guillaume Melquiond1-2/+5
(cherry-picked from mainline)
2009-01-05Modified the Aethyra client to use the TMW TrueType class, rather thanEugenio Favalli4-8/+244
the inbuilt GUIChan TrueType class. (Didn't use it originally because I didn't see the difference, when there's a considerable speedup, and that originally the import for TMW was broken code at the time, which has been fixed since.)
2009-01-05Fixed browser box so that it'd work again.Ira Rice2-51/+26
Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-05Changed smiley window to say emote. (I like emote better, so that'sIra Rice1-2/+2
why. :P) Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-05Added emote window button.Ira Rice1-0/+6
Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-05Made trade window resizableBjørn Lindeijer4-27/+51
Also fixed overlap between description label and the buttons and added the SDL_ttf library to the Code::Blocks project file.
2009-01-05Handling gender with an enum everywhere.Philipp Sehmisch2-5/+6
(cherry picked from mainline commit d3adc61aa4b4924f82d8cbc23bea26da7257da97) Conflicts: src/net/beinghandler.cpp src/net/charserverhandler.cpp src/player.cpp src/player.h
2009-01-05Refactor the way in which browser box text is drawn and wrapped.Björn Steinbrink2-94/+151
(cherry picked from mainline commit ecabe82d8720689905a6d035b0597d97037287c7) Conflicts: src/gui/browserbox.cpp
2009-01-04Smiley step 1.91, the little part to make it workForge1-3/+2
TODO list of 1.9 still intact.
2009-01-04Smiley track: step 1.9Forge10-15/+1202
The window listing the smiley is ok (F11). The window for shortcut of smiley is in progress (F12) So far, you can use any available smiley directly (mouse interface) and can get a reminder of the keybinding in the shortcut window. Yet to be done (for final step 2.0): * Transform the keybinding into the actual mapping of the shortcut seen in F12 * Drag & Drop from F11 to F12 windows and from F12 to F12 * Code factorisation for class ShortcutContainer and derivatives Item & Smiley (so far, most code is shared, but actually in 3 places, should keep only specific code in leaf-class, and main code in parent) Revision of copyright message (so far, only a cut-paste of inspiring previous files) * Save shortcut-smiley mapping on exit (and reload on start) (with protection against changing smiley-list)
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-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-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-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-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-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-06Minor punctuation fix, merged earlier /whisper fix/help update with separate ↵Fate1-2/+2
fix for same issue
2008-12-06Merge branch 'master' of git@gitorious.org:tmw/eathenaFate7-47/+118
2008-12-06Fixes to the /w commandFate1-2/+4
2008-12-06Fixed NPC dialogs so that they properly wrap. Broken by the last cherryIra Rice1-0/+5
commit. Signed-off-by: Ira Rice <irarice@gmail.com>
2008-12-06Fixed wrapping in some cases, removed draw methodBjørn Lindeijer4-57/+24
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>
2008-12-07Some code reformatting and updated NEWSBjørn Lindeijer1-10/+12
2008-12-07Changed proxy fix to only tell the proxy to no-cacheKraant1-6/+11
for news.txt and resources2.txt. (cherry picked from Aethyra commit 3206b3254a1a9b90bbdbd1a7178e4df043a5ee26)
2008-12-07Set headers for CURL so that proxies won't cache filesKraant1-0/+9
to fix bug that causes resources2.txt to be old and out of sync with the files in the directory. (cherry picked from Aethyra commit ccacde4192268fbf5250e9bd6894d158f957922c)
2008-12-07Changed the status window so that all the information appears by defaultDouglas Boffey1-1/+1
(cherry picked from Aethyra commit 0f033c073c7ae630c9359da358128f5f425f01a6)
2008-12-07Fixed wrapping in some cases, removed draw methodBjørn Lindeijer4-59/+24
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>
2008-12-07Made NPC dialogues resizeable.Ira Rice4-7/+94
(cherry picked from Aethyra commit 81299ca9acc39dec62e1e504781721ad0db0d471) Conflicts: src/gui/inventorywindow.cpp src/gui/npc_text.cpp
2008-12-06Made /where response include position informationBjørn Lindeijer1-1/+4
Change ported from Aethyra.
2008-12-06Fix whisperingJared Adams1-2/+2
2008-12-05added /w shortcut for whisperingFate2-41/+52
2008-12-05Fade out mouse cursor when not used for some timeBjørn Lindeijer2-12/+46
The mouse cursor will now disappear when not used for 15 seconds. When using OpenGL it will even fade. Requested by doorsman.
2008-12-05Fixed MutexLocker to not work on a copyBjørn Lindeijer1-2/+2
The Mutex class wasn't meant to be copied around. Silly last minute refactorings leading to untested code...
2008-12-05Fix race condition with a std::string accessBjørn Lindeijer2-15/+29
The downloading thread was writing to a std::string while the main thread was trying to draw it, for example. Now access to the label caption is guarded with a mutex. Should fix crashes while downloading updates.
2008-12-05Fade out mouse cursor when not used for some timeBjørn Lindeijer2-12/+46
The mouse cursor will now disappear when not used for 15 seconds. When using OpenGL it will even fade. Requested by doorsman.
2008-12-05Fixed MutexLocker to not work on a copyBjørn Lindeijer1-2/+2
The Mutex class wasn't meant to be copied around. Silly last minute refactorings leading to untested code...
2008-12-05Fix race condition with a std::string accessBjørn Lindeijer2-15/+29
The downloading thread was writing to a std::string while the main thread was trying to draw it, for example. Now access to the label caption is guarded with a mutex. Should fix crashes while downloading updates.
2008-12-03Disabled "Reset Windows" button when appropriateBjørn Lindeijer1-0/+9
You shouldn't be able to press "Reset Windows" before the in-game windows have been created. Previously this would crash.
2008-12-03Disabled "Reset Windows" button when appropriateBjørn Lindeijer1-0/+9
You shouldn't be able to press "Reset Windows" before the in-game windows have been created. Previously this would crash.