summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
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-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
2015-04-04Merge pull request #314 from mekolat/127Wushin24-47/+47
2015-04-03Update chest.txtmeko1-4/+6
2015-04-01Update Italian game rulesScall1-9/+9
2015-03-31Update mob_db_20_39.txtJoshua L1-3/+3
2015-03-31Update mob_db_0_19.txtJoshua L1-2/+2
2015-03-29Update entertainer.txtmeko1-3/+7
2015-03-29Update const.txtmeko1-42/+42
2015-03-26deprecate npc 127mekolat24-47/+47
2015-03-22Updated Spanish translationNelson Martell1-7/+7
2015-03-16minor fixmekolat1-1/+1
2015-03-11client-data submodule commitwushin1-0/+0
2015-03-11Merge pull request #304 from wushin/candor-bank-fixWushin4-0/+0
2015-03-11Merge pull request #305 from mekolat/crasturWushin1-2/+2
2015-03-11Fix more bad Collision IDswushin2-0/+0
2015-03-11move the setter up a notchmekolat1-2/+2
2015-03-11Fix Wrong Collision tileswushin2-0/+0
2015-03-09Merge pull request #301 from mekolat/news-150307v2015.3.10Wushin1-1/+1
2015-03-09fix typomekolat1-1/+1
2015-03-09Merge pull request #299 from mekolat/news-150307Wushin1-0/+17
2015-03-08add news for 2015.03.10mekolat1-0/+17
2015-03-08Client-data submodule updatewushin1-0/+0
2015-03-08Merge pull request #286 from mekolat/illia-idWushin1-12/+14