summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2013-12-28Merge pull request #64 from wushin/stable-testv2013.12.28wushin1-20/+3
MobManger Timing Fix
2013-12-28Merge pull request #63 from CandyCurt/stable-testwushin9-23/+23
Decrease daily bonus for nutcracker fight.
2013-12-28MobManger Timing Fixwushin1-20/+3
2013-12-28Greenslimes should drop green apples... (Some random Villain)CandyCurt1-1/+1
2013-12-28Fix Christmas AnnualCandyCurt8-22/+22
2013-12-26update submodulev2013.12.26wushin1-0/+0
2013-12-26Merge pull request #62 from wushin/Xmas-Annualwushin62-96/+4026
Annual Xmas Event
2013-12-26Annual Xmas Eventwushin62-96/+4026
2013-12-19Remove generated new from repo and add to post-merge scriptBen Longbons5-947/+4
2013-12-14Change tools/ to a submoduleBen Longbons23-1683/+3
2013-12-09Merge pull request #59 from tux9th/mastertux9th1-30/+34
Fixing labels in 013-2/wizard.txt
2013-12-08Fixing labels in 013-2/wizard.txttux9th1-30/+34
2013-12-07Magic.conf: fixing spells #A14 #A15tux9th1-2/+2
to use the Astral procedure of summon spells.
2013-12-05Update submodule pointer.tux9th1-0/+0
2013-12-04run 'make maps' for client-data changes.tux9th5-4/+4
update submodule pointer. not one of my smoothest job to commit those in seperate commits but I was too stupid to realize that I had the other two client-data commits ready.
2013-12-04run 'make maps' for client-data changes.tux9th6-8/+8
update submodule pointer.
2013-12-03Fix the other Munro checkBen Longbons1-2/+2
2013-12-02run 'make maps' for client-data changes.tux9th2-0/+0
update submodulepointer.
2013-12-02Merge pull request #55 from oddshocks/mastertux9th1-2/+2
Remove quotes around unspoken text from angela. world/map/npc/031-1/angelaOutside.txt
2013-12-02Remove quotes around unspoken text.David Gay1-2/+2
2013-12-02Update submodulev2013.12.02Ben Longbons1-0/+0
2013-12-02Merge pull request #53 from o11c/announceo11c5-12/+13
Make globals show as from their speaker properly
2013-12-02Merge pull request #54 from wushin/gy-fixMadCamel1-1/+1
Fix so Golbenez takes whole map into account
2013-12-02Fix so Golbenez takes whole map into accountwushin1-1/+1
2013-12-01run 'make maps' for client-data changes.tux9th3-0/+0
update submodule pointer.
2013-11-30Fix Munro unequip, debug=2, and Spanish typoBen Longbons3-2/+4
2013-11-30Make globals show as from their speaker properlyBen Longbons5-12/+13
2013-11-30Add news and update client-datav2013.11.30Ben Longbons6-0/+65
2013-11-30Update Spanish translation of the rulesBen Longbons1-8/+8
Thanks to nelson6e65 on the forums.
2013-11-30Merge pull request #51 from tux9th/darko11c1-4/+3
Editing Spell #joyplim
2013-11-27Monsters in graveyard now reset when there are no players presentMadCamel1-0/+16
This helps prevent nerfing and other player-abuses of the map. It's also pretty creepy to walk into an empty graveyard and have a bunch of mobs slowly sneak up on you...
2013-11-24Add missing newlines at end of fileBen Longbons10-10/+10
2013-11-24Fix indenting of item_dbBen Longbons2-17/+21
At some point, 'make indent' needs to be run, but that will cause merge conflicts so I'm not doing it yet.
2013-11-24Fix style and logic of UnequipCBBen Longbons3-16/+13
2013-11-24Merge pull request #45 from wushin/equip-arrow-fixtux9th11-21/+113
Unequip & Multiple Ammo Types and Launcher Fix
2013-11-24Editing Spell #N12:tux9th1-4/+3
Upon using Dark Magic users now call emoticon 5 instead of 3. devil emoticon instead of amiable on.
2013-11-23update submodule pointer.tux9th1-0/+0
2013-11-23Adding new Newsformat {title}, adding title to all news.cinderweb19-6/+63
ran 'make news'
2013-11-23Fix Eomie:cinderweb1-1/+1
giving correct location of Ice Goblins since they have been removed from Tonori.
2013-11-22run 'make maps' for client-data changes.tux9th2-0/+0
update submodule pointer.
2013-10-30remove unequipbyid until unequipcb is merged and don't make quest logic ↵v2013.10.30Ben Longbons2-6/+5
dependent on debug
2013-10-30Fix issues with the way the halloween quest was committedBen Longbons5-3/+23
2013-10-30Fixed Munro NPC. I thought gettime() was based at 0, duhMadCamel2-5/+5
2013-10-30Updated news for Halloween questMadCamel1-0/+8
2013-10-30Merge branch 'master' of github.com:themanaworld/tmwa-server-dataMadCamel0-0/+0
2013-10-30Fixup on halloween scriptMadCamel1-0/+6
2013-10-30Merge pull request #47 from MadCamel/masterMadCamel3-0/+86
Simple annual Halloween event
2013-10-29Simple annual Halloween eventMadCamel3-0/+86
2013-10-25Sling Shot added to starting areawushin3-3/+13
Sling Shot added to NE Tulimshar Market
2013-10-25Multiple Ammo Typeswushin4-10/+54
Added Item SlingShot Added Item SlingBullet Added Const AMMO_NONE, AMMO_BOW, AMMO_SLING Added Function CheckAmmo Added Trigger OnQuequipAmmo to Unequipcb Added Var @AmmoType to Ammo Added Var @LauncherType to Launchers Added File launcher_ammo.txt to scripts Needs TMWA-server commit equip-arrow to work (equip_arrow)