summaryrefslogtreecommitdiff
path: root/src
AgeCommit message (Collapse)AuthorFilesLines
2012-08-06Merge branch 'master' into lpc2012Erik Schilling5-39/+37
Conflicts: src/game-server/item.cpp
2012-08-06Allow monster name in <drop> tagErik Schilling1-3/+17
Reviewed-by: Stefan Beller.
2012-08-05Fixed wrong error raising in lua.cppErik Schilling1-2/+2
Reviewed-by: bjorn.
2012-08-05Removed old warnings and documentation from chr_inv_change.Erik Schilling1-7/+3
This was forgotten to do when dropping the money checks and introducing the checkItem function. Reviewed-by: bjorn.
2012-08-05Fixed the atinit functionErik Schilling2-0/+3
Previously each map had its own scope. They got merged now but the atinit function was forgotten to adapt. Reviewed-by: bjorn.
2012-08-05Fixed recalculation of base attributesErik Schilling1-7/+7
We do not need to calculate derived attributes of the derived attributes but the base of the derived attribute. Reviewed-by: bjorn.
2012-08-05Remove resetEffects; move it to destructor in ItemClass.Stefan Beller2-18/+20
Reviewed-by: bjorn
2012-08-05Cleaned up some world state variable testing codeThorbjørn Lindeijer1-10/+2
Kept the accountserver_startup time for now, since it could be useful. Reviewed-by: Stefan Beller
2012-08-05Fixup segfault at shutdown of gameserver.Stefan Beller1-5/+1
The objects of ItemEffectInfo class, which are hold in mDispells are definitly in mEffects as well, because they are added in in addEffect as the same pointer. Reviewed-by: Erik Schilling
2012-08-05Merge remote-tracking branch 'mainline/master' into lpc2012Stefan Beller2-4/+14
2012-08-05Correct updating the old position of beings.Stefan Beller1-4/+4
Reviewed-by: bjorn acked-by: Ablu
2012-08-04Prevent characters from using specials after deathErik Schilling1-0/+6
Reviewed-by: Stefan Beller.
2012-08-03Fixed dead characters being able to use items.Erik Schilling1-0/+4
Change is tested. Mantis: #492. Reviewed-by: Stefan Beller.
2012-08-03Made the character not colliding with monsters.Erik Schilling1-1/+1
Prevents clientside desyncs. Reviewed-by: Stefan Beller.
2012-08-02Correct further int lengthes.Stefan Beller1-2/+2
Reviewed-by: Ablu.
2012-08-01adjust experience curve.Stefan Beller1-4/+4
2012-08-01Fixed wrong error raising in lua.cppErik Schilling1-2/+2
2012-08-01Fixed removing of unarmed attack when equipping other weaponsErik Schilling1-2/+1
2012-08-01Fixed recalculation of base attributesErik Schilling1-7/+7
2012-08-01Fixed issues with removing attribute modifiersThorbjørn Lindeijer1-4/+5
* AttributeModifiersEffect::remove was not calling updateMod with the 'value' parameter, causing it to have no effect at all for Stackable modifiers. * The cached value of the changed modifier effect was not being recalculated when removing modifiers, because it started one layer too high (there's an inconsistency here: AttributeModifiersEffect::add updates this cached value while AttributeModifiersEffect::remove doesn't).
2012-07-31Fixed reading skill from XML attack nodesThorbjørn Lindeijer1-0/+1
It was forgetting to actually set the Damage::skill member.
2012-07-31Correct further int lengthes.Stefan Beller1-2/+2
2012-07-31Gameserver raise attribute: correct integer size.Stefan Beller1-1/+1
Acked-by: bjorn
2012-07-31Merge remote-tracking branch 'mainline/master' into lpc2012Stefan Beller1-2/+1
2012-07-31Gameserver raise attribute: correct integer size.Stefan Beller1-1/+1
2012-07-31Make Attributes modifiable by client again.Stefan Beller1-1/+2
Reviewed-by: bjorn
2012-07-31Fixed SQL syntax error when updating character pointsThorbjørn Lindeijer1-2/+1
Had a comma too much. Reviewed-by: Stefan Beller Reviewed-by: Erik Schilling
2012-07-31fixup modifiable attribute.Stefan Beller1-3/+2
2012-07-31Make Attributes modifiable by client again.Stefan Beller1-1/+3
2012-07-31[UGLY HACK] allows to prevent sending client information about inventory insertErik Schilling1-1/+7
2012-07-31Removed old warnings from chr_inv_change. They are handeled different nowErik Schilling1-2/+1
2012-07-31Made sure in-inventory trigger is called at pickupErik Schilling1-0/+4
2012-07-31Fix Inventory::getNewEquipItemInstance to yield really unique ids.Stefan Beller1-9/+8
Signed-off-by: Stefan Beller <stefanbeller@googlemail.com> Reviewed-by: Erik Schilling
2012-07-31Fix Inventory::getNewEquipItemInstance to yield really unique ids.Stefan Beller1-9/+8
2012-07-30Hacked away the selection of attributes at char creationErik Schilling1-65/+36
All attributes are set to 5 for now
2012-07-28Made the character not colliding with monsters.Erik Schilling1-1/+1
Prevents clientside desyncs
2012-07-22Merge remote-tracking branch 'origin/master' into lpc2012Erik Schilling3-67/+53
2012-07-21Fixed an error message and inlined some one-linersThorbjørn Lindeijer2-30/+29
2012-07-21Removed raiseScriptErrorThorbjørn Lindeijer3-37/+24
It wasn't really adding anything since errors raised using luaL_error are already logged anyway. Reviewed-by: Erik Schilling
2012-07-17Merge branch 'master' into lpc2012Erik Schilling6-13/+168
Conflicts: src/game-server/character.h
2012-07-17Added lua binds for issuing request of quest variable + bind for trying to ↵Erik Schilling4-13/+134
read them The difference to the old chr_get_quest bind is that this allows querying quest vars from non npc functions as well. Change is tested. Reviewed-by: bjorn.
2012-07-17Added script binds to get full monster anger list + drop anger of monstersErik Schilling2-0/+20
Reviewed-by: bjorn.
2012-07-17Added lua bind to send text effect particle to clientsErik Schilling2-0/+14
Change is tested. Reviewed-by: bjorn.
2012-07-17Fixed resistance calculation not damaging the damage handlingErik Schilling1-1/+1
2012-07-17Made chr_get_level capable of retrieving skill levelsErik Schilling1-3/+12
Reviewed-by: bjorn.
2012-07-17Made chr_get_level capable of retrieving skill levelsErik Schilling1-3/+12
Reviewed-by: bjorn.
2012-07-14Fixed the get_beings_in_rectangle function.Erik Schilling1-1/+2
Previously it only used the rectangle iterator which in fact iterated over the beings in the map zones and returned often way higher number of beings compared to the actual rectangle. Change is tested. Reviewed-by: Bjorn.
2012-07-14Fixed the get_beings_in_rectangle function.Erik Schilling1-1/+2
Previously it only used the rectangle iterator which in fact iterated over the beings in the map zones and returned often way higher number of beings compared to the actual rectangle. Change is tested. Reviewed-by: Bjorn.
2012-07-13Fixed the atinit functionErik Schilling2-0/+3
Previously each map had its own scope. They got merged now but the atinit function was forgotten to adapt.
2012-07-11Fixed small bug in attack core. warmup and cooldown was mixedErik Schilling1-2/+4