| Age | Commit message (Collapse) | Author | Files | Lines |
|---|
|
Resolves: Mana-mantis #277
Trivial fix.
|
|
Resolves: Mana-mantis #277
Trivial fix.
|
|
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: Crush.
|
|
This reverts commit 3d6a2d9c80a969c3613f567dd7029e75ef59b5cb.
I've by that readded the AFK system on master. Please, remove it
when we've got a proper replacement.
|
|
Reviewed-by: Kage
|
|
I turned the CharacterEntries into a vector.
As for now, it's basically working but I discovered bugs about
slots handling mainly for Manaserv that were already present
before that patch.
Hence, there are three remaining issues:
- Under ManaServ, the character's slots numbers aren't handled
when loading the characters but used when sending selection
or deletion attempts.
For instance, if you delete the character at slot 1, you won't
be able to select or delete characters at slots 2 and 3,
since the server believes that the characters are now in slots 1 and 2,
even thought the client still displays them at the former slots.
- Also under manaserv, you won't be able to create a character at slot 1
and 3, the server will automatically add the new one to the next slot,
which is not corresponding to where you clicked to the 'Create' button.
I propose to make Manaserv send again the character slots numbers
and store them in database since we used them in creation,
selection, and deletion attempts. It would make more sense IMHO.
- The last remaining issue found is that when switching between different
servers, the loginData don't get cleaned up, make the characterSelect dialog
look crazy when the number of slots is different between two servers.
If this one is accepted, my next patch will make the logindata be cleaned up
between each login attempts (as for the slot number, and maybe other sensible
data) and the next ones will readd character slot handling server
and client side.
Reviewed-by: Jaxad0127.
|
|
|
|
In preparation for resolution of mana-issue: #211.
Trivial.
|
|
Resolves: Mana-Mantis #265.
Trivial fix.
|
|
By default OK shortcut is space key.
Reviewed-by: Jaxad0127, Kage
|
|
Reviewed-by: Jared Adams
|
|
Instead of using events to invoke netcode,
invoke netcode directly and have it send events
Reviewed-by: Freeyorp
|
|
|
|
Reviewed-by: Freeyorp
|
|
Reviewed-by: Jared Adams
|
|
Reviewed-by: CodyMartin.
|
|
This resolves http://bugs.manasource.org/view.php?id=259
Reviewed-by: Thorbjorn
|
|
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
|
|
transparency'.
That name is more explicit about what it actually does.
Reviewed-by: CodyMartin.
|
|
- 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.
|
|
Also tested to be compatible with tA.
Now the Status window is much more nicer when using Manaserv.
HP, max hp, ... are now working fine along with corrections made
in the attributes.xml file (in next commit.)
Reviewed-by: Thorbjorn.
|
|
Reviewed-by: cody
|
|
Trivial fix.
|
|
Reviewed-by: Bertram, Thorbjorn
|
|
This disables the Image::setAlpha() function, which
uses 60% of the client's CPU cycles.
When enabled, visual quality is slightly decreased,
especially with the particle system.
Toggling this setting On from an Off state requires
a client restart or the graphics look quite funny.
Bertram's addition:
- Renamed 'Low CPU' to 'Disable transparency (Low CPU)' in the gui
for better understanding.
- Removed the sprite display with 30% opacity when disabling
transparency since it made monsters and drops be drawn above all layers
at full opacity.
- Made the OpenGL mode disable the 'low CPU mode'.
- Fixed the GUI logic as much as possible. Please note that the GUI opacity
slider stays enabled when transparency is disabled even if told to be disabled
in that case.
Reviewed-by: CodyMartin, 4144, MadCamel.
|
|
Add colors:
Local Player Hits Monster
Local Player Critical Hit
Local Player Miss
Reviewed-by: cody
|
|
Reviewed-by: cody
|
|
Enabled by default.
Can be disabled in configuration option "alphaCache" if set it to 0.
Reviewed-by: Bertram
|
|
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
|
|
With the preprocessor definition MANASERV_SUPPORT the manaserv
support is avaible as before.
* Removing server type from server dialog GUI.
* Ignoring Manaserv entries in serverlist.xml.
* In order not to lose Manaserv CustomServers from the config.xml,
they get stored in mManaservServers.
* The entries in mManaservServers are saved in config.xml again. But
they are now behind the TMWA-Athena servers.
* For custom server the GUI sets 6901 as default value for port.
* If the server type is unknown, then we use TMW-Athena. This is
relevant, if the client is started with command line options for server.
Reviewed-by: Bertram
|
|
* Shortening option names that got cropped in video setup
* Moving options to the left hand side in player setup, because
they looked like they belong to the "when ignoring" part.
Reviewed-by: Bertram
|
|
Reviewed-by: Jaxad0127
|
|
Removed due to unresolved social issues.
In master it had been already removed by Kage in
commit 89f192b9039f9c000515f0a12f4bb9fb55c4691c.
|
|
When a player clicked on a tile in order to
go to it, then he went to the wrong tile.
Trivial fix.
|
|
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.
|
|
This would be if it was handled by a addon later.
Reviewed-By: Freeyorp < Freeyorp101@hotmail.com >
|
|
The implamentation is poor, and this is something that
would be better handled by the addon engine later down
the road.
Reviewed-By: Freeyorp < Freeyorp101@hotmail.com >
|
|
Until now the being was only set after a mouse move. If the mouse was
pressed after the being was out of sight or dead, then a segmentation
fault happened. Furthermore, pressing the mouse now updates the cursor
type and sets the being popup invisible.
Reviewed-by: Thorbjorn
|
|
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.
|
|
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: Thorbjorn
|
|
For Linux OpenGL was already deactivated.
For OSX it is still by default switched on.
Reviewed-by: Jaxad0127
|
|
Reviewed-by: Jaxad0127
|
|
Reviewed-by: Thorbjorn
|
