summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2015-08-16Submodule Updatewushin1-0/+0
2015-08-02Tools submodule updatewushin1-0/+0
2015-06-29Merge pull request #405 from mekolat/newsv2015.6.30meko1-0/+17
news commit
2015-06-29newsmekolat1-0/+17
2015-06-28Merge pull request #402 from mekolat/charWushin1-0/+20
add new config for char server
2015-06-28Submodule update for client-datawushin1-0/+0
2015-06-28Merge pull request #385 from mekolat/actionsWushin4-2/+24
npc actions & mask in tutorial
2015-06-26npc actions & map mask in tutorialmekolat4-2/+24
2015-06-24Merge pull request #403 from mekolat/npctalkWushin18-89/+90
allow to specify emitter and receiver in npctalk
2015-06-24allow to specify emitter and receiver in npctalkmekolat18-89/+90
2015-06-22Merge pull request #395 from pydsigner/patch-2Wushin3-24/+24
Dialog Fixes
2015-06-22Merge pull request #394 from mekolat/numaWushin2-0/+5
use npc actions and set title in Numa
2015-06-22Merge pull request #330 from mekolat/patch-1Wushin1-1/+1
Make warp towels honor noteleport and nowarp
2015-06-22Merge pull request #397 from mekolat/peetuWushin1-1/+2
add state 12 back to peetu
2015-06-18add new config for char servermekolat1-0/+20
2015-06-04add state 12 back to peetumekolat1-1/+2
2015-06-03Rossy dialog — more fixing of fix fixesDaniel Foerster1-3/+3
2015-06-03Mirak barrier dialog — fix fix fixesDaniel Foerster1-2/+2
2015-06-03Rossy dialog — fix fix fixesDaniel Foerster1-8/+8
2015-06-03Merge pull request #1 from nashley/patch-2-editsDaniel Foerster3-21/+21
Dialog Edit Edits
2015-06-03Dialog Edit EditsNick Ashley3-21/+21
I got a little bit carried away. This reminded me that we should replace `...` with either ` . . . ` or `…` if we want to actually use ellipses. Technically, ellipses also need to be surrounded by spaces.
2015-06-02Mirak barrier message improvementsDaniel Foerster1-2/+2
2015-06-02Peetu dialog fixesDaniel Foerster1-2/+2
2015-06-02Rossy dialog fixesDaniel Foerster1-2/+2
2015-06-02use npc actions and set title in Numamekolat2-0/+5
2015-05-26Update newsv2015.5.26wushin1-0/+6
2015-05-26Merge pull request #389 from wushin/fix-unequipWushin1-3/+1
Remove Unequip from a map
2015-05-26Remove Unequip from a mapwushin1-3/+1
2015-05-23Add newsv2015.5.23.1wushin1-0/+7
2015-05-23Merge pull request #381 from mekolat/patch-3Wushin1-2/+1
Lies!
2015-05-23Merge pull request #383 from pydsigner/patch-1Wushin1-1/+1
Fixed minor Trader bug
2015-05-23Merge pull request #386 from mekolat/patch-2Wushin1-1/+1
add npc name to humantime debugmes
2015-05-23Merge pull request #387 from mekolat/brodomirWushin1-3/+3
fix brodomir timer
2015-05-23Merge pull request #388 from wushin/fix-crashingv2015.5.23Wushin1-12/+0
Fix OnTouch, callfunc, trigger, end starting area bug
2015-05-23Fix OnTouch, callfunc, trigger, end starting area bugwushin1-12/+0
2015-05-22Add Motd back properly to make confwushin1-1/+2
2015-05-22Fix Make confwushin1-2/+1
2015-05-21fix brodomir timermekolat1-3/+3
2015-05-21add npc name to humantime debugmesmeko1-1/+1
2015-05-20Fixed minor Trader bugDaniel Foerster1-1/+1
Changed money check for trading explanation to 2 (actual cost) from 5 (old cost?)
2015-05-18News Updatev2015.5.18wushin1-0/+21
2015-05-18Lies!meko1-2/+1
I didn't make a PR just a minute ago
2015-05-18Merge pull request #380 from mekolat/patch-2Wushin1-0/+5
urgent hotfix
2015-05-18Update helperJanitor.txtmeko1-0/+5
2015-05-18Submodule update for client-datawushin1-0/+0
2015-05-18Merge pull request #365 from mekolat/kaizeiWushin28-368/+221
Kaizei quests
2015-05-17Client-submodule update for GM Revampwushin1-0/+0
2015-05-17Merge pull request #360 from mekolat/debugroomWushin15-268/+352
revamp the GM lounge
2015-05-17Merge pull request #379 from mekolat/close-endWushin30-71/+72
remove end from functions & random fixes
2015-05-13a few fixes/modifications here and theremekolat30-71/+72