Merge branch 'master' into MiscScalingUpdates

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

game/modules/tome/class/Actor.lua

game/modules/tome/class/Game.lua

game/modules/tome/class/GameState.lua

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

game/modules/tome/data/chats/escort-quest.lua

game/modules/tome/data/damage_types.lua

.../modules/tome/data/gfx/particles_images/diffuse_point.png

game/modules/tome/data/gfx/quest-escort-ui/dialogframe_1.png

...ules/tome/data/gfx/quest-escort-ui/dialogframe_2_left.png

...es/tome/data/gfx/quest-escort-ui/dialogframe_2_middle.png

...les/tome/data/gfx/quest-escort-ui/dialogframe_2_right.png

game/modules/tome/data/gfx/quest-escort-ui/dialogframe_3.png

game/modules/tome/data/gfx/quest-escort-ui/dialogframe_4.png

game/modules/tome/data/gfx/quest-escort-ui/dialogframe_5.png

game/modules/tome/data/gfx/quest-escort-ui/dialogframe_6.png

game/modules/tome/data/gfx/quest-escort-ui/dialogframe_7.png

...ules/tome/data/gfx/quest-escort-ui/dialogframe_8_left.png

...es/tome/data/gfx/quest-escort-ui/dialogframe_8_middle.png

...les/tome/data/gfx/quest-escort-ui/dialogframe_8_right.png