summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2011-08-30Made the monster removal not using queues to avoid a crash.Yohann Ferreira1-4/+4
A race condition on the being pointer could happen when the being queue was highly requested. IMHO, using queues to add being but remove them directly is the way to go. Resolves: Mana-Mantis #384
2011-08-30Avoid crashing the game server when the last argument is quoted.Yohann Ferreira1-1/+9
Resolves: Mana-Mantis #386
2011-08-30Merge branch 'equipment-fix'Yohann Ferreira8-19/+88
2011-08-30Synced the equip.xml file to the latest changes.Yohann Ferreira1-10/+29
2011-08-30Made the db version an official pre-requisite.Yohann Ferreira3-7/+14
It was uneasy to not miss something when updating the db. And as the db version is somewhat corresponding to a certain protocol version, adding it in the protocol file sounds relevant to me, and helps when updating it.
2011-08-30Added missing sql update scripts.Yohann Ferreira5-3/+46
2011-08-26Fixed mem leak on the item and monster manager unloading processYohann Ferreira3-3/+11
2011-08-26Rewrote the skill manager the same way as the item manager.Yohann Ferreira3-131/+169
This will permit better handling of both skills names and id. This is needed to start reworking on the auto-attack system.
2011-08-26Added a bit more precision on the conditions used in the ↵Yohann Ferreira2-2/+6
TriggerArea::update() function.
2011-08-26Made the npc_create() function use insertion enqueueing.Yohann Ferreira1-4/+1
As the server was exitting when the insertion was failing anyway, and because the GameState::update() doesn't allow actor insertion while the update process, it was then pretty weird to not use an enqueued insertion for it. Plus, it fixes an assertion failure when scheduling an npc creation. Resolves: Mana-Mantis #360.
2011-08-26Fixed the trigger area declared within map files.Yohann Ferreira2-3/+7
The bug was pretty generic, as the contains() method of the Rectangle class wasn't checking against left and top sides according to the client view point. Resolves: Mana-Mantis #317.
2011-08-25Merge branch 'equipment-fix' of github.com:Bertram25/manaservYohann Ferreira32-1205/+1663
2011-08-25Merge branch 'master' of github.com:mana/manaservYohann Ferreira0-0/+0
2011-08-25Updated specials.xml to better illustrate the features which are currentlyunknown1-3/+4
working and expected by the server to be known by the client. Note: I would like to get rid of specials.xml on the client side and make the gameserver provide all information relevant for the players character at runtime to allow for proceduarally generated specials.
2011-08-25Allowed map names in chr_warp function.Erik Schilling1-2/+6
Resolves: Mana-Mantis #293. Reviewed-by: Bertram.
2011-08-25Created function to make getting monsters easier in scripts.Erik Schilling3-14/+16
2011-08-23Allowed map names in chr_warp function.Erik Schilling1-2/+6
Resolves: Mana-Mantis #293. Reviewed-by: Bertram.
2011-08-19Merge git://gitorious.org/~bertram/mana/manaserv-equipment-fix into ↵Yohann Ferreira22-218/+619
equipment-fix Conflicts: example/serverdata/scripts/maps/desert.lua
2011-08-19Added boots and pants to play with on the test map.Yohann Ferreira13-11/+363
2011-08-19Removed the now useless SpriteLayer enum from the protocol.Yohann Ferreira1-17/+0
2011-08-19Changed the sprite layer protocol to supportYohann Ferreira5-59/+66
an arbitrary number of layers. (up to 255).
2011-08-19Used the client base to make a final bugfix on the server code.Yohann Ferreira10-135/+194
Made the server handle only one slot type requirement since it's irrelevant to have more anyway. Plus, it simplifies the code for both equipping/unequipping. I also added a dagger to show how equipping/unequipping is working.
2011-08-19Created function to make getting monsters easier in scripts.Erik Schilling3-14/+16
2011-08-18Added LUA function for changing anger of monsters.Erik Schilling2-1/+34
You now can change the anger of a monster to a being using mana.monster_change_anger(monster, being, anger) Resolves: Mana-Mantis #366.
2011-08-18Added LUA function for changing anger of monsters.Erik Schilling2-1/+34
You now can change the anger of a monster to a being using mana.monster_change_anger(monster, being, anger) Resolves: Mana-Mantis #366.
2011-08-18Merge git://gitorious.org/~bertram/mana/manaserv-equipment-fix into ↵Yohann Ferreira3-19/+17
equipment-fix
2011-08-18Change the unequip function to make use of the item instance id.Yohann Ferreira3-18/+16
It will make the client capable to tell which item is to be unequipped when there are several item equipped within a slot type, for instance. The client has now yet to be upgraded to follow the new protocol.
2011-08-18Fixed a crash when dealing with unknown equipped items.Yohann Ferreira1-1/+1
2011-08-11Merge branch 'master' of ↵Yohann Ferreira18-1146/+1205
git://gitorious.org/~bertram/mana/manaserv-equipment-fix into equipment-fix Conflicts: src/common/manaserv_protocol.h
2011-08-11Basically redid equip and unequip functions().Yohann Ferreira4-156/+270
I made the system handle the fact that equipment item are completely unlinked to the inventory items. Equip items now have a unique itemInstance number permitting to equip the same item type multiple time when the slot capacity is wide enough to do so. I also prepared the functions to welcome in the near tests against scripted equipment. The equip process is known to be working server-side but the unequip process has yet to be reviewed, even if implemented.
2011-08-10Changed ItemEquipInfo to only be a pair of unsigned.Yohann Ferreira3-14/+12
Previously it was a list of pair ofunsigned int, used to get the equipment slot requirements. It didn't make sense as the ItemEquipsInfo was already a list of it. So you had to manage with a list of list and that ended up being irrelevant to the need. I had to disable the equip function to permit compilation. This will be fixed in my next commit.
2011-08-10Fixed getting slot id per name.Yohann Ferreira2-6/+20
2011-08-10login with random hashStefan Beller3-3/+66
The account server sends out a random number, which is additionally used for hashing the password. Reviewed by Bertram
2011-08-10README: add section for inital db setupStefan Beller1-2/+12
2011-08-10Made chr_inv_count and npc_trade capable of taking a name or an id.Erik Schilling2-6/+40
Resolves: Mana-Mantis #318. Reviewed-by: Bertram.
2011-08-04Change the changeEquipment() function nameYohann Ferreira2-7/+7
to something more meaningful.
2011-08-04Merge branch 'master' of git://gitorious.org/mana/manaservYohann Ferreira2-28/+101
2011-08-04Added new LUA functions used to get items and monster names.Erik Schilling1-0/+37
mana.monster_get_name(id) and mana.item_get_name(id) can be used to get the name of an item or a monster if only an id is given. Reviewed-by: Bertram.
2011-08-04Allowed names of items and monsters in scripts - part 1.Erik Schilling2-28/+64
You can now use either the name or the id of the item in the LUA functions chr_inv_change, monster_create, item_drop. Part of: Mana-Mantis #318. Reviewed-by: Bertram.
2011-08-04Merge branch 'master' of git://gitorious.org/mana/manaservYohann Ferreira4-167/+293
2011-08-03Unified the lua.cpp documentation.Yohann Ferreira3-170/+208
I also changed the chatmessage function to chat_message to follow the coding standard.
2011-08-03Added is_walkable lua function.Erik Schilling1-0/+30
mana.is_walkable(x, y) can now be used to check wether the pixel on the current map is walkable or not. Reviewed-by: Bertram.
2011-08-03Added monster_remove lua function.Erik Schilling2-0/+34
mana.monster_remove(monster) can now be used to remove a monster from a map. Resolves: Mana-Mantis #352. Reviewed-by: Bertram.
2011-08-03Added get_map_property lua function.Erik Schilling1-0/+24
mana.get_map_prpoperty(string) can now be used to read a property from a map file. String is the property name. Resolves: Mana-Mantis #353. Reviewed-by: Bertram.
2011-07-27Reworked the way equip slot info are loaded in a more logical way.Yohann Ferreira5-79/+99
2011-07-27Reviewed the removeFromSlot() function, fixing the unequip triggerYohann Ferreira1-5/+16
2011-07-27Fixed and completed the move() function.Yohann Ferreira2-22/+70
Moving and splitting items in the inventory window should be much more responsive now.
2011-07-27Reviewed the Inventory::remove() function.Yohann Ferreira2-9/+17
The unecessary equipment check was already removed, but the now useless force parameter is now also removed.
2011-07-27Reviewed the Inventory::insertion function.Yohann Ferreira1-5/+16
2011-07-27Finished the inventory check, by dropping itemsYohann Ferreira1-3/+19
in oversized inventories.