Age | Commit message (Collapse) | Author | Files | Lines |
|
Conflicts:
src/being.cpp
src/client.cpp
src/commandhandler.cpp
src/gui/setup_video.cpp
src/gui/socialwindow.cpp
src/gui/viewport.cpp
src/gui/widgets/browserbox.cpp
src/gui/widgets/itemcontainer.cpp
src/imageparticle.cpp
src/localplayer.cpp
src/localplayer.h
src/map.cpp
src/net/tmwa/beinghandler.cpp
src/particle.cpp
src/particle.h
src/player.cpp
src/player.h
|
|
Following Rotonen's advise to "make anything and everything you
can think of recolorable", a theme can now define colors for
PARTY_CHAT_TAB and PARTY_SOCIAL_TAB. This was badly needed, because
the requirements for a color of a chat tab and of a player name
are quite different.
TODO: When guild support gets enabled, then have a look at the
colors for guilds.
Reviewed-by: 4144
|
|
How to reproduce the bug:
* Press button Leave in social window.
* In the confirm dialog press No.
* Then switching character makes the client crash.
Trivial fix.
|
|
If no name is given, then the player obviously didn't want to create it.
Now the empty input is handled just the same way as in the invite dialog.
Trivial fix.
|
|
Conflicts:
src/actorspritemanager.h
src/beingmanager.cpp
src/game.cpp
src/gui/beingpopup.cpp
src/gui/chat.cpp
src/gui/chat.h
src/gui/inventorywindow.h
src/gui/itempopup.cpp
src/gui/socialwindow.cpp
src/gui/statuswindow.cpp
src/gui/widgets/chattab.cpp
src/gui/widgets/chattab.h
src/net/tmwa/inventoryhandler.cpp
src/net/tmwa/partyhandler.cpp
src/party.cpp
src/sound.cpp
src/utils/stringutils.cpp
src/utils/stringutils.h
|
|
Adding error message when trying to create a party with to long name.
Removing non-existing files from C::B project.
Signed-off-by: Jared Adams <jaxad0127@gmail.com>
|
|
Signed-off-by: Jared Adams <jaxad0127@gmail.com>
|
|
Signed-off-by: Jared Adams <jaxad0127@gmail.com>
|
|
* Segmentation fault happened if a player left a party
while other party members are offline.
* While creating a party the key input is not anymore reused for game play.
* The vertical scrollbar is only shown when needed.
* The default height was raised, because before much of the functionality
was hidden.
Signed-off-by: Thorbjørn Lindeijer <thorbjorn@lindeijer.nl>
|
|
EventManager has been merged into Event, with some new convinience methods
added.
Reviewed-by: Chuck Miller
|
|
Reviewed-by: Yohann Ferreira
|
|
Reviewed-By: Jared Adams
|
|
Conflicts:
data/graphics/CMakeLists.txt
data/graphics/Makefile.am
src/client.cpp
|
|
Signed-off-by: Jared Adams <jaxad0127@gmail.com>
|
|
Signed-off-by: Jared Adams <jaxad0127@gmail.com>
|
|
Conflicts:
src/beingmanager.cpp
src/beingmanager.h
src/client.cpp
src/localplayer.cpp
|
|
Instead of having these three subclasses with minor differences, this
commit merges them back into Being. In the future, we can make Beings
that are talkable to some, attackable by others, etc. This also puts
back support for monster equipment.
Also changes remaining references to Being::Type and the constants to
refer to ActorSprite::Type.
Reviewed-by: Freeyorp
|
|
The invite and leave buttons are now only enabled when there are tabs. Also,
the code to handle them will do nothing if no tab is selected (backup
logic).
Reviewed-by: Chuck Miller
|
|
The remaining instances can't easily or safely be changed as the classes
involved don't have type information like Being does.
Reviewed-by: Freeyorp
|
|
Reviewed-by: Chuck Miller
|
|
|
|
Themes can now control the colors they use. Colors in the Viewport (being
names, particles, etc) can still be changed by the user. Also make
ProgressBars more easily colored. DyePalette was made more flexible in the
process.
Also fixes comparing strings of different lengths insensitively.
Reviewed-by: Thorbjørn Lindeijer
|
|
Reviewed-by: Thorbjørn Lindeijer
|
|
Reviewed-by: Thorbjørn Lindeijer
|
|
Fix "(C) 2009-2009" to just "(C) 2009"
Fix "(C) 2010 TMW" to "(C) 2010 Mana"
Remove TMW compyright on (hopefully all) files added after 0.0.29.1
|
|
|
|
|
|
|