summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2013-07-07Move starting brace of npc scripts to new line.Jessica Tölke9-18/+20
2013-07-07Merge remote-tracking branch 'origin/master' into waricJessica Tölke480-1251/+2527
Conflicts: world/map/db/mob_db.txt
2013-07-07Waric's dialog without spell teaching logic.Jessica Tölke1-2/+89
2013-07-05Canonicalize event label capitalizationBen Longbons21-145/+145
2013-07-05Make fourth word of functions non-empty, to appease the current serverBen Longbons41-70/+70
2013-07-05Move starting brace to new lineBen Longbons422-847/+1426
2013-07-04server side changes to the snow docks addition and related fixesWombat6-24/+10
2013-07-02Add another paramter to gain_xp, allowing removal of spell_indexBen Longbons1-33/+32
2013-07-02Run 'make maps' for collision changes on 043-1, update submodule pointer.Jessica Tölke2-0/+0
2013-06-30Run 'make maps' for collision changes, update submodule pointer.Jessica Tölke2-0/+0
2013-06-29Fix unintended fallthrough in annualeaster script.v2013.06.29.1Jessica Tölke1-0/+1
2013-06-29Add news entry for the upcoming release, update submodule pointer.v2013.06.29Jessica Tölke4-0/+80
2013-06-28Merge pull request #20 from o11c/masterjtoelke10-98/+113
Refactor callfunc and callsub out of if statements
2013-06-28Refactor all calls within an if, which is illegalBen Longbons10-98/+113
2013-06-28Warp Towels: block them from working in Candor or the Yeti battle cave.Jessica Tölke1-0/+130
2013-06-27Typo fixPlaque_fcc1-1/+1
Signed-off-by: Plaque_fcc <Plaque_fcc@github>
2013-06-26Typo fix, reported by Yummiebh281-1/+1
2013-06-26Add an option to disable global timers for debuggingBen Longbons8-1/+10
2013-06-25Run 'make maps' for map changes and update submodule pointer.Jessica Tölke5-6/+6
2013-06-25Small formatting, naming and position fixups on the sewer warp scripts.Jessica Tölke3-25/+22
- The Eastern entrance wasn't directly on the entrance tile - Indentation was too much for some lines - The Labels in all three scripts were named L_SewerNorth, renaming to L_Sewer - Put the Label L_Close directly in the menu instead of below
2013-06-25Modified NPCs scripts for sewer entrances. Fixed sewer_westwushin3-12/+9
2013-06-25Tulimshar Sewer Warp fixwushin3-0/+54
2013-06-21Run 'make maps' for map changes and additions in and around Tulimshar.Jessica Tölke39-82/+278
Updated submodule pointer.
2013-06-21Change id used by the supply chest npc, based on the merge in client-data.Jessica Tölke1-1/+1
2013-06-21New server content to support new caveswushin14-20/+32
Added mobs:Angry Fire Goblin, Angry Sea Slime, Angry Green Slime. Moved NPCs in sandstorm around. Malvox got a house and lives in it now on 002-2 The mines go a layer deeper so the merchant was moved into the camp along with nathan. Naem and Sema moved down with respective maps. Sandstorm_mine_barrier is not mining_camp_barrier
2013-06-20Reenable the MoneyChanger in the casino to sell Casino Coins.Jessica Tölke2-8/+2
Adjust the buy-price of casino coins in item_db to be the same as the sell-price.
2013-06-17run 'make maps' for client data changes.tux9th7-7/+7
update submodule pointer for client data.
2013-06-16Edit Dyrin: Player has to close the NPC dialogue before getting warped. tux9th1-1/+7
2013-06-14run 'make maps' for client-data changes.tux9th2-0/+0
update submodule pointer.
2013-06-14Escape URL strings in news.htmlBen Longbons2-2/+5
2013-06-14Replace Purple Tulip with Pink Tulip.Jessica Tölke1-4/+4
The purple one isn't sold at Blossom and therefore not obtainable.
2013-06-13Flowerpentagram balancing:Jessica Tölke2-2/+1
Increase treshold of monsters that are allowed to be still alive when trying to trigger a new summoning.
2013-06-13Fixing some spelling errors reported by Cassy.Jessica Tölke3-13/+13
2013-06-13Nivalis Transportation Modifications.Jessica Tölke4-7/+22
Frozenbeard is now DOCK_nivalis Diryn teleports player to blue sages. All ferrys now travel to and from each other.
2013-06-12Blossom: Set local variables to 0 before closing.Jessica Tölke1-0/+2
2013-06-11Readd a local news entry; fix IRC link in old newsBen Longbons5-3/+35
2013-06-11Remove some slipped debug lines in Blossom and flowerpentagram5.Jessica Tölke2-3/+1
2013-06-11GM Broadcasts NPC: record and display additional info...Vincent Petithory1-2/+5
Record the name of the GM/Admin who scheduled the broadcast and display it where relevant.
2013-06-10Fix wrong quest values in flowerpentagram4, reported by Cassy.Jessica Tölke1-3/+3
2013-06-10Expand debug function of Orum and Waric quest to tell current quest state.Jessica Tölke2-1/+5
Remove debug message in FlowerPentagramCount function.
2013-06-09Remove requirement for GM cap from announcer scriptJared Adams1-3/+3
Also fix some grammar.
2013-06-10GM broadcasts NPC: add an optional max times to broadcast a messageVincent Petithory1-6/+21
2013-06-10Add a NPC to botcheck area to create scheduled broadcastsVincent Petithory2-0/+157
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