Merge branch 'master' of git.net-core.org:darkgod/t-engine4

game/engines/default/engine/Entity.lua

game/engines/default/engine/Game.lua

game/engines/default/engine/GameEnergyBased.lua

game/engines/default/engine/Map.lua

game/engines/default/engine/Projectile.lua

game/engines/default/engine/Shader.lua

game/engines/default/engine/Trap.lua

game/engines/default/engine/dialogs/VideoOptions.lua

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

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

...ngines/default/engine/interface/ActorTemporaryEffects.lua

game/engines/default/engine/ui/ImageList.lua

game/engines/default/engine/ui/ListColumns.lua

game/engines/default/engine/utils.lua

game/loader/pre-init.lua

game/modules/tome/ai/escort.lua

game/modules/tome/ai/tactical.lua

game/modules/tome/class/Actor.lua

game/modules/tome/class/FortressPC.lua

game/modules/tome/class/Game.lua