Merge remote-tracking branch 'upstream/master' into i18n

.gitignore

game/engines/default/data/font/HigashiOme-Gothic-C.ttf

game/engines/default/data/locales/engine/ja_JP.lua

game/engines/default/data/locales/engine/ko_KR.lua

game/engines/default/data/locales/engine/zh_hans.lua

game/engines/default/engine/Map.lua

game/engines/default/engine/interface/ActorTalents.lua

game/engines/default/engine/interface/GameTargeting.lua

game/modules/tome/class/Actor.lua

game/modules/tome/class/Game.lua

game/modules/tome/class/interface/Combat.lua

game/modules/tome/data/achievements/kills.lua

game/modules/tome/data/achievements/talents.lua

game/modules/tome/data/birth/classes/mage.lua

game/modules/tome/data/birth/classes/warrior.lua

game/modules/tome/data/damage_types.lua

game/modules/tome/data/general/npcs/horror.lua

game/modules/tome/data/general/npcs/orc-rak-shor.lua

game/modules/tome/data/general/npcs/vampire.lua

game/modules/tome/data/general/npcs/xorn.lua