WolfAdmin: develop/1.2.0 a02f9337

Diff Back to Repository
Author Committer Branch Timestamp Parent
Timo Timo develop/1.2.0 2016-08-30 00:22 develop/1.2.0 0640c4bc
Changeset Merge branch 'feature/auth' into feature/standalone

Conflicts:
    luascripts/commands/admin/help.lua
add - luascripts/auth/acl.lua Diff File
add - luascripts/auth/auth.lua Diff File
add - luascripts/auth/shrubbot.lua Diff File
mod - luascripts/commands/admin/balance.lua Diff File
mod - luascripts/commands/admin/dewarn.lua Diff File
mod - luascripts/commands/admin/enablevote.lua Diff File
mod - luascripts/commands/admin/greeting.lua Diff File
mod - luascripts/commands/admin/help.lua Diff File
mod - luascripts/commands/admin/incognito.lua Diff File
mod - luascripts/commands/admin/kickbots.lua Diff File
mod - luascripts/commands/admin/listaliases.lua Diff File
mod - luascripts/commands/admin/listlevels.lua Diff File
mod - luascripts/commands/admin/listmaps.lua Diff File
mod - luascripts/commands/admin/lock.lua Diff File
mod - luascripts/commands/admin/needbots.lua Diff File
mod - luascripts/commands/admin/plock.lua Diff File
mod - luascripts/commands/admin/punlock.lua Diff File
mod - luascripts/commands/admin/putbots.lua Diff File
mod - luascripts/commands/admin/readconfig.lua Diff File
mod - luascripts/commands/admin/resetsprees.lua Diff File
mod - luascripts/commands/admin/rules.lua Diff File
mod - luascripts/commands/admin/setlevel.lua Diff File
mod - luascripts/commands/admin/showwarns.lua Diff File
mod - luascripts/commands/admin/sprees.lua Diff File
mod - luascripts/commands/admin/stats.lua Diff File
mod - luascripts/commands/admin/unlock.lua Diff File
mod - luascripts/commands/admin/vmute.lua Diff File
mod - luascripts/commands/admin/vunmute.lua Diff File
mod - luascripts/commands/admin/warn.lua Diff File
mod - luascripts/commands/client/ac.lua Diff File
mod - luascripts/commands/client/pm.lua Diff File
mod - luascripts/commands/client/r.lua Diff File
mod - luascripts/commands/client/wolfadmin.lua Diff File
mod - luascripts/commands/commands.lua Diff File
mod - luascripts/game/voting.lua Diff File
mod - luascripts/players/greetings.lua Diff File