Merge remote-tracking branch 'remotes/fortressforever/feature/kill-assists'

Conflicts:
	resource/FortressForever_english.txt
This commit is contained in:
Mike Parker 2016-09-04 23:39:11 +01:00
commit 61f1ce7d5b
2 changed files with 1 additions and 0 deletions

Binary file not shown.

View file

@ -40,6 +40,7 @@
"attacker" "short"
"weapon" "string" // weapon name killer used
"damagetype" "long" // damage type
"killassister" "short"
"killersglevel" "short"
}