| Age | Commit message (Collapse) | Author | Files | Lines |
|---|
|
Reviewed-by: Stefan Beller
|
|
This reverts commit 4eea727b7649726670d8963d11ab4fd429624b3e.
It broke the overrides of the virtual functions and leaves the Graphics
API in inconsistent state with some Image* being const and others not.
|
|
Acked-by: Erik Schilling
|
|
The class DebugSwitches is a derived class from Container, 'which
automatically deletes its child widgets, so there is no need for
such fragile cleanup code.'
acked-by: bjorn
|
|
Reviewed-by: Ablu
|
|
This reverts commit 137ade7226af37d073a5755b90181275664dd65c.
Turns out that when leaving the default values, the textures won't
actually work since they are incomplete unless the mipmaps are generated
(since GL_TEXTURE_MIN_FILTER is GL_NEAREST_MIPMAP_LINEAR by default).
For now we don't want to generate mipmaps anyway since we're going for a
pixely look, so revert the filters back to GL_NEAREST.
The reason this had worked for me is because on my system the texture
type GL_TEXTURE_RECTANGLE_ARB is used instead of GL_TEXTURE_2D and this
texture type does not support mipmaps.
|
|
|
|
Change is tested.
Reviewed-by: bjorn.
|
|
Reviewed-by: Ablu.
|
|
Reviewed-by: bjorn.
|
|
- shows manaserv skills at all
- shows the progress bar for manaserv skills again
- shows the level for this skills (server side patch needed)
TODO: URGENT: Fix attributes and skills getting stored in same list.
Reviewed-by: Bertram.
|
|
|
|
Reviewed-by: bjorn.
|
|
The window menu (the row of buttons at the top right in game) was
displayed 3 pixels left of where it should be, which makes the setup
button jump 3 pixels left when logging in.
Reviewed-by: Ablu
|
|
|
|
Mantis-Issue: 423
Reviewed-by: Thorbjørn Lindeijer
|
|
They are no longer sent as fixed-length string since this doesn't work
when the new protocol debugging mode is used.
Reviewed-by: Ben Longbons
|
|
|
|
This makes the client able to send and receive messages sent in debugging
mode, where the contents of the messages are annotated.
For messages sent from the client the debugging mode is currently always
enabled. Later on this could be an internal option or controlled from the
server side.
Reviewed-by: Erik Schilling
|
|
There wasn't a whole lot gained by sharing a common base class, and it makes
extending the manaserv Message{In,Out} classes with a debugging mode
unnecessarily complicated.
Reviewed-by: Yohann Ferreira
|
|
Also, since GCC 4.7 there is a binary compatibility issue when linking with a
Guichan that was not compiled in C++11 mode. This commit also allows compiling
with GCC 4.7 with C++11 mode turned off.
Reviewed-by: Erik Schilling
|
|
- kick code untested because no kick button exists yet
Reviewed-by: bjorn.
|
|
|
|
Reviewed-by: bjorn.
|
|
Reviewed-by: bjorn.
|
|
|
|
The tmwa/BeingHandler was adjusting the effect id rather than the emote
id, causing it to not find the last emote (and the rest of the emotes
only worked correctly because the effect ids were consecutive in the same
order as the emote ids).
Furthermore, the EmoteShortcutContainer refused to draw the icon for the
last emote due to an off-by-one error in dealing with the 1-adjusted
emote ids used by the EmoteShortcut class.
Also cleaned up some old remains of a player ignore strategy that used
to use the two balloon emotes (this had been their original purpose).
Reviewed-by: Erik Schilling
|
|
The Windows releases have not been properly identifying themselves, and
it seems to be due to a compiler issue, as discovered by Stefan Dombrowski
(@cody). He did a similar change but didn't push it anywhere so I've redone
it.
The line that is now split up was very preprocessor-heavy, which may have
been part of the problem, but we'll probably never know what it was
exactly.
|
|
|
|
Reviewed-by: Thorbjørn Lindeijer
|
|
Also added Xcode project for others to compile for Mac OSX.
Reviewed-by: Thorbjørn Lindeijer
|
|
|
|
This is in order to still support older compilers, in particular GCC 4.2.1,
so that Mana may be compiled for Maemo 5.
Reviewed-by: Yohann Ferreira
|
|
When creating a custom server entry, the default port is used if no
other port is specified.
Reviewed-by: Thorbjørn Lindeijer
Mantis-issue: 464
|
|
Added a black background for maps that are smaller than the screen resolution
and centered them on screen.
Reviewed-by: Thorbjørn Lindeijer
Mantis-issue: 193
|
|
|
|
It makes no sense to mark a return value as const when it is returned by
value. This only makes sense if the return value is passed by reference, in
order to prevent the receiver from modifying the value.
Also made some other small adjustments. A std::string does not need to be
initialized to "" explicitly and getSafeUtf8String could take its parameter by
reference.
Reviewed-by: Yohann Ferreira
|
|
Reviewed-by: bjorn.
|
|
Mix_LoadMUS_RW was added with SDL_mixer 1.2.9.
Reviewed-by: Erik Schilling
|
|
One of the sound channels is reserved for notification sounds, of which the
volume can be configured separately. Currently, the only notification sound
that is played is for receiving whispers. That can be extended later.
The newmessage.ogg sound used currently is the one for receiving a message
with the Psi instant messenger.
Parts of this patch are based on the new message notification in ManaPlus.
Reviewed-by: Erik Schilling
|
|
Wrong define was used in the code.
|
|
Before it was a bit tricky to select the a being if there are two others around.
I fixed this by going through all sprites and looking for the closest one to the
mouse.
Reviewed-by: bjorn.
|
|
I tested it with the Towel and the Wedding Ring
on the testing server.
Spotted-by: Jenalya, cody.
Reviewed-by: Erik Schilling
|
|
Reviewed-by: Ablu and Bjorn
|
|
The thanks messages got removed, because they are useless and when
selling many items they completely trashed the chat.
In Mana 0.5 this was already fixed, see commit
13c4a1131854887ac9ec83f80c7964f6b2949c87.
Reviewed-by: Ablu
|
|
This getDrawOrder hack is no longer necessary. It basically moved to
the ActorSprite, in the other direction.
Reviewed-by: Erik Schilling
|
|
This was improperly done because of possible differences
in the actual victim position, due to server lag.
Spotted-by: cody
Reviewed-by: Thorbjørn Lindeijer
|
|
On the fringe layer, actors are drawn 'sorted' together with the tiles. When
the sorting order was separated from the actual Y position of the actor, the
tile drawing loop was not adapted to take this drawOrder into account rather
than the plain Y position.
Also, ActorSprite::draw was applying a half-tile offset to position the sprite
at the bottom while the logical position of the actor is at the center of the
tile. However, it failed to override getDrawOrder to account for this offset,
causing actors to get drawn earlier than they should (and thus being overlapped
by fringe layer tiles when they actually shouldn't).
This fixes drawing glitches with the paths around Hurnscald and reduces the
glitches when walking up/down through grass.
Reviewed-by: Erik Schilling
|
|
The filter system added while ago used to override the item slot
true order, even when being empty.
I now made the draw ordering change only when the filter is in use.
Reviewed-by: Thorbjørn Lindeijer
|
|
I made sure the manaserv based custom server don't get deleted
when running a manaserv-less client session.
Reviewed-by: Thorbjørn Lindeijer
|
