Age | Commit message (Collapse) | Author | Files | Lines |
|
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: Thorbjorn.
Resolves: Mana-Mantis #229.
|
|
Trivial fix.
|
|
Small code style changes
Reviewed-by: Bertram.
Resolves: Mana-Mantis #227.
|
|
This log message shows up in mana.log: "Unhandled packet: 7c".
Later, the client will have to actually take care of it, though.
Reviewed-by: Bertram, jaxad0127.
|
|
Reviewed-by: Bertram
|
|
Reviewed-by: Thorbjorn
|
|
The short option for the server -s did not work.
Reviewed-by: Thorbjorn
|
|
For Linux OpenGL was already deactivated.
For OSX it is still by default switched on.
Reviewed-by: Jaxad0127
|
|
Reviewed-by: Jaxad0127
|
|
The SlotsBar is updated, if InventoryWindow::slotsChanged() is called.
This did not happen when an item disappeared from the inventory, because
of using it. Then the item quantity was just set to 0, but the SlotBar
was not notified.
Reviewed-by: Jaxad0127
|
|
The sound effects did not get played, because the path was wrong.
Reviewed-by: Turmfalke
|
|
Reviewed-by: Thorbjorn
|
|
Reviewed-by: Thorbjorn
|
|
|
|
An orderly disconnect of the map-server does work fine. Then in
Game::logic() an OkDialog is created, which triggers an event that
set the state to STATE_CHOOSE_SERVER.
Upon an unexpected disconnect the same OkDialog is created, but the player
does not see it. That is because the state gets changed to STATE_ERROR,
which creates another OkDialog. It changes the state to STATE_CHOOSE_SERVER
as well, but the ServerDialog does not take any input.
Reviewed-by: Jaxad0127
|
|
to fit manaserv latest changes.
Reviwed-by: Freeyorp, Thorbjorn.
|
|
How to reproduce the bug: Switch login, then for every
item there is this warning in the log file:
"ItemDB: Duplicate name of item found".
Reviewed-by: thorbjorn
|
|
How to reproduce the bug: Switch the login to an account with
fewer characters. Then those character slots are not empty, but
show characters from the previous account.
Reviewed-by: thorbjorn
|
|
If server and port was given on the command line, then the server type
was unknown. The command line options do work now, but only if standard
ports 6901 and 9601 are used.
This resolves http://bugs.manasource.org/view.php?id=177
TODO: Query the server about itself and choose the server type based on that.
Reviewed-by: Jaxad0127
|
|
Reviewed-by: Bertram
|
|
|
|
* In charselectdialog the requestFocus is now called later, because
before it had no effect, since it was called before the characters
were present. Having no char with focus has the side effect that
the escape key gets ignored.
* Removing the code for variable width of CharacterDisplay, because
with recent changes it is executed before the characters are present,
therefore it had no effect.
|
|
Reviewed-by: Jaxad0127
|
|
How to reproduce the segmentation fault: Open the emote pop-up. Then
press the escape key and switch the character. The emote pop-up is
still open and clicking on it makes the game crash.
Signed-off-by: Jared Adams <jaxad0127@gmail.com>
|
|
Reviewed-by: Freeyorp
|
|
The mini status window is higher than its visible area. Creating it first
makes sure that it does not overlap other windows. For example put the
equipment window right below the mini status window. After a restart
you cannot use the close button nor drag it, because you are actually
clicking on the mini status window.
Signed-off-by: Jared Adams <jaxad0127@gmail.com>
|
|
Bug description: If a player has equipable items only, then the equipment
backend gets not initialized. As a consequence the equipment window
remains empty. This is particularly a problem for new characters.
Signed-off-by: Jared Adams <jaxad0127@gmail.com>
|
|
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>
|
|
This resolves http://bugs.manasource.org/view.php?id=171
Reviewed-by: Bertram.
|
|
This resolves http://bugs.manasource.org/view.php?id=171
Reviewed-by: Bertram.
|
|
|
|
Signed-off-by: Jared Adams <jaxad0127@gmail.com>
|
|
Signed-off-by: Jared Adams <jaxad0127@gmail.com>
|
|
Segmentation fault happens if a player leaves
your party while he is out of sight.
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>
|
|
* 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>
|
|
Until now popups were only shown for players who are member of a party.
This resolves http://bugs.manasource.org/view.php?id=197
Signed-off-by: Jared Adams <jaxad0127@gmail.com>
|
|
* 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>
|
|
Reviewed-by: Freeyorp
|
|
The bug could not be reproduced by everyone. Many thanks to
Jaxad0127 for testing it on an affected system.
This patch resolves http://bugs.manasource.org/view.php?id=191
Signed-off-by: Jared Adams <jaxad0127@gmail.com>
|
|
Conflicts:
src/log.cpp
|
|
The missing include generated compiler error on windows.
Because of compiler warnings generated
by enet, warnings are switched of for:
* unknown #pragmas, which are for MSVC compiler
* enumeration with missing case
Reviewed-by: Bertram
|
|
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
|
|
This is a very old legacy option. Today its not very
useful because the logger had become quite verbose that
using it during run-time is not helpful.
Reviewed-By: Jared Adams
Reviewed-By: Freeyorp
|
|
Conflicts:
mana.cbp
mana.files
src/CMakeLists.txt
src/Makefile.am
src/utils/xml.cpp
|
|
|
|
Reviewed-by: Freeyorp
|
|
ResourceManager will now check for ".gz" and act appropriately (unless told
not to). Compression handling functions are now in new utils/zlib files,
along with a function to load a file from drive, uncompressing it if it ends
in ".gz".
Reviewed-by: Freeyorp
|
|
Signed-off-by: Jared Adams <jaxad0127@gmail.com>
|