summaryrefslogtreecommitdiff
path: root/src
AgeCommit message (Collapse)AuthorFilesLines
2008-12-06For interaction popup window: serialise beings as IDs and look up, to allow ↵Fate2-30/+36
them to vanish whist the interaction popup window is open
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/eathenaFate9-95/+133
2008-12-06Fixes to the /w commandFate1-2/+4
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-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-06Removed unnecessary weight check in itemdb loaderLloyd Bryant1-3/+3
(cherry picked from Aethyra commit e3fef730b69e4edc328e6105ea48b9774631563d)
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-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-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-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-03Converted DOS to UNIX newlinesBjørn Lindeijer1-2/+1
2008-12-02Merge branch '0.0' of git@gitorious.org:tmw/mainline into 0.0Bjørn Lindeijer1-2/+3
2008-12-02Fix 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.
2008-12-01Fixed a compilation error caused by path relevance.Philipp Sehmisch1-2/+3
2008-11-28Remember last equipped item ID so that we jump to/re-find an item of the ↵Fate2-7/+45
same ID whenever we lose the current one
2008-11-28Fixed potential segfault introduced while adding extra checks to inventoryFate1-1/+1
2008-11-28Eliminated silly C++ warningFate1-1/+1
2008-11-28Changed inventory container protocol to guarantee that we have no stale item ↵Fate3-24/+27
references lying around
2008-11-28Sanity-check index for Equipment::removeEquipment(int)Fate1-1/+1
2008-11-28Initialise mSkillPoint variable to avoid erroneous skill point displays ↵Fate1-0/+1
during game startup
2008-11-27Make sure to initialize joystick enabled stateBjørn Lindeijer3-48/+31
Joystick enabled state could end up uninitialized on unsuccesfully trying to open a joystick. In addition, the enabled state wasn't actually used in the accessor methods for the joystick buttons.
2008-11-24Converted some DOS newlines to UNIXBjørn Lindeijer2-29/+29
2008-11-23Delete resources after removing from the orphan list, to avoid double frees ↵Fate1-1/+1
during recursion
2008-11-23Fixed MP bar colourFate1-1/+1
2008-11-23Merge branch '0.0' of git@gitorious.org:tmw/mainline into 0.0Fate293-689/+522
2008-11-23Grey out magic bar if matk negative, update F2 window magic barFate2-1/+6
2008-11-22Fixed warning about passing NULL for a non-pointerBjørn Lindeijer2-10/+6
Encountered by z0ro.
2008-11-22Fixed non-virtual destructorBjørn Lindeijer1-25/+22
The class had virtual methods, in which case it's good practice to also make the destructor virtual. Otherwise you can end up with destructors of subclasses not being called on deletion.
2008-11-22Added ability to add equipment to the shurtcut barNikos Giagtzoglou3-28/+25
Patch by Nikos, with some improvements.
2008-11-22Added custom nib for Cmd-Q on OSXDavid Athay1-76/+181
2008-11-22Inventory window now displays amount of slots usedNikos Giagtzoglou4-10/+32
Patch by Nikos, with some improvements by vargavind.
2008-11-21Center large minimaps on playerBjørn Lindeijer1-15/+19
Based on a patch by QOAL.
2008-11-20Removed a duplicated includeBjørn Lindeijer1-1/+0
2008-11-17Added Xcode files.David Athay2-0/+289
2008-11-16Got rid of CVS/Subversion $Id$ markersBjørn Lindeijer291-600/+24
I don't know why we dealt with these things for so long. Did we ever get anything out of it?