summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2013-06-09Merge remote-tracking branch 'origin/master' into waricJessica Tölke51-156/+662
Conflicts: world/map/db/item_db.txt
2013-06-09Add mob limit logic to the 5 pentagram spawns too.Jessica Tölke5-1/+93
2013-06-09Add debug npc.Jessica Tölke1-0/+28
2013-06-09Add logic to Blossom to trade Rose Hats against Rose Hats in different colors.Jessica Tölke1-1/+70
2013-06-09Add different colors of the Rose Hat.Jessica Tölke2-2/+7
2013-06-09Update Game Rules:tux9th1-16/+15
* linguistic changes to the german translation. * new spanish translation done by Narus. * new swedish translation done by veryape.
2013-06-08Add a one-line message, since the client ignores the bodyBen Longbons1-1/+1
2013-06-08Rewrite news.phpBen Longbons1-17/+107
* Refactor stuff into functions. * Bump min Mana version to 0.5.1. * Detect old ManaPlus versions also. * Give a 403 Forbidden error to old clients (still sends the body).
2013-06-07Fix Nivalis menhir to behave like the others.Jared Adams1-4/+4
2013-06-07Really fix the random spawn points bugBen Longbons1-2/+2
2013-06-07Add news entry about the upcoming release.v2013.06.07Jessica Tölke3-0/+68
2013-06-07run 'make maps' for client-data changes.tux9th5-14/+14
update submodule pointer for client-data.
2013-06-06update submodule pointer for 015-1tux9th1-0/+0
2013-06-05Make make news dep on news.d's timestamp, not just splatBen Longbons1-1/+1
2013-06-05run 'make maps' for client-data changes.tux9th4-0/+0
update submodule pointer.
2013-06-05Edit: Evil Obelisk 018-3 and Function Evil Obelisktux9th2-29/+49
* Changed monster to areamonster, monsters will now spawn in an area defined * adapted logic * decreased costs
2013-06-04Update submodule pointer for mapfix on 013-1.tux9th1-0/+0
2013-06-03Fixed warppoints in and out of Cindy's cave.tux9th2-2/+2
2013-06-03Fixed the NPC warps to have the same range as normal warps instead of the 3 ↵tux9th7-7/+7
by 3 square.
2013-05-28Update submodule pointer for commits related to the addition of Hetchel.Jessica Tölke1-0/+0
2013-05-27Move id's of summon flowers and rose hat, since 891 is already taken.Jessica Tölke1-6/+6
2013-05-27Amend Orum's script and the flowerpentagrams to use the actual items.Jessica Tölke6-22/+22
2013-05-27Add Rose Hat to item_db.Jessica Tölke1-0/+1
2013-05-27Adding summon flowers.Jessica Tölke1-0/+5
2013-05-27Add flowerpentagram npcs to do the summoning.Jessica Tölke12-0/+567
2013-05-27Add new monster bluepar to mob_db and mob_points function.Jessica Tölke2-2/+4
2013-05-27Add new monsters to mob point function.Jessica Tölke1-5/+6
2013-05-27Add evil woodland monsters:Jessica Tölke1-0/+3
Demonic Mouboo Vicious Squirrel Wicked Mushroom
2013-05-27Hetchel dialog: typo fixbh281-1/+1
2013-05-27fixed dbl quote issuesbh281-22/+22
2013-05-27minor error corrections (see comments)bh281-8/+9
2013-05-27Allowed to buy multiple sheets, Dialogs improvement.bh281-14/+48
2013-05-27replaced wrong "cocoon" by "sheet" in sheet dialogbh281-1/+1
2013-05-27Add NPC Hetchel(376) to 021-1bh282-0/+110
2013-05-27Modify NPC Lora Tay to accept silk sheets (010-2)bh281-3/+55
2013-05-27Add Silksheet(891) to item_dbbh281-0/+1
2013-05-26Run make maps for map changes and npc position changes.Jessica Tölke8-3/+15
Update submodule pointer.
2013-05-26NPC changeswushin11-55/+48
2013-05-24Merge pull request #17 from cody/mastero11c1-13/+13
Some fixes to item_db
2013-05-25Some fixes to item_dbStefan Dombrowski1-13/+13
* Comment out the spear, like in client data * Adjust some prices, so they are not lower than the sell price * The label for BlackWizardHat does not say that it's red anymore * Changing some types from useable to gerneric, since there is no use script
2013-05-17And run make maps after the change of the converter to also update resnametable.Jessica Tölke1-3/+0
2013-05-17Run make maps again to update the warp I removed from 034-2.Jessica Tölke1-1/+0
2013-05-17Make the tmx converter update resnametable.txtBen Longbons4-0/+107
If/when we use static instancing, we'll have to change this.
2013-05-17Run make maps to add 034-2. Submodule pointer updated.Jessica Tölke8-0/+23
2013-05-10Merge remote-tracking branch 'origin/master' into waricJessica Tölke101-2101/+987
2013-05-10Orum and Waric follow-up: Dialogue and logic for fifth flowerJessica Tölke1-1/+205
2013-05-10Orum and Waric follow-up: dialogue and logic for fourth flower.Jessica Tölke1-0/+189
2013-05-10Orum and Waric follow-up: dialogue and logic for third flower.Jessica Tölke1-0/+150
That involves a minigame to prepare the third flower.
2013-05-10Orum and Waric follow-up: dialogue and logic in Orum for second magical flower.Jessica Tölke1-2/+91
2013-05-10Orum and Waric follow-up: Add NPCs Orum and Waric.Jessica Tölke3-0/+189
Initial talk in Waric's script. Logic for the first flower in Orum's script.