summaryrefslogtreecommitdiff
path: root/src
AgeCommit message (Collapse)AuthorFilesLines
2008-12-13Fixed compile error with GCC 4.4 reported by Martin Michlmayr.Bjørn Lindeijer1-5/+1
(cherry picked from eAthena client) Conflicts: ChangeLog
2008-12-13Do not activate shortcuts if tradewindow is visible.Dennis Friis1-8/+12
Conflicts: ChangeLog src/game.cpp (cherry picked from eAthena client)
2008-12-13* Use hair.xml to determine hair colours (#514)Fate4-25/+108
* 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-13Moved gender and hair style back to BeingBjørn Lindeijer4-33/+48
These properties should also apply to NPCs and possibly even monsters in the future.
2008-12-07Fix background on resolutions other than 800x600Bjørn Lindeijer1-1/+10
The image is now centered and a gray background is drawn behind it so that parts that are not covered by the image don't show redrawing issues. (cherry picked from eAthena commit 07c2da75b7d994ab097e7c50d865bee929623685) Conflicts: src/main.cpp
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-07Removed unnecessary weight check in itemdb loaderLloyd Bryant1-3/+3
(cherry picked from Aethyra commit e3fef730b69e4edc328e6105ea48b9774631563d)
2008-12-07Fix race condition with a std::string accessBjørn Lindeijer4-15/+127
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-12-06Some code formattingBjørn Lindeijer1-23/+8
2008-11-24Converted some DOS newlines to UNIXBjørn Lindeijer3-190/+190
2008-11-21Undo message id change to maintain compatibilityBjørn Lindeijer1-1/+1
2008-11-20Renabled the dynamic updatesBjørn Lindeijer6-123/+184
The update host can be optionally received from the server in a succesful login response or register response message. This change also merged Subversion commits 4425 and 4426: ........ r4425 | b_lindeijer | 2008-07-18 00:52:53 +0200 (Fri, 18 Jul 2008) | 3 lines -- Added support for handling the custom eAthena packet that sends the update host (patch by Sanga). ........ r4426 | b_lindeijer | 2008-07-18 01:08:17 +0200 (Fri, 18 Jul 2008) | 3 lines -- Remove possible trailing slash at the end of the update host, since otherwise there'll be two of them.
2008-11-18fix build with cmakeRoderic Morris1-0/+2
2008-11-18Added the font file to branding.xmlPhilipp Sehmisch2-2/+5
2008-11-16Whitespace and indentation fixesBjørn Lindeijer8-65/+49
2008-11-16Got rid of CVS/Subversion $Id$ markersBjørn Lindeijer365-719/+0
I don't know why we dealt with these things for so long. Did we ever get anything out of it?
2008-11-16Fixed some indentsBjørn Lindeijer1-4/+4
2008-11-16Fixed warning about unused variableBjørn Lindeijer1-1/+1
Since I compile with -Werror, even small warnings like this are annoying. Please keep that in mind. ;)
2008-11-13Updated makefileDavid Athay1-1/+3
2008-11-13Added avatars to party windowDavid Athay7-24/+185
2008-11-12Fixed multiline editing for lettersDavid Athay2-2/+5
2008-11-12Fixed chat transparency and icon loading.David Athay2-16/+18
2008-11-11Moved some hardcoded strings and filenames to an external configuration file.Philipp Sehmisch3-23/+36
2008-11-06Added interface for sending post.David Athay11-130/+167
2008-11-04Merged revisions 4332 via svnmerge from Bjørn Lindeijer5-69/+142
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 Sehmisch4-0/+176
2008-11-01Merged revisions 4300-4301 via svnmerge from Bjørn Lindeijer2-2/+8
https://themanaworld.svn.sourceforge.net/svnroot/themanaworld/tmw/branches/0.0 ........ r4300 | the_enemy | 2008-05-27 17:53:21 +0200 (Tue, 27 May 2008) | 1 line Changed location of tmw directory on OSX ........ r4301 | peaveydk | 2008-05-28 18:06:48 +0200 (Wed, 28 May 2008) | 1 line Change order of direction to up/down/right/left in Being::getSpriteDirection to fix inconsistancy of facing direction when walking diagonally. ........
2008-11-01Magic implementation phase 1 and 2 (added netcode and a very crude gui for ↵Philipp Sehmisch8-11/+40
using special actions like magic)
2008-11-01Merged revisions 4207-4209,4221-4222 via svnmerge from Bjørn Lindeijer13-46/+46
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 Lindeijer4-33/+34
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-11-01Made an option around the syncing, but no way to change it for now.Bjørn Lindeijer2-3/+19
2008-11-01Merged revisions 4130 via svnmerge from Bjørn Lindeijer2-5/+5
https://themanaworld.svn.sourceforge.net/svnroot/themanaworld/tmw/branches/0.0 ........ r4130 | the_enemy | 2008-04-18 22:39:29 +0200 (Fri, 18 Apr 2008) | 3 lines Mac now uses Apple key for emoticons, so alt can be used for alternate characters. Disable vsync on mac. ........
2008-10-31Merged revisions 4071,4093,4100,4363 via svnmerge from Bjørn Lindeijer7-17/+84
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-30Minor fixes to movement and hit effects. Patch by Kage_Jittai.Dennis Friis2-9/+8
2008-10-27Removed /check command.David Athay1-4/+0
2008-10-27add effect handler (by Chuck Miller)Roderic Morris8-1/+107
2008-10-27Add an effects manager (patch by Kage Jittai)Jared Adams6-2/+153
2008-10-26fix for last commitRoderic Morris1-2/+2
2008-10-26fixes for movementRoderic Morris2-1/+19
2008-10-26Merged revisions 4302,4338,4360-4362,4526,4528,4534,4547 via svnmerge from Bjørn Lindeijer6-22/+98
https://themanaworld.svn.sourceforge.net/svnroot/themanaworld/tmw/branches/0.0 ........ r4302 | crush_tmw | 2008-05-28 18:51:26 +0200 (Wed, 28 May 2008) | 1 line Changed the way particle emitter skip is handled to make linear and circular emitters work with particleEmitterSkip enabled. ........ r4338 | crush_tmw | 2008-06-05 20:41:39 +0200 (Thu, 05 Jun 2008) | 1 line Lowered default particle detail level. ........ r4360 | crush_tmw | 2008-06-23 16:44:20 +0200 (Mon, 23 Jun 2008) | 1 line Implemented "alpha" particle property. ........ r4361 | crush_tmw | 2008-06-23 22:20:05 +0200 (Mon, 23 Jun 2008) | 1 line Forgot changelog with last commit. ........ r4362 | crush_tmw | 2008-06-24 14:29:33 +0200 (Tue, 24 Jun 2008) | 1 line Added particle property "follow-parent" which makes the particle move when its parent particle is moved. ........ r4526 | crush_tmw | 2008-08-24 20:52:00 +0200 (Sun, 24 Aug 2008) | 1 line Added new particle emitter property "output-pause" which allows to define a fixed (or random) interval between two outputs. ........ r4528 | crush_tmw | 2008-08-24 20:58:39 +0200 (Sun, 24 Aug 2008) | 1 line fix for an error in the last commit ........ r4534 | b_lindeijer | 2008-08-27 20:48:13 +0200 (Wed, 27 Aug 2008) | 3 lines Renamed "randomnes" to "randomness", so that it won't show up as part of Fate's patch. ........ r4547 | crush_tmw | 2008-08-29 00:44:43 +0200 (Fri, 29 Aug 2008) | 1 line Added output-pause to copy constructor of particle emitters. ........
2008-10-26get rid of /admin commandsRoderic Morris1-21/+0
2008-10-26Pixel-accurate and fluently animated keyboard movement by Kage Jittai - ↵Philipp Sehmisch3-6/+60
albeit not flawless it is still a big improvement.
2008-10-25attack range fixes, highlight monsters in range (by Chuck Miller)Roderic Morris5-34/+67
2008-10-24Made it so the player will auto face its targetJared Adams2-2/+35
Fixed it so the correct direction will be Patch by Chuck Miller
2008-10-24fixes for targetting (by Chuck Miller)Roderic Morris3-15/+16