WolfAdmin: develop/1.2.0 dd5f3ac1

Author Committer Branch Timestamp Parent
Timo Timo develop/1.2.0 2016-09-05 00:40 develop/1.2.0 1f895914
Changeset Merge branch 'feature/standalone' into develop/1.2.0

Conflicts:
    luascripts/commands/admin/help.lua
mod - luascripts/admin/admin.lua Diff File
add - luascripts/commands/admin/admintest.lua Diff File
add - luascripts/commands/admin/finger.lua Diff File
add - luascripts/commands/admin/gib.lua Diff File
mod - luascripts/commands/admin/help.lua Diff File
add - luascripts/commands/admin/kick.lua Diff File
add - luascripts/commands/admin/listplayers.lua Diff File
add - luascripts/commands/admin/nextmap.lua Diff File
add - luascripts/commands/admin/pause.lua Diff File
add - luascripts/commands/admin/put.lua Diff File
add - luascripts/commands/admin/reset.lua Diff File
add - luascripts/commands/admin/restart.lua Diff File
add - luascripts/commands/admin/shuffle.lua Diff File
add - luascripts/commands/admin/slap.lua Diff File
add - luascripts/commands/admin/swap.lua Diff File
add - luascripts/commands/admin/time.lua Diff File
add - luascripts/commands/admin/unpause.lua Diff File
add - luascripts/game/fireteams.lua Diff File