summaryrefslogtreecommitdiff
path: root/src
AgeCommit message (Collapse)AuthorFilesLines
2011-02-01Merge branch '0.5'Thorbjørn Lindeijer4-12/+23
Conflicts: po/de.po src/game.cpp src/resources/wallpaper.cpp
2011-02-01Make it clear that our current sha256 code is GPLv2 onlyThorbjørn Lindeijer1-3/+2
Due to taking the version from InspIRCd, our version of the file is stuck on GPLv2 and can't legally be released as "GPLv2 or later". Fix the license header accordingly. We should probably consider replacing this code once again. Reviewed-by: Patrick Matthäi
2011-01-28Fix Windows build of the 0.5 version.Yohann Ferreira1-2/+2
The rc and specialfolders files where included with the manaserv specific files.
2011-01-27Made the windows app able to load .ico files at runtime.Yohann Ferreira2-6/+18
Now the icon extension is computed against the os, except for mac where the behaviour is left untouched. This means that the 'icons/mana' appIcon branding parameter will now load icons/mana.png files for unices, and icons/mana.ico for Windows. Reviewed-by: Trapdoor. Resolves: Mana-Mantis: #135.
2011-01-27Fix the wallpapers loading broken logic.Yohann Ferreira1-6/+10
Trivial.
2011-01-27Made the windows app able to load .ico files at runtime.Yohann Ferreira1-5/+17
Now the icon extension is computed against the os. This means that the 'icons/mana' appIcon branding parameter will now load icons/mana.png files for unices and mac, and icons/mana.ico for Windows. Reviewed-by: Trapdoor. Resolves: Mana-Mantis: #135.
2011-01-27Send the correct protocol version when registering on Manaserv.Yohann Ferreira1-1/+1
2011-01-26Prune the enet and manaserv files dependency of the 0.5 binary.Yohann Ferreira2-6/+18
Only using cmake conditions and an ifdef. This will greatly help packaging the mana 0.5 version on other distros.
2011-01-25Added a child class to the equipment window specialized for tAthena.Yohann Ferreira3-72/+116
(As requested by Thorbjorn.) Now the foundation to set up per-protocol equipment display is ready.
2011-01-25Upgraded the manaserv protocol version to 1.Yohann Ferreira1-1/+1
Yeah, I know Jaxad, we're not releasing but as agreed with Thorbjorn, the protocol is incompatible even when moving, so better get rid of old clients early.
2011-01-24Refactored the item loading in a more extensible and per protocol way.Yohann Ferreira13-420/+729
This will greatly help into upgrading the need of each protocol separately. This is the first step to a new item and equipment system for manaserv. A subclassing of the EquipmentWindow will be done in the next commit, as requested by Thorbjorn. Reviewed-by: Thorbjorn.
2011-01-22Fixing pick-up with joystickStefan Dombrowski1-3/+3
The pick-up with the joystick happend on the wrong tile. Bug was reported by Feufochmar on IRC.
2011-01-19Fix the wallpapers loading broken logic.Yohann Ferreira1-5/+3
Trivial.
2011-01-18Check for negative positional values in the playSfx() function.Yohann Ferreira1-0/+4
From http://www.gitorious.org/manaplus/manaplus/commit/6c885855b0c06bd7c4b6ab3574d8e2f3398ad97a Thanks to 4144. Trivial.
2011-01-13Fix a segfault when attempting to buy free items.Yohann Ferreira1-5/+15
Resolves: Mana-mantis #277 Trivial fix.
2011-01-13Made the client handle better the lack of items.xml file.Yohann Ferreira3-4/+37
Now the client returns to server choice dialog with a warning instead of aborting. I'm kinda certain I'm not the only one getting crazy with such a lazy behaviour. Reviewed-by: Jaxad.
2011-01-13Fix a segfault when attempting to buy free items.Yohann Ferreira1-5/+15
Resolves: Mana-mantis #277 Trivial fix.
2011-01-13Fix a segfault when the animation loading fails.Yohann Ferreira1-1/+3
Trivial.
2011-01-13Removed the unused and undefined setWeaponType() function.Yohann Ferreira1-2/+0
Trivial.
2011-01-13Moved the normalize() function in strungUtils where it belongs.Yohann Ferreira3-8/+19
(Preparation for bringing a smaller item loading refactoring patch.) Trivial.
2011-01-11Remove the protocol version magic number.Yohann Ferreira2-1/+3
This follows the changes made on the server. Reviewed-by: Jaxad.
2011-01-11Added a distance based positional sfx sound system. Thanks to 4144.Yohann Ferreira3-9/+39
Based on: http://gitorious.org/manaplus/manaplus/commit/ef7f53e43ce4306080efae3b86443a6016a3e66a Resolves: TMW-Mantis #536 Reviewed-by: 4144.
2011-01-10Remove the player naturally avoid other beings for Manaserv.Yohann Ferreira1-1/+5
It could lead to (even small) curious desyncs making things worse to debug. Trivial.
2011-01-09Fix other direction discrepancies on the client.Yohann Ferreira2-23/+10
This fix the change dir (with alt key), attacks directions, and the direction of a being standing when you come in its range. Reviewed-by: Jaxad. Resolves: Mana-mantis #257
2011-01-06Made the beings avoid changing direction at their path's end.Yohann Ferreira2-26/+46
I had to let the keyboard path not be resend when the player released the movement keys and work on conditions used to update the beings direction to avoid conflicts. Resolves: Mana-mantis #154. Reviewed-by: Thorbjorn.
2011-01-03Merge branch '0.5'Thorbjørn Lindeijer2-6/+8
Conflicts: po/es.po po/fr.po src/net/tmwa/adminhandler.cpp update-creator.sh
2011-01-03Sync the manaserv_protocol.h file witht the one of the server.Yohann Ferreira1-4/+55
Trivial.
2011-01-02Fixed possible crash when receiving player IPThorbjørn Lindeijer1-3/+6
Could happen sometimes for GMs when the message is received either before the player instance is created or after it was destroyed. Also changed to a dynamic_cast, putting a little less trust in the server. Reviewed-by: Freeyorp
2011-01-02Fixing compiler warningsStefan Dombrowski1-2/+2
The compiler gave two times the warning: comparison between signed and unsigned integer expressions. Reviewed-by: thorbjorn
2010-12-30Renamed protocol.h to manaserv_protocol.h to follow server's changes.Yohann Ferreira18-17/+17
I'll sync the two files as for the new enums in a separate commit. Trivial fix. Resolves: Mana-mantis #278.
2010-12-29Made the client handle the characters slots properly for Manaserv.Yohann Ferreira4-10/+28
Reviewed-by: Crush.
2010-12-29Fixed potential flaw for the number of characters slots on tAthena.Yohann Ferreira2-6/+19
Was happening when logging to the dev manaserv server and then to TMW-eA. The client is still crashing after selecting the characters after relogging but that's not introduced with this patch anyway. Reviewed-by: Crush.
2010-12-28Revert "Remove the AFK response system"Yohann Ferreira4-1/+104
This reverts commit 3d6a2d9c80a969c3613f567dd7029e75ef59b5cb. I've by that readded the AFK system on master. Please, remove it when we've got a proper replacement.
2010-12-26Fix crash with corrupted links in chat.Andrei Karas1-2/+2
Reviewed-by: Kage
2010-12-22Merge branch '0.5'Chuck Miller3-166/+0
2010-12-22Remove ambientoverlay class and filesChuck Miller3-166/+0
It was renamed and duplicated to "ambientlayer"
2010-12-17Update the net/manaserv/protocol.h file with latest description.Yohann Ferreira1-2/+2
Trivial fix.
2010-12-16Made the client handle the number of slots given by the server.Yohann Ferreira5-15/+45
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.
2010-12-15Merge branch '0.5'Thorbjørn Lindeijer4-529/+9
2010-12-15Unlock the char select dialog even if we've got an error.Yohann Ferreira1-1/+1
This permit not to be stuck at character deletion when something goes wrong. Trivial fix.
2010-12-15Small hacking cleanups.Yohann Ferreira2-7/+14
In preparation for resolution of mana-issue: #211. Trivial.
2010-12-06Removed superfluous #includes taken from checkheaders list.Yohann Ferreira40-75/+0
Resolves: Mana-Mantis #265. Trivial fix.
2010-12-06Removed deprecated autotools support.Yohann Ferreira1-513/+0
2010-12-05Add support for tiles with spacingStefan Dombrowski4-7/+10
Now the map from the Mana server's example data is shown properly. Reviewed-by: Jaxad0127
2010-11-29Allow enter OK button key in input field.Andrei Karas3-1/+9
By default OK shortcut is space key. Reviewed-by: Jaxad0127, Kage
2010-11-15Remove the configlistener.h from the file listChuck Miller1-1/+0
Trivial fix
2010-11-13Replace config listeners with the event systemChuck Miller17-165/+92
Reviewed-by: Jared Adams
2010-11-12Change NPC handling in the net codeChuck Miller9-139/+237
Instead of using events to invoke netcode, invoke netcode directly and have it send events Reviewed-by: Freeyorp
2010-11-12Fix item name in floor item popup menu.Andrei Karas1-1/+1
Trivial fix.
2010-11-11Replace Event names with enums instead of stringsChuck Miller34-148/+204
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2025-02-17 05:36:02 +0000