Merge remote-tracking branch 'upstream/master'

# Conflicts:
#	game/engines/default/engine/interface/GameTargeting.lua
#	game/modules/tome/data/talents/techniques/combat-techniques.lua

.gitignore

@@ -7,6 +7,10 @@ divx2pass.log
 game/addons/**
 game/dlcs/**
 obj/**
+/lib64
+/t-engine64
+/tmp
+/diff.diff
 out.avi
 out.ogv
 te4_log_web.txt
@@ -17,8 +21,21 @@ game/modules/uaws/
 game/modules/bare_minimum/
 game/modules/bone/
 game/modules/demo/
+game/modules/unused/
 game/modules/particles_editor/
 steam_appid.txt
 oprofile_data/
 game/modules/tome/data/gfx/ts-gfx*
 game/engines/default/modules/boot/data/gfx/ts-gfx*
+debug-recompile.sh
+profiling-recompile.sh
+recompile.sh
+*.exe
+*.dll
+/*.so
+te4_log.txt
+debug.log
+/.idea/
+/*.log
+.vscode
+__autosave__.pc

build/te4core.lua

@@ -37,7 +37,7 @@ project "TEngine"
 	if _OPTIONS.steam then
 		files { "../steamworks/luasteam.c", }
 	end
-	links { "physfs", "lua".._OPTIONS.lua, "fov", "luasocket", "luaprofiler", "lpeg", "tcodimport", "lxp", "expatstatic", "luamd5", "luazlib", "luabitop", "te4-bzip", "te4-wfc" }
+	links { "physfs", "lua".._OPTIONS.lua, "fov", "luasocket", "luaprofiler", "lpeg", "tcodimport", "lxp", "expatstatic", "luamd5", "luazlib", "luabitop", "te4-bzip", "te4-wfc", "utf8proc" }
 	if _OPTIONS.discord then defines { "DISCORD_TE4" } end
 	defines { "_DEFAULT_VIDEOMODE_FLAGS_='SDL_HWSURFACE|SDL_DOUBLEBUF'" }
 	defines { [[TENGINE_HOME_PATH='".t-engine"']], "TE4CORE_VERSION="..TE4CORE_VERSION }
@@ -553,6 +553,14 @@ project "te4-wfc"
 
 	files { "../src/wfc/*.cpp", }
 
+project "utf8proc"
+	kind "StaticLib"
+	language "C"
+	targetname "utf8proc"
+	buildoptions { "-O2" }
+
+	files { "../src/utf8proc/utf8proc.c", }
+
 if _OPTIONS['web-awesomium'] and not _OPTIONS.wincross then
 project "te4-web"
 	kind "SharedLib"

game/engines/default/data/font/packages/default.lua

 -- ToME - Tales of Maj'Eyal
--- Copyright (C) 2009 - 2018 Nicolas Casalini
+-- Copyright (C) 2009 - 2019 Nicolas Casalini
 --
 -- This program is free software: you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as published by
@@ -26,6 +26,10 @@ newPackage{ id = "basic", name = "Basic", weight = 1,
 	bignews = {font="/data/font/VeraMono.ttf", normal=30},
 	resources_normal = {font="/data/font/Vera.ttf", bold=true, normal=12},
 	resources_small = {font="/data/font/Vera.ttf", bold=true, normal=10},
+	classic = {font="/data/font/Vera.ttf", normal=12, small=10, big=14},
+	classic_mono = {font="/data/font/VeraMono.ttf", normal=12, small=10, big=14},
+	insular = {font="/data/font/INSULA__.ttf", normal=14, small=12, big=16},
+	terminal = {font="/data/font/VeraMono.ttf", normal=12, small=10, big=14},
 }
 
 newPackage{ id = "web", name = "Web", weight = 10,
@@ -39,6 +43,10 @@ newPackage{ id = "web", name = "Web", weight = 10,
 	bignews = {font="/data/font/DroidSansMono.ttf", normal=30},
 	resources_normal = {font="/data/font/DroidSans.ttf", bold=true, normal=12},
 	resources_small = {font="/data/font/DroidSans.ttf", bold=true, normal=10},
+	classic = {font="/data/font/USENET_.ttf", normal=16, small=14, big=18},
+	classic_mono = {font="/data/font/SVBasicManual.ttf", normal=14, small=10, big=16},
+	insular = {font="/data/font/INSULA__.ttf", normal=14, small=12, big=16},
+	terminal = {font="/data/font/DroidSansMono.ttf", normal=12, small=10, big=14},
 }
 
 newPackage{ id = "fantasy", name = "Fantasy", weight = 100,
@@ -51,4 +59,24 @@ newPackage{ id = "fantasy", name = "Fantasy", weight = 100,
 	bignews = {font="/data/font/Salsa-Regular.ttf", normal=30},
 	resources_normal = {font="/data/font/Salsa-Regular.ttf", normal=14},
 	resources_small = {font="/data/font/Salsa-Regular.ttf", normal=12},
+	classic = {font="/data/font/USENET_.ttf", normal=16, small=14, big=18},
+	classic_mono = {font="/data/font/SVBasicManual.ttf", normal=14, small=10, big=16},
+	insular = {font="/data/font/INSULA__.ttf", normal=14, small=12, big=16},
+	terminal = {font="/data/font/DroidSansMono.ttf", normal=12, small=10, big=14},
+}
+
+
+newPackage{ id = "chinese", name = "Chinese", weight = 100,
+	small = {font="/data/font/WenQuanYiMicroHei.ttf", normal=12, small=10, big=14},
+	default = {font="/data/font/WenQuanYiMicroHei.ttf", normal=16, small=12, big=18},
+	bold = {font="/data/font/WenQuanYiMicroHei.ttf", normal=16, small=12, big=18},
+	mono = {font="/data/font/WenQuanYiMicroHeiMono.ttf", normal=16, small=12, big=18},
+	mono_small = {font="/data/font/WenQuanYiMicroHeiMono.ttf", normal=14, small=10, big=16},
+	flyer = {font="/data/font/WenQuanYiMicroHei.ttf", normal=14, small=12, big=16},
+	bignews = {font="/data/font/WenQuanYiMicroHei.ttf", normal=30},
+	resources_normal = {font="/data/font/WenQuanYiMicroHei.ttf", normal=16},
+	resources_small = {font="/data/font/WenQuanYiMicroHei.ttf", normal=14},
+	classic = {font="/data/font/WenQuanYiMicroHei.ttf", normal=16, small=14, big=18},
+	classic_mono = {font="/data/font/WenQuanYiMicroHeiMono.ttf", normal=14, small=10, big=16},
+	terminal = {font="/data/font/WenQuanYiMicroHeiMono.ttf", normal=12, small=10, big=14},
 }