Age | Commit message (Collapse) | Author | Files | Lines |
|
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>
|
|
|
|
|
|
fix for same issue
|
|
|
|
|
|
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.
|
|
This used to be caused by right clicking on an NPC, then clicking on it
and telling the sprite to move at the same time.
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
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.
|
|
(cherry picked from Aethyra commit e3fef730b69e4edc328e6105ea48b9774631563d)
|
|
responsibilities a little)
|
|
|
|
|
|
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.
|
|
Fixes crash on exit caused by double deletion.
|
|
You shouldn't be able to press "Reset Windows" before the in-game
windows have been created. Previously this would crash.
|
|
Fixes crash on exit caused by double deletion.
|
|
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
deleted.
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
You shouldn't be able to press "Reset Windows" before the in-game
windows have been created. Previously this would crash.
|
|
the settings in it can be changed on client startup and aren't game
specific.
|
|
window so that it properly reports how much money you have.
|
|
|
|
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>
|
|
level, as well as making the job level bar more consistent.
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>
|
|
commit.
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
NOTE: This patch demonstrates the need to fix pixel coordinates in the
eAthena client. Bjorn did the movement patch in the TMWClient, however,
I still haven't got that fully working with the merges. It's likely that
a clone will be developed to tackle this problem.
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>
|
|
Signed-off-by: Ira Rice <irarice@gmail.com>
|