Age | Commit message (Collapse) | Author | Files | Lines |
|
Reviewed-by: Freeyorp
|
|
Reviewed-by: Jared Adams
|
|
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
|
|
- Now OpenGL and the transparency disabling are set at startup and
not read again for displaying graphics, preventing graphic errors
before startup.
- We also agreed long time ago that SDL specific functions
should have a SDL prefix. The header has been rearranged a bit
to do so.
- Also fixed a possible discrepancy in the hasAlphaChannel() function.
Reviewed-by: CodyMartin.
Resolves: Mana-Mantis: #260.
|
|
Reviewed-by: Thorbjorn
|
|
Reviewed-by: Thorbjorn
|
|
Parse chat lines in BrowserBox once after changes.
Reviewed-by: Thorbjorn
|
|
Click-count is not double-click, because it does neither check if the
clicks happen on the same object nor if the clicks happen in rapid
succession.
* In the server dialog it can happen that you can get connected by
just selecting a server.
* In the social window it can happen that you open a chat by just
clicking once on a name.
* In the inventory window you better only select useable items if you
want to use them, because they might get used by just selecting them.
* And in case you actually want to use double-click, it often does
not work, because click-count is already larger than 2.
This reverts the commits:
8b4d9f9b5eaf175baf0c4209c312133bb457742c
b1aef06ac85b1ed7db7725e50b2dbfcdfd1a0925
4c27bfbf6ca84546e5b914b7909df14dd2966081
Reviewed-by: Thorbjorn
|
|
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
|
|
|
|
Reviewed-by: Jaxad0127
|
|
Reviewed-by: Freeyorp
|
|
|
|
Signed-off-by: Jared Adams <jaxad0127@gmail.com>
|
|
How to reproduce the bug: Leave a party, while the party tab in the chat
window is not selected. Then click with the mouse on the chat window.
Signed-off-by: Thorbjørn Lindeijer <thorbjorn@lindeijer.nl>
|
|
* Price and total money is now shown from the beginning in sell dialog.
* Item popup is set invisible when mouse has moved away from items.
* Item popup gets deleted when shop closes.
Signed-off-by: Jared Adams <jaxad0127@gmail.com>
|
|
Most of Net::InventoryHandler is now done through events. The
ActorSpriteManager was also replaced by events. A few odds and
ends were taken care of too.
Reviewed-by: Bertram
|
|
|
|
|
|
Reviewed-by: Yohann Ferreira
|
|
Conflicts:
src/net/tmwa/chathandler.cpp
|
|
-Double-click items in invetory to equip/unequip
-Double-click items in inventory to use
Signed-off-by: Jared Adams <jaxad0127@gmail.com>
|
|
Please note that I didn't turned all the getValue() call into new ones,
simply because I have to have config object initiated which is not
forcefully the case the branding file.
Resolves: Manasource Mantis #170.
|
|
Conflicts:
src/gui/itempopup.cpp
src/item.cpp
src/monster.cpp
src/net/manaserv/playerhandler.cpp
src/net/tmwa/partyhandler.cpp
src/npc.cpp
src/player.cpp
src/resources/itemdb.cpp
src/resources/monsterdb.cpp
src/resources/monsterinfo.cpp
src/resources/npcdb.cpp
src/resources/spritedef.cpp
|
|
Also cleanup PlayerInfo a bit.
Reviewed-by: Chuck Miller
|
|
Signed-off-by: Jared Adams <jaxad0127@gmail.com>
|
|
Reviewed-by: Bertram
|
|
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
|
|
Now draw image only in chat item popup.
Reviewed-by: Bertram
|
|
This commit adds a sprite hierarchy (Sprite->ImageSprite,AnimatedSprite,CompundSprite;
CompoundSprite,Actor->ActorSprite;ActorSprite->Being,FloorItem) to collect common
functionailty into new base classes which will make other Mantis tickets easier to do.
Also allows monsters to use particle effects.
Reviewed-by: Bertram
|
|
Signed-off-by: Jared Adams <jaxad0127@gmail.com>
|
|
|
|
Add option in players setup page.
Add command line option.
Signed-off-by: Jared Adams <jaxad0127@gmail.com>
|
|
Reviewed-by: Bertram
|
|
Old settings are causing it to fall back on the wrong combination of
files if old data is in the search path.
Reviewed-by: Jared Adams
|
|
Reviewed-by: Thorbjørn Lindeijer
|
|
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
|
|
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
|
|
Also merge the guialpha ConfigListener into Theme.
Reviewed-by: Thorbjørn Lindeijer
|
|
Reviewed-by: Jared Adams
Reviewed-by: Bertram
|
|
This reverts commit 67e678094b9fddd21fb3c690130e772937ab2746.
Conflicts:
src/gui/gui.cpp
src/gui/viewport.cpp
|
|
Reviewed-by: Chuck Miller
|
|
Reviewed-by: Thorbjørn Lindeijer
Reviewed-by: Chuck Miller
|
|
|
|
|
|
The older gray theme and the new wood theme are available as themes.
The gray theme needs some new graphics for hilights.
Add a theme option for branding and add path/to/branding/data to the
PhysFS search path.
Reviewed-by: Thorbjørn Lindeijer
Reviewed-by: Chuck Miller
|
|
Reviewed-by: Thorbjørn Lindeijer
Reviewed-by: Chuck Miller
|
|
Reviewed-by: Jared Adams
|
|
Also make storage under eAthena more flexible.
Reviewed-by: Dennis Friis
|