summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2013-09-11Add missing close to DirynStefan Dombrowski1-1/+3
2013-09-11Update submodule pointer.tux9th1-0/+0
2013-09-08Fix Waric: replace root with dark crystal.tux9th1-4/+4
2013-09-07Update submodule pointer.tux9th1-0/+0
2013-09-07Addition to Orum's dialog: make easy minigame more clearJessica Tölke1-1/+6
2013-09-06Waric: fix explanation of spelltux9th1-1/+1
2013-09-05Waric: fix freeze issue at Quest State 18tux9th1-1/+1
http://forums.themanaworld.org/viewtopic.php?p=137508#p137508
2013-09-04Add news entry for the upcoming release.v2013.09.04tux9th3-0/+125
2013-09-03Update submodule pointer.tux9th1-0/+0
2013-09-03Dark Magic - Quests:tux9th3-11/+308
* Adjusting Debug-NPC. * added Quests for 3 Spells, QuestStates are documented in the NPC script. * proofread by melkior.
2013-09-02Dark Magic:tux9th3-1/+145
* Adding Dark Magic Skill. * Adding spells made by MisterGrey. * Balancing MrGrey's spells. * Adding an AoE spell. * nerfed light magic for Dark Mages. * Dark Magic spells are queststate dependend. * Commented out spells which will be released at a later date.
2013-08-31item_db: lower sell prices of lazurite{shard,crystal} and heart of lazurite ↵Vincent Petithory1-3/+3
to reasonable amounts
2013-08-30Expand tabs in magic.conf.templateBen Longbons1-65/+65
2013-08-29Merge pull request #27 from cinderweb/mastertux9th1-1/+28
I changed the miners.txt file to make a daily for level 40.
2013-08-29I changed the miners.txt file to make a daily for level 40.cinderweb1-1/+28
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
generated by cgit v1.2.3-60-g2f50 (git 2.42.0) at 2024-07-16 09:45:57 +0000