| Age | Commit message (Collapse) | Author | Files | Lines |
|---|
|
Now that messages can be sent without requiring a pointer to the
Network instance, a lot of cleanup was possible.
|
|
NPCListDialog couldn't be opened because of infinite recursion, and it
and NPCTextDialog both had resize bugs.
|
|
Conflicts:
A lot of files.
|
|
Conflicts:
Many files.
|
|
smaller than the minimum width and height (a check that should have
been enforced in the first place), as well as modified the NPC list and
text dialogs to remember where they were when they were moved or resized
last.
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
Both packets do the same, but we should be explicit anyways. Also,
seperate out NPC client packets.
|
|
Both packets do the same, but we should be explicit anyways. Also,
seperate out NPC client packets.
|
|
Conflicts:
data/graphics/images/login_wallpaper.png
src/being.cpp
src/beingmanager.cpp
src/engine.cpp
src/game.cpp
src/gui/buysell.cpp
src/gui/buysell.h
src/gui/gui.h
src/gui/npc_text.cpp
src/gui/npc_text.h
src/gui/npcintegerdialog.cpp
src/gui/npclistdialog.cpp
src/gui/npclistdialog.h
src/gui/npcstringdialog.cpp
src/gui/sell.cpp
src/gui/shop.cpp
src/gui/table.cpp
src/net/beinghandler.cpp
src/net/npchandler.cpp
src/net/playerhandler.cpp
src/npc.cpp
src/npc.h
src/shopitem.cpp
src/shopitem.h
src/utils/stringutils.cpp
src/utils/stringutils.h
src/utils/trim.h
|
|
Loosely based on TMW commit f04a8713ffc83db8b3dc4a472b28aad25a2b2bd1
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
The Being ID is used instead, as that is all that was ever really
needed.
|
|
(which would happen from using the keyboard instead of the mouse).
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
Order of initialization and suggested parenthesis.
|
|
This allows external classes (like game.cpp) to send actions to it
without them having to know about it's internal state.
|
|
|
|
And keep the text dialog open for the whole transaction, logging user
input and keep a full record of text from the NPC (for the current
transaction only).
|
|
Please do remember that member variables are prefixes with 'm', so that
they are easily distinguishable.
|
|
useful since buddy lists are tracked through the player relation
interface instead)
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
include anything not needed by that specific widget or window. This
appears to have cleaned up system performance a bit on my current setup,
where it went from idling on 45% in game with opengl down to 30% now.
Also moved iptostring to the tostring header, as importing all of
network.h is a little overkill to use that function, and it goes along
with the basic functions that are in that header file anyways. TODO:
find out a way to get rid of warnings when a class doesn't use this
function.
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
code is in much better shape than the browserbox code at the moment, and
that the move to using the browserbox was a bit silly, as textbox
already wraps.
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
|
|
This dates back to the old days of TMW, but the usage instructions of
GPLv2 don't mention this being necessary. Since it doesn't add anything,
avoid the branding in these sections.
|
|
|
|
Also fixed overlap between description label and the buttons and added the
SDL_ttf library to the Code::Blocks project file.
|
|
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>
|
|
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.
|
|
|
|
build work (although there might be a bit too many guichanfwd.h
references. But that's ok. I'm too lazy to track down which ones are
necessary and which ones aren't at the moment).
|
|
|
|
method that is no longer virtual in Guichan 0.8.0 (gcn::TextBox::setText()).
|
|
|
|
from the 0.1.0 branch.
|
|
|
|
|
|
updated in the item amount box when the buttons are used.
|
|
|
|
ever happen...
|
|
|
|
|
|
|
|
on support for modal dialogs. Still some issues to work out. Tell me if you
experience something unsettling.
|
|
|
