Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

T

TMW Serverdata
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

5875fec0

Commit 5875fec0 authored 4 years ago by Micksha

Downloads
- Plain Diff

Merge branch 'jesusalva/AFK' into 'master'

AFKing System

Closes evol-all#108

See merge request evol/serverdata!267

parents 39536b47 dbde28d5

No related branches found

No related tags found

No related merge requests found

Changes 13

Hide whitespace changes

Inline Side-by-side

Showing

conf/map/battle/status.conf 4 additions, 4 deletions

conf/map/battle/status.conf
db/constants.conf 5 additions, 0 deletions

db/constants.conf
db/re/item_db.conf 4 additions, 10 deletions

db/re/item_db.conf
db/sc_config.conf 7 additions, 0 deletions

db/sc_config.conf
npc/001-2-28/note.txt 20 additions, 2 deletions

npc/001-2-28/note.txt
npc/008-2-2/ledmitz.txt 1 addition, 18 deletions

npc/008-2-2/ledmitz.txt
npc/008-2-2/note.txt 15 additions, 8 deletions

npc/008-2-2/note.txt
npc/functions/afk.txt 69 additions, 0 deletions

npc/functions/afk.txt
npc/functions/global_event_handler.txt 1 addition, 0 deletions

npc/functions/global_event_handler.txt
npc/functions/main.txt 25 additions, 0 deletions

npc/functions/main.txt
npc/functions/scoreboards.txt 23 additions, 0 deletions

npc/functions/scoreboards.txt
npc/functions/util.txt 0 additions, 5 deletions

npc/functions/util.txt
npc/scripts.conf 1 addition, 0 deletions

npc/scripts.conf

with 175 additions and 47 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment