summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
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 cacheKraant2-0/+18
Applied only to resources2.txt and news.txt. (cherry picked from commits 047f598be826dd57dd1124db914e8367256112be, cabf8905526b6601813573d049f6afaf364e1cac and 416e28057f5a6073a2ef44f296ed1c8bc1280bf6)
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 Lindeijer2-10/+14
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-06Some code formattingBjørn Lindeijer1-45/+12
2008-12-06Made /where response include position informationBjørn Lindeijer1-1/+4
Change ported from Aethyra.
2008-12-06Updated link to the forumsBjørn Lindeijer2-1/+2
Only a few years overdue?
2008-12-06Removed unnecessary weight check in itemdb loaderLloyd Bryant1-3/+3
(cherry picked from Aethyra commit e3fef730b69e4edc328e6105ea48b9774631563d)
2008-12-06Some code formattingBjørn Lindeijer1-23/+8
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-06Added particle containers and refactored beings to use them (to clean up ↵Fate5-31/+281
responsibilities a little)
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 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-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-04Don't reuse the setupWindow variable from the gameBjørn Lindeijer1-2/+2
Fixes crash on exit caused by double deletion.
2008-12-04Deleted a few dangling pointers noticed by Bjorn.Ira Rice1-1/+6
Signed-off-by: Ira Rice <irarice@gmail.com>
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-03NEWS file updates for imported commitsBjørn Lindeijer1-0/+2
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-03Added the setup button to show when the client is loaded, since all ofIra Rice1-0/+37
the settings in it can be changed on client startup and aren't game specific.
2008-12-03While there is still a small visual artifact, this patch fixes the buyIra Rice1-0/+3
window so that it properly reports how much money you have.
2008-12-03Adding missing mJobLvlLabel from last commitBjørn Lindeijer1-1/+3
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-03Fixed 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-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-03Converted DOS to UNIX newlinesBjørn Lindeijer1-2/+1
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>