summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2008-12-06Prevent the player from continuing to walk after opening a NPC dialog.Ira Rice1-0/+3
This used to be caused by right clicking on an NPC, then clicking on it and telling the sprite to move at the same time. Signed-off-by: Ira Rice <irarice@gmail.com>
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-06More files that Bjorn reccommended aren't needed.Ira Rice5-2344/+0
Signed-off-by: Ira Rice <irarice@gmail.com>
2008-12-06Removed the automate cash, as reccommended by Bjorn.Ira Rice2-700/+2
Signed-off-by: Ira Rice <irarice@gmail.com>
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 Lindeijer2-7/+10
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 Lindeijer4-15/+124
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-03Don't reuse the setupWindow variable from the gameBjørn Lindeijer1-2/+2
Fixes crash on exit caused by double deletion.
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-03Revised pointer deletion based on Bjorn's suggestion.Ira Rice1-0/+4
Signed-off-by: Ira Rice <irarice@gmail.com>
2008-12-03Fixed pointer deletion so that the setup window doesn't get doubleIra Rice1-2/+0
deleted. Signed-off-by: Ira Rice <irarice@gmail.com>
2008-12-03Merge branch 'master' of git@gitorious.org:tmw/aethyraIra Rice0-0/+0
Signed-off-by: Ira Rice <irarice@gmail.com>
2008-12-03Deleted a few dangling pointers noticed by Bjorn.Ira Rice1-1/+4
Signed-off-by: Ira Rice <irarice@gmail.com>
2008-12-03Deleted a few dangling pointers noticed by Bjorn.Ira Rice1-1/+4
Signed-off-by: Ira Rice <irarice@gmail.com>
2008-12-03Changed tileset code so that it removes all ... paths. This assumes thatIra Rice1-5/+4
the tileset to be loaded will not be in a different root directory than the tsx file. Signed-off-by: Ira Rice <irarice@gmail.com>
2008-12-03Check doc before deleting, and make sure it's deleted when both xmlIra Rice1-2/+11
files fail, if the pointer is pointing to something. Signed-off-by: Ira Rice <irarice@gmail.com>
2008-12-03Added in the effects manager, which was accidently missing from the lastIra Rice2-0/+142
commit. Signed-off-by: Ira Rice <irarice@gmail.com>
2008-12-03Add an effects manager (patch by Kage Jittai)Ira Rice9-113/+105
NOTE: This patch demonstrates the need to fix pixel coordinates in the eAthena client. Bjorn did the movement patch in the TMWClient, however, I still haven't got that fully working with the merges. It's likely that a clone will be developed to tackle this problem. Signed-off-by: Ira Rice <irarice@gmail.com>
2008-12-03Updated the update shell script to pull from git, not svn. ThanksIra Rice1-6/+6
Softlace for pointing this out. Signed-off-by: Ira Rice <irarice@gmail.com>
2008-12-02Made an option around the syncing, but no way to change it for now.Bjørn Lindeijer3-1/+24
2008-12-02Added the ability to use external tilesets in the client.Ira Rice2-4/+13
Signed-off-by: Ira Rice <irarice@gmail.com>
2008-12-02Fixed status window so that the job level is displayed next to theIra Rice1-10/+18
level, as well as making the job level bar more consistent. Signed-off-by: Ira Rice <irarice@gmail.com>
2008-12-02Fixed MP bar updating in Status window. Thanks Scraggy for catchingIra Rice1-1/+1
this. Signed-off-by: Ira Rice <irarice@gmail.com>
2008-12-02Didn't clean up after myself in the last commit.Ira Rice1-0/+2
Signed-off-by: Ira Rice <irarice@gmail.com>
2008-12-02Changed colordb to only use one XML::Document pointer, instead ofIra Rice1-4/+4
instantiating two XML::Document variables. Probably was a bit tired the day I made that fix, so I missed the obvious solution. Signed-off-by: Ira Rice <irarice@gmail.com>
2008-11-30Fixed map origin formula so that it will work on any map proportion. IIra Rice1-2/+2
accidently screwed this up earlier to make it work on our minimaps that I forgot to check it on a different sized map. Signed-off-by: Ira Rice <irarice@gmail.com>
2008-11-30Fixed a problem noticed by Jarvellis. Apparently a while ago, toIra Rice1-3/+3
suppress a compiler warning, I added in some typecasts, but did them in the wrong spot, so it broke TMW's minimaps, but still worked on whole number proportions. This fixes that. Signed-off-by: Ira Rice <irarice@gmail.com>
2008-11-30Fixed up Minimap scrolling so that it actually scrolls (I forgot thatIra Rice1-3/+10
we resized the minimap width by the map's actual width) as well as fixed the centering code so that it works. TODO: Determine a decent way to have the map scroll, but not draw the map below the map area's name. Signed-off-by: Ira Rice <irarice@gmail.com>
2008-11-30Fixed up a few help files, as well as updated their contents to be moreIra Rice3-19/+44
current. This has been neglected for a bit longer than it should have been. Signed-off-by: Ira Rice <irarice@gmail.com>
2008-11-30Delete resources after removing from the orphan list, to avoid double frees ↵Fate1-1/+1
during recursion
2008-11-29Deleted the unnecessary .deps directory.Ira Rice140-140/+0
Signed-off-by: Ira Rice <irarice@gmail.com>
2008-11-29Imported patch that Fate made on TMW which which changes the item Ira Rice6-33/+77
container to guarantee that the inventory window always reports what the player has correctly, getting rid of the stale item references that could occur from time to time.
2008-11-27Merged a patch by Bjorn to fix allowing the joystick to be used without Ira Rice3-50/+35
being enabled first. A similar patch was asked for by Doorsman here, so this combined with the setup button on client startup, should be enough to fulfill that request from Doors.
2008-11-25Miscellaneous TMW change commits. Missed these changes before because of Ira Rice10-30/+47
a confusion on git.
2008-11-23Corrected a misreporting of the number of available slots. In the Ira Rice1-1/+1
future, this should be de-hardcoded and obtained from the server instead.
2008-11-22While there is still a small visual artifact, this patch fixes the buy Ira Rice3-6/+4
window so that it properly reports how much money you have.
2008-11-21Changed windowing code to allow for multiple skins. This will be Ira Rice3-15/+15
modified in a bit so that there are no redundant skin loads, but for now, it doesn't leak any more as well.
2008-11-21Added the setup button to show when the client is loaded, since all of Ira Rice1-0/+37
the settings in it can be changed on client startup and aren't game specific.
2008-11-21Fixed the linker error that we've been having. Apparently, it was caused Ira Rice2-25/+28
by me accidently removing the include for main.h in openglgraphics.
2008-11-18Pedantic fixes to the client, where I alphabetized all of the include Ira Rice314-1252/+320
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-13Added a slot display so that players can track how much space they've used.Ira Rice2-2/+22
2008-11-12Applied a fix that fixes TMW loading.Ira Rice1-6/+9
2008-11-11Fixed a text glitch reported by Jarvellis.Ira Rice1-1/+1
2008-11-09Fixed icns file to have our cleint logo, so that Mac OS X builds use the ↵Ira Rice1-0/+0
proper icon.
2008-11-09Fixed NPC's reporting as dead on the new server.Ira Rice1-1/+2
2008-11-08Ported a TMW compile error fix reported by Martin Michlmayr.Ira Rice1-4/+1
2008-11-06Minor interface cleanup. Moved the login selection scrollbox so that it Ira Rice1-1/+4
aligns up with the other fields.
2008-11-06Ported a patch by Peavey on TMW to keep all item pointers inside of Ira Rice6-45/+38
inventory. For us, this should get rid of the arrow crashing bug, if it still exists (been a few weeks since I've heard of it happening now).
2008-11-06Don't allow players to use items through item shortcuts while trading. Ira Rice1-74/+78
Patch done by Peavey on TMW.