Merge branch 'master' into newlachemist

Conflicts:
	game/modules/tome/data/talents/spells/infusion.lua

COPYING-TILES

-All the tiles of the "shockbolt" tileset, located in all the "gfx/shockbolt" and "gfx/lore"
+All the tiles located in all the "gfx/shockbolt", "gfx/lore" "gfx/achievements"
 folders are granted to use with the Tales of Maj'Eyal game only.
 
 Please contact darkgod@te4.org for more informations.

build/runner.lua

@@ -28,6 +28,10 @@ project "TEngineRunner"
 		links { "dl", "SDL", "SDL_ttf", "SDL_image", "SDL_mixer", "GL", "GLU", "m", "pthread" }
 		defines { [[TENGINE_HOME_PATH='".t-engine"']], 'SELFEXE_LINUX'  }
 
+	configuration "bsd"
+		links { "SDL", "SDL_ttf", "SDL_image", "SDL_mixer", "GL", "GLU", "m", "pthread" }
+		defines { [[TENGINE_HOME_PATH='".t-engine"']], 'SELFEXE_BSD'  }
+
 	configuration "windows"
 		links { "mingw32", "SDLmain", "SDL", "SDL_ttf", "SDL_image", "SDL_mixer", "OPENGL32", "GLU32", "wsock32" }
 		defines { [[TENGINE_HOME_PATH='"T-Engine"']], 'SELFEXE_WINDOWS'  }
@@ -56,6 +60,9 @@ project "te4runner"
 
 	configuration "linux"
 		defines { [[TENGINE_HOME_PATH='".t-engine"']], 'SELFEXE_LINUX'  }
+	configuration "bsd"
+		defines { [[TENGINE_HOME_PATH='".t-engine"']], 'SELFEXE_BSD'  }
+
 	configuration "windows"
 		defines { [[TENGINE_HOME_PATH='"T-Engine"']], 'SELFEXE_WINDOWS'  }
 	configuration "macosx"
@@ -78,6 +85,8 @@ project "runner-physfs"
 
 	configuration "linux"
 		files { "../src/physfs/platform/unix.c", "../src/physfs/platform/posix.c",  }
+	configuration "bsd"
+		files { "../src/physfs/platform/unix.c", "../src/physfs/platform/posix.c",  }
 	configuration "windows"
 		files { "../src/physfs/platform/windows.c",  }
 	configuration "macosx"

build/te4core.lua

@@ -107,6 +107,11 @@ project "TEngine"
 		defines { [[TENGINE_HOME_PATH='".t-engine"']], 'SELFEXE_LINUX' }
 		if steamlin64 then steamlin64() end
 
+	configuration "bsd"
+		libdirs {"/usr/local/lib/"}
+		links { "SDL2", "SDL2_ttf", "SDL2_image", "png", "openal", "vorbisfile", "GL", "GLU", "m", "pthread" }
+		defines { [[TENGINE_HOME_PATH='".t-engine"']], 'SELFEXE_BSD' }
+
 	configuration {"Debug"}
 		postbuildcommands { "cp ../bin/Debug/t-engine ../", }
 	configuration {"Release"}
@@ -130,6 +135,8 @@ project "physfs"
 
 	configuration "linux"
 		files { "../src/physfs/platform/unix.c", "../src/physfs/platform/posix.c",  }
+	configuration "bsd"
+		files { "../src/physfs/platform/unix.c", "../src/physfs/platform/posix.c",  }
 	configuration "windows"
 		files { "../src/physfs/platform/windows.c",  }
 	configuration "macosx"
@@ -295,6 +302,20 @@ elseif _OPTIONS.lua == "jit2" then
 			}
 			end
 
+		configuration "bsd"
+			if not _OPTIONS["no-cleanup-jit2"] then
+			local list = "../src/luajit2/src/lib_base.c ../src/luajit2/src/lib_math.c ../src/luajit2/src/lib_bit.c ../src/luajit2/src/lib_string.c ../src/luajit2/src/lib_table.c ../src/luajit2/src/lib_io.c ../src/luajit2/src/lib_os.c ../src/luajit2/src/lib_package.c ../src/luajit2/src/lib_debug.c ../src/luajit2/src/lib_jit.c ../src/luajit2/src/lib_ffi.c"
+			prebuildcommands{
+				"../src/luajit2/src/buildvm -m elfasm -o ../src/luajit2/src/lj_vm.s",
+				"../src/luajit2/src/buildvm -m bcdef -o ../src/luajit2/src/lj_bcdef.h "..list,
+				"../src/luajit2/src/buildvm -m ffdef -o ../src/luajit2/src/lj_ffdef.h "..list,
+				"../src/luajit2/src/buildvm -m libdef -o ../src/luajit2/src/lj_libdef.h "..list,
+				"../src/luajit2/src/buildvm -m recdef -o ../src/luajit2/src/lj_recdef.h "..list,
+				"../src/luajit2/src/buildvm -m vmdef -o ../src/luajit2/vmdef.lua "..list,
+				"../src/luajit2/src/buildvm -m folddef -o ../src/luajit2/src/lj_folddef.h ../src/luajit2/src/lj_opt_fold.c",
+			}
+			end
+
 		configuration "macosx"
 			local list = "../src/luajit2/src/lib_base.c ../src/luajit2/src/lib_math.c ../src/luajit2/src/lib_bit.c ../src/luajit2/src/lib_string.c ../src/luajit2/src/lib_table.c ../src/luajit2/src/lib_io.c ../src/luajit2/src/lib_os.c ../src/luajit2/src/lib_package.c ../src/luajit2/src/lib_debug.c ../src/luajit2/src/lib_jit.c ../src/luajit2/src/lib_ffi.c"
 			prebuildcommands{

game/engines/default/data/gfx/ui/definitions/default.lua

 -- TE4 - T-Engine 4
--- Copyright (C) 2009, 2010, 2011, 2012, 2013 Nicolas Casalini
+-- Copyright (C) 2009 - 2014 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

game/engines/default/data/keybinds/actions.lua

 -- TE4 - T-Engine 4
--- Copyright (C) 2009, 2010, 2011, 2012 Nicolas Casalini
+-- Copyright (C) 2009 - 2014 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

game/engines/default/data/keybinds/chat.lua

 -- TE4 - T-Engine 4
--- Copyright (C) 2009, 2010, 2011, 2012 Nicolas Casalini
+-- Copyright (C) 2009 - 2014 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

game/engines/default/data/keybinds/debug.lua

 -- TE4 - T-Engine 4
--- Copyright (C) 2009, 2010, 2011, 2012 Nicolas Casalini
+-- Copyright (C) 2009 - 2014 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

game/engines/default/data/keybinds/hotkeys.lua

 -- TE4 - T-Engine 4
--- Copyright (C) 2009, 2010, 2011, 2012 Nicolas Casalini
+-- Copyright (C) 2009 - 2014 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

game/engines/default/data/keybinds/interface.lua

 -- TE4 - T-Engine 4
--- Copyright (C) 2009, 2010, 2011, 2012 Nicolas Casalini
+-- Copyright (C) 2009 - 2014 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

game/engines/default/data/keybinds/inventory.lua

 -- TE4 - T-Engine 4
--- Copyright (C) 2009, 2010, 2011, 2012 Nicolas Casalini
+-- Copyright (C) 2009 - 2014 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

game/engines/default/data/keybinds/move.lua

 -- TE4 - T-Engine 4
--- Copyright (C) 2009, 2010, 2011, 2012 Nicolas Casalini
+-- Copyright (C) 2009 - 2014 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

game/engines/default/engine/Actor.lua

 -- TE4 - T-Engine 4
--- Copyright (C) 2009, 2010, 2011, 2012, 2013 Nicolas Casalini
+-- Copyright (C) 2009 - 2014 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
@@ -245,7 +245,7 @@ end
 
 --- Remove the actor from the level, marking it as dead but not using the death functions
 function _M:disappear(src)
-	if game.level:hasEntity(self) then game.level:removeEntity(self) end
+	if game.level and game.level:hasEntity(self) then game.level:removeEntity(self) end
 	self.dead = true
 	self.changed = true
 end

game/engines/default/engine/ActorsSeenDisplay.lua

 -- TE4 - T-Engine 4
--- Copyright (C) 2009, 2010, 2011, 2012, 2013 Nicolas Casalini
+-- Copyright (C) 2009 - 2014 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

game/engines/default/engine/Astar.lua

 -- TE4 - T-Engine 4
--- Copyright (C) 2009, 2010, 2011, 2012, 2013 Nicolas Casalini
+-- Copyright (C) 2009 - 2014 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

game/engines/default/engine/Autolevel.lua

 -- TE4 - T-Engine 4
--- Copyright (C) 2009, 2010, 2011, 2012, 2013 Nicolas Casalini
+-- Copyright (C) 2009 - 2014 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

game/engines/default/engine/BSP.lua

 -- TE4 - T-Engine 4
--- Copyright (C) 2009, 2010, 2011, 2012, 2013 Nicolas Casalini
+-- Copyright (C) 2009 - 2014 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

game/engines/default/engine/Birther.lua

 -- TE4 - T-Engine 4
--- Copyright (C) 2009, 2010, 2011, 2012, 2013 Nicolas Casalini
+-- Copyright (C) 2009 - 2014 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

game/engines/default/engine/Calendar.lua

 -- TE4 - T-Engine 4
--- Copyright (C) 2009, 2010, 2011, 2012, 2013 Nicolas Casalini
+-- Copyright (C) 2009 - 2014 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

game/engines/default/engine/CharacterBallSave.lua

 -- TE4 - T-Engine 4
--- Copyright (C) 2009, 2010, 2011, 2012, 2013 Nicolas Casalini
+-- Copyright (C) 2009 - 2014 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

game/engines/default/engine/CharacterVaultSave.lua

 -- TE4 - T-Engine 4
--- Copyright (C) 2009, 2010, 2011, 2012, 2013 Nicolas Casalini
+-- Copyright (C) 2009 - 2014 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