Age | Commit message (Collapse) | Author | Files | Lines |
|
Trivial fix.
|
|
Resolves: Mana-mantis #96.
Reviewed-by: Crush.
Note that the option to set the image position
next to the text is still needed
and will be handled in another issue.
|
|
This event got lost in commit c6a081ba610c5f5f298bc80c2ef28facb41dffae
and made it no longer possible to change the client resolution except by
pressing Enter or Space after selecting an item.
|
|
Just some stuff that piles up while "looking" at the code, which
eventually gets annoying to ignore while staging real changes.
* Replaced a few NULL occurrences with 0
* Rely on default parameter for std::vector::resize.
* Replaced a few "" with std::string()
* Prefer .empty() to == ""
* Removed a few comparisons with NULL
* Don't check pointers before deleting them
* Removed a bunch of redundant semicolons
* Made some global variables static (local to their compilation unit)
* Prefer prefix ++/-- operators to postfix versions when possible
* Corrected location of a comment
|
|
Also fix position of being names.
Reviewed-by: Bertram
|
|
- double clicking a do_choice item submits it
- double clicking the npc chat will hit 'next'
- double click to buy/sell a single item
- clicking on no item in the inventory now deselects
- double click to use/activate items in inventory
|
|
Useful for making nicer layouts
Signed-off-by: Jared Adams <jaxad0127@gmail.com>
|
|
Clicking below the last item of a listbox would select the last item.
Made it do nothing instead.
|
|
Incidentally I added support for a monospaced font (which may come in handy).
|
|
I have to admit I contributed a large part of these. Sorry for that.
Less empty space, more attention to the code.
Acked-by: Jared Adams
|
|
It's just an annoyance when it's only applied to a few classes. Either
we place everything in this namespace or nothing, and at the moment I
don't see any rationale for placing everything in a Mana namespace.
Acked-by: Jared Adams
|
|
Acked-by: Jared Adams
|
|
Acked-by: Jared Adams
|
|
Reviewed-by: thorbjorn
|
|
Currently working on the chat window.
Resolves: Mana-Mantis #308.
Reviewed-by: Thorbjorn.
|
|
Conflicts:
po/es.po
po/fr.po
src/net/tmwa/adminhandler.cpp
update-creator.sh
|
|
The compiler gave two times the warning:
comparison between signed and unsigned integer expressions.
Reviewed-by: thorbjorn
|
|
Reviewed-by: Kage
|
|
In preparation for resolution of mana-issue: #211.
Trivial.
|
|
|
|
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
|