summaryrefslogtreecommitdiff
path: root/src
AgeCommit message (Collapse)AuthorFilesLines
2011-11-12Removed some Channel and ChannelTab related sillinessThorbjørn Lindeijer3-14/+2
* Channel always has a ChannelTab, so need to check it for null * Removed duplicate handling of 'topic' command * No need to set Channel::mTab twice Reviewed-by: Yohann Ferreira
2011-11-12Fixed the button popup incorrectly shown when loading the window menu.Yohann Ferreira1-3/+1
This was due to a small logic error when setting the popup text. Reviewed-by: Erik Schilling
2011-11-12Prevent a potential crash when the chat channel is wrong.Yohann Ferreira1-1/+11
Reviewed-by: Erik Schilling
2011-11-01Merge github.com:mana/manaYohann Ferreira30-95/+93
Conflicts: src/localplayer.cpp src/net/manaserv/beinghandler.cpp src/net/manaserv/charhandler.cpp
2011-10-25Change the wrong, but mostly supported WIN32 macro to the correct _WIN32, ↵Bernd Wachter10-25/+25
enforced by -std=c++0x Reviewed-by: Thorbjørn Lindeijer
2011-10-23Fixed a certain class of Doxygen warningsThorbjørn Lindeijer17-60/+50
All cases of documentation for non-existing parameters are now fixed. Also marked a few getters as 'const', removed some superfluous 'inline' keywords and removed the unused 'forceQuantity' option from ItemContainer. Reviewed-by: Yohann Ferreira
2011-10-22Officially added the gender in the manaserv protocol.Yohann Ferreira3-4/+14
Reviewed-by: bjorn.
2011-09-30Fixed the negative XP notifications on levelups.Yohann Ferreira1-3/+20
This used to have an associated issue but I just can't find it anymore. Reviewed-by: Thorbjorn.
2011-09-30Merge github.com:mana/manaYohann Ferreira2-3/+12
2011-09-30Remove goto from dye.cppAndrei Karas1-2/+11
2011-09-30Fixed a typo in a default value.Yohann Ferreira1-1/+1
2011-09-30Revert "Made the first XP notification don't show anymore."Yohann Ferreira1-7/+1
This reverts commit 06fff57500242c37890459ceffdfff2bdf19f6d6. At least I tried :) I'd like to have a clear discussion about how we could initialize the skill and attributes values, without spamming the user.
2011-09-29Fixed the player direction update when picking up an item using the mouse.Yohann Ferreira1-0/+1
This also happened when trying to reach a monster. I didn't fix the pick up once the destination is reached as the fix will be a little more complex.
2011-09-29Fix negative XP on levelups.Yohann Ferreira1-3/+10
This used to have an issue but i just can't find it anymore.
2011-09-29Made the first XP notification don't show anymore.Yohann Ferreira1-1/+7
Resolves: Mana-Mantis #158.
2011-09-28Forgot to update the db version number in the client protocol file.Yohann Ferreira1-1/+1
2011-09-28Officially added the gender in the manaserv protocol - client part.Yohann Ferreira3-4/+16
2011-09-28Merge github.com:mana/manaYohann Ferreira5-1/+19
2011-09-29Fixed item popup still visible after closing inventory window.Erik Schilling5-1/+19
Reviewed-by: Bertram.
2011-09-28Small changes requested by o11c - part 2.Yohann Ferreira1-39/+38
Most noticeably I added the shortcut in a popup, even when there are no images to the image buttons in the windowmenu.
2011-09-28Small changes requested by o11c - part 1.Yohann Ferreira2-3/+8
2011-09-28Added true arrows graphics to tab area buttons.Yohann Ferreira2-3/+7
2011-09-28Made the shortcuts link actually use the plural in its caption.Yohann Ferreira1-4/+4
2011-09-28The shortcuts are now refreshed when reassigning keys.Yohann Ferreira5-10/+77
2011-09-28Added icons to the confirm and cancel button of the quit dialog.Yohann Ferreira2-2/+6
This a good example of use for the new graphics and button functionalities.
2011-09-28Fixed back the special window display in a basic but working way.Yohann Ferreira2-1/+4
This to avoid cluttering the gui until Crush has the time to fulfill his issue about those.
2011-09-28Added a naive way to display the window keyboard shortcut.Yohann Ferreira2-10/+31
This is not updated once the keys are reassigned but it will do the trick for now.
2011-09-28Reached the state where the menu bar is now using image buttons.Yohann Ferreira1-7/+7
I had to adapt a bit the images given by Enchilado to do that.
2011-09-28Made the button icon only shown when the icon file is valid.Yohann Ferreira3-9/+9
And falls back to the text based caption otherwise.
2011-09-28Added the setup button icon and optimized the image size.Yohann Ferreira1-1/+1
2011-09-28Changed the Social button to an image one.Yohann Ferreira4-12/+25
I also made the client able to keep the old behaviour, and i changed the button api to not require the icon frames size as it could easily guess them.
2011-09-28Added textpopup on mouse hovering support to buttons.Yohann Ferreira3-2/+74
I added a use of it to the menu buttons.
2011-09-28Small chages requested by o11c - part 2.Yohann Ferreira1-39/+38
Most noticeably i added the shortcut in a popup, even when there are no images to the image buttons in the windowmenu.
2011-09-28Small changes requested by o11c - part 1.Yohann Ferreira2-3/+8
2011-09-28Got rid of the superfluous definition of the slot number for tA.Yohann Ferreira2-4/+4
2011-09-16Improve handling of packet lengths.Ben Longbons1-42/+46
* Use a symbol, VAR, instead of -1 for variable-length packets. * Also change it's value to 1, so the length can be properly unsigned. Note: A packet can't actually have length 1, since packet ID is 2 bytes. * Use correct type (uint16_t) for packet id and length in more places. * Avoid reading beyond the length of the array. * Immediately parse variable length packets with length 4 (i.e. no body) instead of waiting for another byte to arrive first. Reviewed-by: Thorbjørn Lindeijer <thorbjorn@lindeijer.nl>
2011-09-16Prevent copying of MutexLockerBen Longbons1-1/+11
There was a bug here, which wouldn't surface if the copy was elided. Fixed by using a move constructor. Reviewed-by: Thorbjørn Lindeijer <thorbjorn@lindeijer.nl>
2011-09-16Instead of SDL_mutex, use Mutex wrapper and MutexLocker for safetyBen Longbons2-23/+12
Reviewed-by: Thorbjørn Lindeijer <thorbjorn@lindeijer.nl>
2011-09-16Renamed Map::DebugFlags enumeratorsThorbjørn Lindeijer4-34/+34
Their name is a bit more clear with DEBUG prefix rather than MAP prefix. They're already scoped in the Map class anyway. MAP_NORMAL was changed to DEBUG_NONE to represent no debug flags. Acked-by: Bertram
2011-09-15Improve handling of packet lengths.Ben Longbons1-42/+46
* Use a symbol, VAR, instead of -1 for variable-length packets. * Also change it's value to 1, so the length can be properly unsigned. Note: A packet can't actually have length 1, since packet ID is 2 bytes. * Use correct type (uint16_t) for packet id and length in more places. * Avoid reading beyond the length of the array. * Immediately parse variable length packets with length 4 (i.e. no body) instead of waiting for another byte to arrive first. Reviewed-by: Thorbjørn Lindeijer <thorbjorn@lindeijer.nl>
2011-09-15Prevent copying of MutexLockerBen Longbons1-1/+11
There was a bug here, which wouldn't surface if the copy was elided. Fixed by using a move constructor. Reviewed-by: Thorbjørn Lindeijer <thorbjorn@lindeijer.nl>
2011-09-15Instead of SDL_mutex, use Mutex wrapper and MutexLocker for safetyBen Longbons2-23/+12
Reviewed-by: Thorbjørn Lindeijer <thorbjorn@lindeijer.nl>
2011-09-13Made the delay between to keyboard move calls functional.Yohann Ferreira8-8/+44
It has been fixed and be made adapted to the being movement speed. Now, for instance, the client sends 3x times less move calls to the tA server, and roughly 20x times for the Manaserv's one. Resolves: Mana-Mantis #346. Reviewed-by: o11c.
2011-09-13Renamed Map::DebugFlags enumeratorsThorbjørn Lindeijer4-34/+34
Their name is a bit more clear with DEBUG prefix rather than MAP prefix. They're already scoped in the Map class anyway. MAP_NORMAL was changed to DEBUG_NONE to represent no debug flags. Acked-by: Bertram
2011-09-13Merge github.com:mana/manaYohann Ferreira3-7/+13
2011-09-13Fix compilation by readding a missing enum value.Yohann Ferreira1-0/+1
Trivial.
2011-09-13Fixed OpenGLGraphics::drawRescaledImagePatternThorbjørn Lindeijer1-32/+45
This fixes overlay effects that are meant to scale with screen resolution. The problem was that the texture coordinates were not calculated correctly. They were adjusted to the scaled size of the image, and when scaling both the vertex and the texture coordinates, the image will simply not appear scaled at all. Now the texture coordinates are calculated based on the visible part of the original texture. There was also a problem with the vertex coordinates, which were not taking into account the visible part of the image. TMW-Mantis-issue: 1047
2011-09-11Merge branch '0.5'Thorbjørn Lindeijer4-39/+57
Conflicts: CMakeLists.txt src/map.cpp src/winver.h
2011-09-11Fixed OpenGLGraphics::drawRescaledImagePatternv0.5.3Thorbjørn Lindeijer1-32/+45
This fixes overlay effects that are meant to scale with screen resolution. The problem was that the texture coordinates were not calculated correctly. They were adjusted to the scaled size of the image, and when scaling both the vertex and the texture coordinates, the image will simply not appear scaled at all. Now the texture coordinates are calculated based on the visible part of the original texture. There was also a problem with the vertex coordinates, which were not taking into account the visible part of the image. TMW-Mantis-issue: 1047 Reviewed-by: Andrei Karas <akaras@inbox.ru>
2011-09-11Fixed drawing glitch with overwide tilesThorbjørn Lindeijer2-5/+10
The layer rendering code was not prepared to handle tiles that were wider than the tile width of the map. This commit also fixes the initialization of the maximum tile height, which was based on the map height rather than the tile height. This could slightly reduce overdraw for some maps. Reviewed-by: Stefan Beller <stefanbeller@googlemail.com>
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-27 05:37:35 +0000