summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2013-08-29Merge pull request #26 from DinoPaskvan/masterVincent Petithory1-1/+1
Small indentation fix on NPC Jack
2013-08-29Small indentation fix on NPC JackDino Paskvan1-1/+1
2013-08-27Pad names with _ instead of = to make it easier to detect merge conflictsBen Longbons1-34/+34
2013-08-27fixed item_db.txt for HEAD of TMWAwushin1-14/+13
Removed first line sed %s/\ ,\ /0,\ /g to fix empty values by ,
2013-08-26Illia: adjust the alloted times after completing each stepVincent Petithory8-10/+10
2013-08-26Updated submodule pointer.tux9th1-0/+0
2013-08-25Merge remote-tracking branch 'origin/master' into waricJessica Tölke89-1156/+1180
Conflicts: world/map/db/item_db.txt
2013-08-22run 'make maps' for client-data changes.tux9th2-0/+0
update submodule pointer.
2013-08-20Put Cindy messages in an array and use announcement formattingBen Longbons1-42/+22
2013-08-19Give every NPC a unique nameBen Longbons37-82/+83
2013-08-19Move storage option to top of bankerBen Longbons1-1/+1
As suggested by Dyna.
2013-08-19Trivial removal of some trailing whitespace that snuck inBen Longbons3-11/+11
2013-08-18update submodule pointer.tux9th1-0/+0
2013-08-17update submodule pointer.tux9th1-0/+0
2013-08-14Merge pull request #21 from DinoPaskvan/masterJared Adams1-3/+29
Added the daily quest for NPC Jack Approved by wombatism.
2013-08-14Merge pull request #22 from tux9th/masterJared Adams1-1/+4
Miriam Heavy metal items additions: Approved by wombatism.
2013-08-14Miriam Heavy metal items additions:tux9th1-1/+4
Adding Warlord Boots, Light Platemail and Candle Helmet to the Heavy armor list.
2013-08-12Fix alignment and comment prefix in mob_dbBen Longbons1-4/+4
2013-08-13Added the daily quest for NPC Jack, written by skragarDino Paskvan1-3/+29
Fixes for NPC Jack As suggested by o11c. Fixed indentation
2013-07-24Remove a couple of spaces and fix one case error in shopsBen Longbons1-2/+2
When I rewrote the code for the shop parser, it was much simpler to change these two NPCs than try to preserve the exact parsing behavior. The item case error, on the other hand, was just plain wrong.
2013-07-24Truncate item names to what the server actually seesBen Longbons2-179/+180
This is far from optimal, but the server was already doing it silently, and the new server now rejects it. Also make magic.conf use an item name, since previously it was (correctly) rejecting the item name as nonexistent and was using an ID instead.
2013-07-23Fix some casing and spacing issuesBen Longbons3-8/+8
2013-07-23Use canonical separator for mapflagsBen Longbons24-33/+33
2013-07-23Switch supposed comments to actually use the comment prefixBen Longbons1-34/+34
2013-07-15Merge pull request #1 from DinoPaskvan/waricjtoelke10-201/+201
Orum and Waric quest proofreading and editing All the NPCs involved in the quest have been edited, with help from Dyna.
2013-07-15Allow specifying warps in terms of tiles instead of pixelswushin1-1/+13
This interprets properties dest_tile_[xy] instead of dest_[xy]. Accepts both formats, but errors if there is a combination.
2013-07-15Returned the mistakenly removed newline at the end of waric.txtDino Paskvan1-1/+1
2013-07-15Orum and Waric quest proofreading and editingDino Paskvan10-202/+202
All the NPCs involved in the quest have been edited, with help from Dyna.
2013-07-13run 'make maps' for client-data changes.tux9th2-0/+0
update submodule pointer.
2013-07-11Kill some tabsBen Longbons4-50/+50
2013-07-10Replace implict 0 in empty CSV fields with explicit 0Ben Longbons4-896/+896
2013-07-07Canonicalize case of items, which will soon be strictBen Longbons7-19/+19
2013-07-08run 'make maps' for client-data changestux9th2-0/+0
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