Age | Commit message (Collapse) | Author | Files | Lines |
|
|
|
extra spaces before or after the [] tags.
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
|
|
doesn't PhysFS handle this properly?!?) when there's already an update
directory. Also fixed the recorder class so that it's fixed on Windows
as well.
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
|
|
that I would like some praxis-oriented testing of the animation system before the release).
|
|
where these "translation" strings can be used to tell the client to use
a separate XML file than the English one, so that item descriptions,
monster names, etc. which are obtained from updates can be translated as
well. Ex. instead of pointing to items.xml for Spanish, tell the client
to translate that string to items.es.xml, or for monsters.xml, tell it
to point to monsters.zh.xml for Chinese.
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
then this build might be official)
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
Also changed all emotes to be animated sprites now, and to load from
emotes.xml. This gives us a bit more flexibility to not only add more
emotes in the future, but allowing them to be animated as well.
NOTE: This commit, unlike the previous emote commits, breaks emotes if
you don't have the xml file. This will be available on Aethyra soon, but
is not rolled into an update at the moment.
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
the function names should no longer be around.
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
|
|
Merged from the mainline client. Originally implemented by Guillaume
Melquiond, starting with commit 1828eee6a6d91fd385ad1e69d93044516493aa91.
Conflicts:
INSTALL
configure.ac
src/Makefile.am
src/gui/buy.cpp
src/gui/confirm_dialog.cpp
src/gui/inventorywindow.cpp
src/gui/login.cpp
src/gui/menuwindow.cpp
src/gui/minimap.cpp
src/gui/ok_dialog.cpp
src/gui/popupmenu.cpp
src/gui/register.cpp
src/gui/sell.cpp
src/gui/setup.cpp
src/gui/setup_video.cpp
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
(cherry picked from mainline commit d3adc61aa4b4924f82d8cbc23bea26da7257da97)
Conflicts:
src/net/beinghandler.cpp
src/net/charserverhandler.cpp
src/player.cpp
src/player.h
|
|
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
check in the ColorDB.
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
I wish I had never fallen for this weird style, and I hope removing it
will prevent others from introducing new code like this. :-)
|
|
Conflicts:
AUTHORS
CMakeLists.txt
ChangeLog
INSTALL
README
aethyra.cbp
configure.ac
data/help/changes.txt
data/help/commands.txt
data/help/header.txt
data/help/support.txt
src/Makefile.am
src/aethyra.rc
src/being.cpp
src/being.h
src/equipment.cpp
src/equipment.h
src/floor_item.h
src/game.cpp
src/gui/buddywindow.cpp
src/gui/char_select.cpp
src/gui/char_server.cpp
src/gui/chat.cpp
src/gui/chat.h
src/gui/equipmentwindow.cpp
src/gui/equipmentwindow.h
src/gui/gui.cpp
src/gui/inventorywindow.cpp
src/gui/inventorywindow.h
src/gui/itemcontainer.cpp
src/gui/itemcontainer.h
src/gui/minimap.cpp
src/gui/ministatus.cpp
src/gui/newskill.cpp
src/gui/npc_text.cpp
src/gui/npclistdialog.h
src/gui/ok_dialog.cpp
src/gui/setup_video.cpp
src/gui/skill.cpp
src/gui/skill.h
src/gui/status.h
src/gui/table_model.h
src/gui/updatewindow.cpp
src/gui/viewport.cpp
src/inventory.cpp
src/inventory.h
src/keyboardconfig.cpp
src/keyboardconfig.h
src/localplayer.cpp
src/localplayer.h
src/logindata.h
src/main.cpp
src/map.cpp
src/monster.cpp
src/monster.h
src/net/beinghandler.cpp
src/net/beinghandler.h
src/net/buysellhandler.cpp
src/net/equipmenthandler.cpp
src/net/loginhandler.cpp
src/net/loginhandler.h
src/net/network.h
src/net/npchandler.cpp
src/net/playerhandler.cpp
src/net/protocol.h
src/net/tradehandler.cpp
src/npc.cpp
src/npc.h
src/particleemitter.cpp
src/particleemitterprop.h
src/player.cpp
src/player.h
src/player_relations.cpp
src/resources/imageset.cpp
src/resources/imageset.h
src/resources/itemdb.cpp
src/resources/mapreader.cpp
src/resources/monsterinfo.h
src/text.cpp
src/text.h
src/textmanager.cpp
src/textmanager.h
src/tileset.h
src/utils/fastsqrt.h
src/utils/strprintf.cpp
src/winver.h
tools/tmxcopy/Makefile
tools/tmxcopy/base64.cpp
tools/tmxcopy/base64.h
tools/tmxcopy/tostring.h
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
(cherry picked from Aethyra commit e3fef730b69e4edc328e6105ea48b9774631563d)
|
|
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>
|
|
files fail, if the pointer is pointing to something.
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
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>
|
|
during recursion
|
|
a confusion on git.
|
|
during recursion
|
|
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?
|
|
|
|
|
|
coded fail colors from the color db.
|
|
ago that the item type was being used to
determine which attack animation to use, since a comment lied about it not being used.
|
|
|
|
well as fixed color cycling.
|
|
colors. Thanks goes to paks for noticing this.
|
|
colors.xml.
|
|
their
trunk client.
|
|
handler to store updates in a subfolder based on port (so that if one
server domain hosts multiple update folders, that it doesn't have to
redownload an update should an update have the same name as the other
server, as well as a different checksum), and made the inventory window
display the units of measurement (for all of those people that wanted
to know exactly what those units were supposed to be).
|
|
handling the effects through the level up system, I determined that it
wasn't bad, so I pulled it from TMW's SVN. Two, I edited the web page
css so that it better matches the forum. And three, I patched text
wrapping so that it'll fix up its display size based on all previous
lines, except for the last line. That fix will come later, but for now,
it'll be seen as a special case. While you'd like to think that just
resending the string and starting the function over again would fix it,
you'd be wrong. So it won't be patched until I think of a better way to
handle that case.
|
|
properly implemented line wrapping. Now, there are no more visual
artifacts for speech boxes, and it always chooses the most optimal box
size (which required that npc_text use it also. Do any other gui
classes use the textbox class?).
|
|
error messages.
|
|
|
|
client change.
|
|
|
|
|
|
|
|
|
|
|
|
|