Age | Commit message (Collapse) | Author | Files | Lines |
|
the palette colors. While technically, this can be accomplished through
other means, it's rather clumsy overall, and is prone to introducing in
programmer errors.
This commit finally catches every case where text is used, and applies
the text color from the color dialog to each of them appropriately.
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
The new color palette supports many more colors that the browserbox can
display. So a change to the color config gui was needed.
|
|
The internal storage for colors was in the file color.h/color.cpp. It
mainly managed the colors in the chat.
The Color class was extended to be more generic now and it stores
gcn::Color objects instead of integers now. A lot of new colortypes are
now available, though not many of them are used for now, that will come
in the next patches.
The Color class was renamed to Palette and color.{h,cpp} to
palette.{h,cpp} to better describe its purpose.
The color config gui now lists the new colors, even changes them, but the
result is not displayed properly for now.
|
|
Window class, but stripped down to the bare essential functionality to
just draw and position them. This means no resizing, no close buttons,
no ability to move them, etc. This should help reduce the overhead in
drawing speech bubbles, as well as other popup type dialogs, but is also
not a drop in replacement for the Window class as well.
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
other widget containers to use skins as well, and to make it easier to
extend later.
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
|
|
The string utility methods are now grouped together in the stringutils.h
header. Also, a toLower method was added for convenience.
|
|
|
|
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>
|
|
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
clicking on add to chat to put the item in the chat input. Left click
the item link to show a popup description, and click the link again to
remove the popup.
|
|
NPC String class. The Integer input field was rather horribly broken to
the point where it could send invalid data, the increment and decrement
buttons didn't work, and overall it was tripping over itself. As for the
NPC String, "The Mana World" as a string is not needed to set the field
to that length, but instead fills the text field with that text for
starting. This is completely inappropriate for a text entry field, and a
more sensible default would be to leave it empty, so that people can
type in what they want without having to delete it.
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
Introduced a LayoutHelper class which can be used for any non-Window
container where you want to use a layout to place child widgets.
|
|
|
|
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>
|
|
Changes mostly done by David Athay.
Currently these widgets are only used in the setup window, where they
replace the previously used TabbedContainer.
|
|
They were once meant for doing layout, but never used and the way
they're implemented they would be relayouting with every draw, which
isn't really nice.
|
|
Conflicts:
src/Makefile.am
src/game.cpp
src/gui/browserbox.cpp
src/gui/gui.cpp
src/gui/textfield.cpp
src/main.cpp
(cherry picked from mainline commit 7b67e852086ad3ccd98a622f890b245ab6a0a321)
|
|
Also fixed login dialog layout. This is the layout handler by Guillaume
Melquiond, which he started in commit 59472ef68fdef3f7e8858a81a46e28c127119c58.
|
|
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>
|
|
|
|
|
|
class.
NOTE: This commit adds a brand new dependency (SDL_TTF). Make sure to
install it, regenerate your config files, reconfigure, and then install
before attempting to compile.
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
white for wallpapers (matches our wallpapers better), and fixed the
effect manager.
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>
|
|
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>
|
|
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>
|
|
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.
|
|
|
|
according to wave functions.
|
|
colors.xml.
|
|
|
|
|
|
|
|
|
|
https://themanaworld.svn.sourceforge.net/svnroot/themanaworld/tmw/trunk
........
r3738 | b_lindeijer | 2007-11-16 00:44:01 +0100 (Fri, 16 Nov 2007) | 3 lines
Moved item icon from ItemInfo class to the Item class, so that it can be loaded
on demand. Results in faster startup time and reduced memory usage.
........
|
|
|
|
(reverted change 3811). Somehow seems it's not drawing anything, not sure why.
|
|
gcn::TabbedArea usage)
|
|
|
|
|
|
svnmerge from
https://themanaworld.svn.sourceforge.net/svnroot/themanaworld/tmw/trunk
(dynamic recoloring of sprites and related changes)
........
r3705 | gmelquio | 2007-11-03 10:58:25 +0100 (Sat, 03 Nov 2007) | 1 line
Fixed double load of hair graphics.
........
r3706 | gmelquio | 2007-11-03 22:04:51 +0100 (Sat, 03 Nov 2007) | 1 line
Added automatic recoloring of images. Inspired by fungos' ideas (PR #41).
........
r3707 | gmelquio | 2007-11-03 22:08:21 +0100 (Sat, 03 Nov 2007) | 1 line
Experimented recoloring on scorpions.
........
r3708 | gmelquio | 2007-11-04 12:52:44 +0100 (Sun, 04 Nov 2007) | 1 line
Tightened palette handling.
........
r3709 | gmelquio | 2007-11-04 12:54:31 +0100 (Sun, 04 Nov 2007) | 1 line
Experimented with scorpions again.
........
r3710 | gmelquio | 2007-11-04 16:40:37 +0100 (Sun, 04 Nov 2007) | 1 line
Applied recoloring to hair styles.
........
r3711 | gmelquio | 2007-11-04 17:50:37 +0100 (Sun, 04 Nov 2007) | 1 line
Converted slimes to recoloring.
........
r3742 | gmelquio | 2007-11-16 14:16:00 +0100 (Fri, 16 Nov 2007) | 1 line
Sped up recoloring of transparent pixels.
........
|
|
including optimization of OpenGL memory usage on modern OpenGL drivers.
Patches by Guillaume Melquiond.
|
|
to native for some files that were still missing this property. This is
a feeble attempt to reduce the amount of conflicts for future merges.
|
|
art attribute. Removed the now unnecessary multiplication of weapon IDs with
10000. Added a fallback item icon and used it for unknown items or when an item
image fails to load.
|
|
|
|
window resize and move events.
|
|
|