summaryrefslogtreecommitdiff
path: root/src/gui
AgeCommit message (Collapse)AuthorFilesLines
2009-02-09Mostly whitespace and formatting changesBjørn Lindeijer19-56/+44
(merged from eAthena client)
2009-01-28Added channel highlighting upon activity. Added /kick command to get rid of ↵David Athay3-8/+31
users from a channel
2009-01-18Added current map filename to debug window.Philipp Sehmisch2-14/+23
2009-01-15Fix bug with item links.David Athay1-1/+1
2009-01-14Added linking to item's just using [Item Name] in chatDavid Athay2-2/+24
2009-01-13Added WoW style item adding to chat window. Right Ctrl and Left click to put ↵David Athay10-15/+151
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 Athay2-2/+16
2009-01-05Merged with 'master'Bjørn Lindeijer40-584/+344
2009-01-05Add buddy windowDavid Athay3-49/+30
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-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-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-07Fix 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. (cherry picked from eAthena branch, commits 6ac9c3bce62a8fc79e23477417188108f0ad9fa6 and 06d0205bab253ec5d01e8483ab639a092fe117c5)
2008-12-07Fade 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. (cherry picked from eAthena branch)
2008-12-07Set headers for CURL so that proxies won't cacheKraant1-0/+16
Applied only to resources2.txt and news.txt. (cherry picked from commits 047f598be826dd57dd1124db914e8367256112be, cabf8905526b6601813573d049f6afaf364e1cac and 416e28057f5a6073a2ef44f296ed1c8bc1280bf6)
2008-11-24Converted some DOS newlines to UNIXBjørn Lindeijer2-167/+167
2008-11-18Added the font file to branding.xmlPhilipp Sehmisch1-2/+4
2008-11-16Whitespace and indentation fixesBjørn Lindeijer7-60/+47
2008-11-16Got rid of CVS/Subversion $Id$ markersBjørn Lindeijer168-333/+0
I don't know why we dealt with these things for so long. Did we ever get anything out of it?
2008-11-13Added avatars to party windowDavid Athay5-18/+159
2008-11-12Fixed multiline editing for lettersDavid Athay2-2/+5
2008-11-12Fixed chat transparency and icon loading.David Athay1-0/+1
2008-11-11Moved some hardcoded strings and filenames to an external configuration file.Philipp Sehmisch1-1/+1
2008-11-06Added interface for sending post.David Athay2-0/+157
2008-11-04Merged revisions 4332 via svnmerge from Bjørn Lindeijer2-23/+44
https://themanaworld.svn.sourceforge.net/svnroot/themanaworld/tmw/branches/0.0 ........ r4332 | b_lindeijer | 2008-06-05 09:33:12 +0200 (Thu, 05 Jun 2008) | 5 lines Added command line argument to specify the update host (-H). Also, to avoid problems when files with the same name are served by different update hosts, the updates are now stored in an update host specific directory. Based on a patch by Sanga. ........
2008-11-02Fixed right-clicking on NPCs.Bjørn Lindeijer1-1/+1
2008-11-01Some files I forgot to add with the last commit.Philipp Sehmisch2-0/+172
2008-11-01Magic implementation phase 1 and 2 (added netcode and a very crude gui for ↵Philipp Sehmisch2-0/+8
using special actions like magic)
2008-11-01Merged revisions 4207-4209,4221-4222 via svnmerge from Bjørn Lindeijer9-37/+30
https://themanaworld.svn.sourceforge.net/svnroot/themanaworld/tmw/branches/0.0 ........ r4207 | b_lindeijer | 2008-04-29 11:10:43 +0200 (Tue, 29 Apr 2008) | 6 lines * Fixed issue with determining whether chat input is focused (method no longer 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). ........ r4208 | b_lindeijer | 2008-04-29 13:25:26 +0200 (Tue, 29 Apr 2008) | 3 lines Removed unused option from GCContainer to not delete a child, fixing warnings about hiding virtual method gcn::Container::add. ........ r4209 | b_lindeijer | 2008-04-29 14:58:21 +0200 (Tue, 29 Apr 2008) | 3 lines When compiling with GCC, use the printf format attribute for the log method so that the compiler checks the type of its parameters. ........ r4221 | peaveydk | 2008-05-06 21:23:49 +0200 (Tue, 06 May 2008) | 1 line Dont allow dragging of empty placeholders. ........ r4222 | peaveydk | 2008-05-08 00:49:38 +0200 (Thu, 08 May 2008) | 1 line Make F8 toggle shortcut window as suggested by And1 an fate. ........
2008-11-01Merged revisions 4180-4181 via svnmerge from Bjørn Lindeijer1-5/+9
https://themanaworld.svn.sourceforge.net/svnroot/themanaworld/tmw/branches/0.0 ........ r4180 | peaveydk | 2008-04-24 22:49:30 +0200 (Thu, 24 Apr 2008) | 1 line Make shortcut container ID based instead of slot based. Fixes items shifting around often causing equipment to be lost. ........ r4181 | peaveydk | 2008-04-25 02:25:59 +0200 (Fri, 25 Apr 2008) | 1 line Document anti-trade function. ........
2008-11-01Merged revisions 4110-4111,4116 via svnmerge from Bjørn Lindeijer2-3/+9
https://themanaworld.svn.sourceforge.net/svnroot/themanaworld/tmw/branches/0.0 ........ r4110 | peaveydk | 2008-04-17 00:57:49 +0200 (Thu, 17 Apr 2008) | 1 line Fix shop list not to scroll to top when selling. Redo of revision 3801 due to changes in guichan 0.8.0. ........ r4111 | peaveydk | 2008-04-17 02:08:28 +0200 (Thu, 17 Apr 2008) | 1 line fixes for r4110, have to account for index value and add 1 to get the right scroll position. ........ r4116 | peaveydk | 2008-04-17 14:48:43 +0200 (Thu, 17 Apr 2008) | 1 line Draw NPCs in yellow on minimap and skip drawing of warps. Based on idea by leeor_net. ........
2008-10-31Merged revisions 4071,4093,4100,4363 via svnmerge from Bjørn Lindeijer1-3/+5
https://themanaworld.svn.sourceforge.net/svnroot/themanaworld/tmw/branches/0.0 ........ r4071 | the_enemy | 2008-04-11 16:12:30 +0200 (Fri, 11 Apr 2008) | 3 lines Players now need to click on the monster sprites rather than the tile. Players will now move to the target before attacking it. ........ r4093 | the_enemy | 2008-04-15 18:10:32 +0200 (Tue, 15 Apr 2008) | 1 line Fixed clicking near player. ........ r4100 | peaveydk | 2008-04-16 13:59:36 +0200 (Wed, 16 Apr 2008) | 1 line Cancel walking to a clicked monster if the target is lost while getting to it (killed or otherwise removed). ........ r4363 | crush_tmw | 2008-06-24 14:42:04 +0200 (Tue, 24 Jun 2008) | 1 line corrected date in changelog ........
2008-10-24fixes for targetting (by Chuck Miller)Roderic Morris1-11/+8
2008-10-10Some old uncommitted cleanup.Bjørn Lindeijer2-10/+0
2008-10-09Merged the movement branch into trunkBjørn Lindeijer5-57/+63
I consider this the only way forward. In my tests this code isn't actually doing worse than what was there before. Of course some cases are a bit broken, and I'm open to any kind of feedback so that we can fix those issues.
2008-09-14fix for guichan bug in tabbedareasRoderic Morris2-0/+10
2008-09-04Introduced another template to make deleting all values in a container easier.Bjørn Lindeijer4-10/+4
Inspired by qDeleteAll() from Qt.
2008-08-21fix svn properties and id tagsRoderic Morris3-4/+3