Age | Commit message (Collapse) | Author | Files | Lines |
|
when it exists.
(cherry picked from eAthena client, replacing 'mapname' property
handling)
|
|
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.
|
|
during recursion
|
|
Also got rid of autogen.sh and instructed to use 'autoreconf -i'
instead.
Conflicts:
INSTALL
(cherry picked from eAthena client. autogen.sh was already done here)
|
|
Patch by Nikos, with some improvements.
Conflicts:
NEWS
src/gui/itemcontainer.cpp
src/itemshortcut.cpp
(cherry picked from eAthena client, not functional here yet)
|
|
Conflicts:
AUTHORS
(cherry picked from eAthena client)
|
|
Based on a patch by QOAL.
(cherry picked from eAthena client)
Conflicts:
src/gui/minimap.cpp
|
|
(cherry picked from eAthena client)
Conflicts:
ChangeLog
|
|
Conflicts:
ChangeLog
src/game.cpp
(cherry picked from eAthena client)
|
|
* Auto-detect number of hair styles available (#514)
Conflicts:
ChangeLog
src/being.cpp
src/being.h
src/gui/char_select.cpp
(cherry picked from eAthena client)
|
|
These properties should also apply to NPCs and possibly even monsters in
the future.
|
|
|
|
|
|
of 209.168.213.109
Changed a few references to aethyra.com to the appropriate aethyra.org values.
There's a few other minor changes that mostly just replace references to TMW that are not essential with Aethyra references.
|
|
Don't treat anything starting with "Welcome" as a server message, for
example messages starting with a name that starts with "Welcome"
shouldn't belong in that category.
Put the nick in the right place for global announcements.
Signed-off-by: Bjørn Lindeijer <bjorn@lindeijer.nl>
|
|
|
|
|
|
Don't treat anything starting with "Welcome" as a server message, for
example messages starting with a name that starts with "Welcome"
shouldn't belong in that category.
Put the nick in the right place for global announcements.
Signed-off-by: Bjørn Lindeijer <bjorn@lindeijer.nl>
|
|
Won't be introduced based on eAthena anyway, I think even with tmwserv
we have different plans now.
Signed-off-by: Bjørn Lindeijer <bjorn@lindeijer.nl>
|
|
|
|
|
|
|
|
players), make sure to initialise if needed
Status particle effects: properly delete particles after effect has worn
off
|
|
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
The player character is never deleted, and hence might have particles
still active when the map changes. These particles are deleted on map
change, but when the player character was moved, it was trying to mark
these deleted particles for deletion, writing to unallocated memory.
The marking for deletion by the player character now happens before the
particles are deleted.
Signed-off-by: Bjørn Lindeijer <bjorn@lindeijer.nl>
|
|
The player character is never deleted, and hence might have particles
still active when the map changes. These particles are deleted on map
change, but when the player character was moved, it was trying to mark
these deleted particles for deletion, writing to unallocated memory.
The marking for deletion by the player character now happens before the
particles are deleted.
Signed-off-by: Bjørn Lindeijer <bjorn@lindeijer.nl>
|
|
|
|
I wish I had never fallen for this weird style, and I hope removing it
will prevent others from introducing new code like this. :-)
|
|
I wish I had never fallen for this weird style, and I hope removing it
will prevent others from introducing new code like this. :-)
|
|
Inspired by qDeleteAll() from Qt.
Conflicts:
ChangeLog
src/beingmanager.cpp
src/channelmanager.cpp
src/gui/skill.cpp
src/map.cpp
src/resources/monsterinfo.cpp
(cherry picked from mainline)
|
|
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
The image wasn't clipped so it would draw beneath the map name and on
top of the window border.
|
|
When centering the minimap on the player, it would often happen that the
minimap scrolled past its edge.
Based on a patch by QOAL.
|
|
The image wasn't clipped so it would draw beneath the map name and on
top of the window border.
|
|
When centering the minimap on the player, it would often happen that the
minimap scrolled past its edge.
Based on a patch by QOAL.
|
|
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
Many member variables of LocalPlayer were not being initialized
properly. In general this shouldn't have caused any problems, but it's
bad style.
The ChargeDialog was removed. This class was long dead anyway.
Signed-off-by: Bjørn Lindeijer <bjorn@lindeijer.nl>
Conflicts:
src/Makefile.am
src/game.cpp
src/gui/chargedialog.cpp
src/gui/chargedialog.h
src/localplayer.cpp
src/localplayer.h
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
The default window sizes were all too small, since they were specified
in content size. On pressing "Reset Windows", the sizes would be
interpreted as such and apply alright.
The inconsistency is now removed, and the default window sizes are
always the size of the whole widget now, not just the contents.
Signed-off-by: Bjørn Lindeijer <bjorn@lindeijer.nl>
|
|
originally ported this from TMW's trunk, and they later changed their
mind on the minimap name property, this was broken on our maps.
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
Also remember its visibility state.
|
|
Scrolling is now a bit less lazy and the scroll radius is 0. In my
opinion this is a better default.
Framerate limiter is now off by default, since it makes the game appear
a bit choppy. It's basically only useful for laptops anyway, and not too
hard to find.
|
|
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
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>
|
|
|
|
Many member variables of LocalPlayer were not being initialized
properly. In general this shouldn't have caused any problems, but it's
bad style.
The ChargeDialog was removed. This class was long dead anyway.
Signed-off-by: Bjørn Lindeijer <bjorn@lindeijer.nl>
|
|
|
|
|
|
|
|
|