| Age | Commit message (Collapse) | Author | Files | Lines |
|---|
|
commit.
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
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>
|
|
|
|
for news.txt and resources2.txt.
(cherry picked from Aethyra commit 3206b3254a1a9b90bbdbd1a7178e4df043a5ee26)
|
|
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)
|
|
(cherry picked from Aethyra commit 0f033c073c7ae630c9359da358128f5f425f01a6)
|
|
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 Aethyra commit 81299ca9acc39dec62e1e504781721ad0db0d471)
Conflicts:
src/gui/inventorywindow.cpp
src/gui/npc_text.cpp
|
|
Change ported from Aethyra.
|
|
|
|
|
|
The mouse cursor will now disappear when not used for 15 seconds. When
using OpenGL it will even fade.
Requested by doorsman.
|
|
The Mutex class wasn't meant to be copied around. Silly last minute
refactorings leading to untested code...
|
|
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.
|
|
The mouse cursor will now disappear when not used for 15 seconds. When
using OpenGL it will even fade.
Requested by doorsman.
|
|
The Mutex class wasn't meant to be copied around. Silly last minute
refactorings leading to untested code...
|
|
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.
|
|
You shouldn't be able to press "Reset Windows" before the in-game
windows have been created. Previously this would crash.
|
|
You shouldn't be able to press "Reset Windows" before the in-game
windows have been created. Previously this would crash.
|
|
|
|
level, as well as making the job level bar more consistent.
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
|
|
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
level, as well as making the job level bar more consistent.
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
this.
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
|
|
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>
|
|
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>
|
|
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>
|
|
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.
|
|
same ID whenever we lose the current one
|
|
references lying around
|
|
a confusion on git.
|
|
|
|
|
|
|
|
|
|
Patch by Nikos, with some improvements.
|
|
Patch by Nikos, with some improvements by vargavind.
|
|
window so that it properly reports how much money you have.
|
|
Based on a patch by QOAL.
|
|
modified in a bit so that there are no redundant skin loads, but for
now, it doesn't leak any more as well.
|
|
|
|
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.
|
|
|
|
I don't know why we dealt with these things for so long. Did we ever get
anything out of it?
|
|
I don't know why we dealt with these things for so long. Did we ever get
anything out of it?
|
|
|
|
|
|
|
