summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2015-04-29Merge pull request #343 from nashley/childrenWushin1-12/+12
2015-04-29Merge pull request #338 from mekolat/emotionWushin8-17/+19
2015-04-29Merge pull request #333 from mekolat/patch-2Wushin2-17/+0
2015-04-29Merge pull request #345 from nashley/eomieWushin1-25/+24
2015-04-29Merge pull request #348 from nashley/ferry_masterWushin1-1/+1
2015-04-29Merge pull request #353 from mekolat/getitemnameWushin9-16/+16
2015-04-29Minor grammar editNick Ashley1-1/+1
2015-04-29Merge pull request #347 from mekolat/magical-phallus-of-deathWushin11-886/+493
2015-04-29Merge pull request #342 from nashley/weellosWushin1-7/+5
2015-04-29Merge pull request #344 from nashley/constableWushin1-1/+1
2015-04-29Merge pull request #350 from nashley/dialog/gossipWushin1-23/+26
2015-04-27Better dialog for the constable.Nick Ashley1-1/+1
2015-04-26getequipname => getitemlinkmekolat1-2/+2
2015-04-25make magic less ambiguousmekolat11-886/+493
2015-04-25Dialog fixes for GladysNick Ashley1-23/+26
2015-04-24WIP Eomie dialogNick Ashley1-25/+24
2015-04-24Better dialog for AishaNick Ashley1-12/+12
2015-04-24Better weellos dialogNick Ashley1-7/+5
2015-04-23getitemname => getitemlinkmekolat8-14/+14
2015-04-23update for new emotion builtinmekolat8-17/+19
2015-04-22Add exprate to atcommand_athena.confwushin1-0/+1
2015-04-20Submodule Updatewushin1-0/+0
2015-04-20Merge pull request #324 from Langerz82/patch-5Wushin1-2/+2
2015-04-20Merge pull request #326 from nashley/tulim_wizards_dialogWushin2-17/+55
2015-04-20Merge pull request #327 from nashley/more_dialog_changesWushin13-213/+251
2015-04-20Merge pull request #329 from mekolat/fightclubWushin9-69/+18
2015-04-20Various dialog fixes in TulimNick Ashley13-213/+251
2015-04-20Submodule updatewushin1-0/+0
2015-04-20Merge pull request #334 from mekolat/wellWushin1-0/+0
2015-04-20Merge pull request #335 from mekolat/029-3-collisionWushin1-0/+0
2015-04-20add missing collision on 029-3mekolat1-0/+0
2015-04-19Added some transient dialog to 001-2Nick Ashley2-17/+55
2015-04-18collision for the new wellmekolat1-0/+0
2015-04-18remove traces of @gmmeko2-17/+0
2015-04-15make the fight club use channelsmekolat9-69/+18
2015-04-13Merge pull request #322 from mekolat/healWushin35-187/+186
2015-04-13Merge pull request #321 from wushin/warp-debug-sprite-removedWushin1-3/+0
2015-04-13Merge pull request #319 from wushin/pvp-conf-changeWushin2-3/+5
2015-04-13Merge pull request #291 from mekolat/emotesWushin2-32/+36
2015-04-09balancing via minimum damageJoshua L1-2/+2
2015-04-07merge percentheal & itemheal into healmekolat35-187/+186
2015-04-05Remove warp debug sprite optionwushin1-3/+0
2015-04-05Added player_pvp_time amount of time inbetween calling @pvpwushin2-3/+5
2015-04-04Submodule Updatewushin1-0/+0
2015-04-04Merge remote-tracking branch 'nelson/patch-1'wushin1-7/+7
2015-04-04Merge pull request #316 from Langerz82/patch-1Wushin1-2/+2
2015-04-04Merge pull request #317 from Langerz82/patch-2Wushin1-3/+3
2015-04-04Merge pull request #320 from mekolat/patch-1Wushin1-4/+6
2015-04-04Merge pull request #318 from mekolat/it-rulesWushin1-9/+9
2015-04-04Merge pull request #306 from mekolat/lora-sorcererWushin1-1/+1
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-12-29 10:36:37 +0000