Merge branch 'master' into console-widget

This commit is contained in:
Jérôme Leclercq
2018-04-12 12:47:17 +02:00
1058 changed files with 145127 additions and 7192 deletions

View File

@@ -1,6 +1,6 @@
// Copyright (C) 2017 Jérôme Leclercq
// This file is part of the "Nazara Development Kit"
// For conditions of distribution and use, see copyright notice in Prerequesites.hpp
// For conditions of distribution and use, see copyright notice in Prerequisites.hpp
#pragma once
@@ -12,7 +12,6 @@
#include <Nazara/Core/ObjectHandle.hpp>
#include <Nazara/Graphics/Sprite.hpp>
#include <Nazara/Graphics/TextSprite.hpp>
#include <Nazara/Platform/Event.hpp>
#include <Nazara/Utility/Node.hpp>
#include <Nazara/Utility/SimpleTextDrawer.hpp>
#include <NDK/BaseWidget.hpp>
@@ -21,6 +20,7 @@
namespace Nz
{
class LuaState;
struct WindowEvent;
}
namespace Ndk