summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2015-04-30Merge pull request #337 from wushin/quest-log-with-bitsWushin15-250/+148
Quest Log example
2015-04-30Merge pull request #346 from mekolat/global-handlerWushin52-328/+298
onlogin & cleanup
2015-04-29Merge pull request #323 from mekolat/xmas-blvlWushin4-15/+4
deprecate gmcommand builtin
2015-04-30use wgm and gmlogmekolat4-14/+3
2015-04-30gmcommand @blvl => set BaseLevelmekolat1-2/+2
2015-04-29Merge pull request #349 from nashley/dialog/gate_guardsWushin1-4/+4
Gate Guards dialog fixes
2015-04-29Merge pull request #331 from mekolat/changesexWushin1-4/+1
remove deprecated changesex
2015-04-29Merge pull request #343 from nashley/childrenWushin1-12/+12
Better dialog for Aisha
2015-04-29Merge pull request #338 from mekolat/emotionWushin8-17/+19
update for new emotion builtin
2015-04-29Merge pull request #333 from mekolat/patch-2Wushin2-17/+0
remove traces of @gm
2015-04-29Merge pull request #345 from nashley/eomieWushin1-25/+24
WIP Eomie dialog
2015-04-29Merge pull request #348 from nashley/ferry_masterWushin1-1/+1
Minor grammar edit
2015-04-29Merge pull request #353 from mekolat/getitemnameWushin9-16/+16
deprecate getitemname and getequipname
2015-04-29Minor grammar editNick Ashley1-1/+1
2015-04-29Merge pull request #347 from mekolat/magical-phallus-of-deathWushin11-886/+493
make magic less ambiguous
2015-04-29Merge pull request #342 from nashley/weellosWushin1-7/+5
Weellos
2015-04-29Merge pull request #344 from nashley/constableWushin1-1/+1
Constable
2015-04-29Merge pull request #350 from nashley/dialog/gossipWushin1-23/+26
Dialog fixes for Gladys
2015-04-27Better dialog for the constable.Nick Ashley1-1/+1
2015-04-26getequipname => getitemlinkmekolat1-2/+2
2015-04-26remove other instances of ClearVariablesmekolat50-165/+47
2015-04-25Quest Log examplewushin15-250/+148
2015-04-25make magic less ambiguousmekolat11-886/+493
2015-04-25Dialog fixes for GladysNick Ashley1-23/+26
2015-04-25Gate Guards dialog fixesNick Ashley1-4/+4
2015-04-24clean clearvarsmekolat1-136/+204
2015-04-24clean global handlermekolat4-45/+65
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-20remove deprecated changesexmekolat1-4/+1
2015-04-20Submodule Updatewushin1-0/+0
2015-04-20Merge pull request #324 from Langerz82/patch-5Wushin1-2/+2
balancing via minimum damage
2015-04-20Merge pull request #326 from nashley/tulim_wizards_dialogWushin2-17/+55
Added some transient dialog to 001-2
2015-04-20Merge pull request #327 from nashley/more_dialog_changesWushin13-213/+251
Various dialog fixes in Tulimshar
2015-04-20Merge pull request #329 from mekolat/fightclubWushin9-69/+18
make the fight club use channels
2015-04-20Various dialog fixes in TulimNick Ashley13-213/+251
viz., the Kylian quest, the tombstones, and various other NPCs
2015-04-20Submodule updatewushin1-0/+0
2015-04-20Merge pull request #334 from mekolat/wellWushin1-0/+0
collision for the new well
2015-04-20Merge pull request #335 from mekolat/029-3-collisionWushin1-0/+0
add missing collision on 029-3
2015-04-20add missing collision on 029-3mekolat1-0/+0
2015-04-19Added some transient dialog to 001-2Nick Ashley2-17/+55
The wizards now ignore you; the display cases have more meaningful descriptions.
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
percentheal, itemheal => heal
2015-04-13Merge pull request #321 from wushin/warp-debug-sprite-removedWushin1-3/+0
Remove warp debug sprite option