Age | Commit message (Collapse) | Author | Files | Lines |
|
Conflicts:
src/being.cpp
src/being.h
src/floor_item.cpp
src/floor_item.h
src/flooritemmanager.cpp
src/gui/inventorywindow.cpp
src/gui/inventorywindow.h
src/gui/itemcontainer.cpp
src/gui/popupmenu.cpp
src/net/beinghandler.cpp
src/npc.cpp
|
|
as some other optimizations that I could see that cut down on some
unneeded redraws, which in turn improved frame rates slightly.
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
The window name is used in the configuration file, in contrast to the
window title.
|
|
Mainly removed trailing whitespace. Also small fix in header of
recorder.cpp.
|
|
useful since buddy lists are tracked through the player relation
interface instead)
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
Mainly removed trailing whitespace. Also small fix in header of
recorder.cpp.
|
|
Removed tab characters and trailing spaces and added spaces between
"if(", "for(", "while(" and "switch(".
|
|
Conflicts:
A lot of files...
|
|
Removed tab characters and trailing spaces and added spaces between
"if(", "for(", "while(" and "switch(".
|
|
spots that could also be fixed up as well, but require other methods to
fix them (the filled color rectangles on the progress bars, as well as
the text on them as well, as an example).
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
when the client was last exited.
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
even when there's already a saved window configuration.
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
enough to contain the map's name. Also fixed an unnoticed logic flip
that was done unintentionally. This class now manages to work
perfectly when the config file has no previous dimensional influences,
but still won't resize properly without removing the ability to resize
or getting rid of those stored configs. TODO: Find out why loading
window configuration for the default minimum width or height overrides
the Minimap's supplied dimensions it wants.
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
reason, the windows will gladly shrink when resizeable, but not grow.
This will need to get resolved some time later.
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
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.
|
|
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
the time (and it might be added back in the future), it requires a
bit of a change to the window code to fix (not too hard) and its own custom
click handler (again, not that hard). Done for the sake of avoiding
too much redundancy.
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
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>
|
|
fixed a few compiler warnings noticed from building in windows.
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.
|
|
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>
|
|
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>
|
|
a confusion on git.
|
|
Based on a patch by QOAL.
|
|
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?
|
|
better.
|
|
|
|
putting back in backwards compatibility with TMW style minimaps. While
this might seem like a big deal, it also allows us to make minimaps as
big as we'd like, which is a huge perk for really large maps or really
small ones.
|
|
names on all of the maps, and redid minimaps to fit the new minimap
code.
|
|
|
|
leeor_net.
|
|
|
|
https://themanaworld.svn.sourceforge.net/svnroot/themanaworld/tmw/trunk
(but kept looks in Being class, since eAthena works that way)
........
r3629 | gmelquio | 2007-10-18 21:00:38 +0200 (Thu, 18 Oct 2007) | 1 line
Removed player looks from generic beings. Prevented client termination on missing sprites. Merged weapon-type and attack-type fields for items.
........
r3630 | gmelquio | 2007-10-18 21:30:57 +0200 (Thu, 18 Oct 2007) | 1 line
Fixed changelog message.
........
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
the default win position. And moved the setposition from game to each win, to clarify the code.
|
|
|