Skip to content

Version-0.1.4

Version-0.1.4: Merge branch 'development'
@omidshahbazi omidshahbazi tagged this 11 Sep 05:48 
# Conflicts:
#	Engine/Binaries/ASCIISerializerManaged.dll
#	Engine/Binaries/CommonManaged.dll
#	Engine/Binaries/Frontend.exe
#	Engine/Frontend/Frontend.csproj
#	Engine/Frontend/Libraries/ASCIISerializerManaged.dll
#	Engine/Frontend/Libraries/CommonManaged.dll
#	Engine/Frontend/ModuleRules.cs
#	Engine/Source/Programs/ReflectionTool/HeaderParser.cpp
#	Engine/Source/Runtime/Common/Common.ModuleRules.cs
#	Engine/Source/Runtime/GameObjectSystem/Data/DataContainer.h
#	Engine/Source/Runtime/GameObjectSystem/Data/TransformDataManager.h
#	Engine/Source/Runtime/MathContainers/MathContainers.Rules.cs
#	Engine/Source/Runtime/MathContainers/MathContainers.h
#	Engine/Source/Runtime/MathContainers/Matrix4.h
#	Engine/Source/Runtime/MathContainers/Vector2.h
#	Engine/Source/Runtime/MathContainers/Vector3.h
#	Engine/Source/Runtime/MathContainers/Vector4.h
#	Engine/Source/Runtime/Mathematics/Definitions.h
#	Engine/Source/Runtime/Profiler/Profiler.ModuleRules.cs
#	Engine/Source/Runtime/Reflection/FunctionType.h
#	Engine/Source/Runtime/Reflection/Private/ImplementEnumType.cpp
#	Engine/Source/Runtime/Reflection/Private/ImplementFunctionType.cpp
#	Engine/Source/Runtime/Reflection/Private/ImplementPropertyType.cpp
#	Engine/Source/Runtime/Utility/EntryPointUtility/ArgumentParser.cpp
#	Engine/Source/Runtime/Utility/TimeUtility/HighResolutionTime.cpp
#	Engine/Source/Runtime/Utility/TimeUtility/Timer.cpp
#	Engine/Source/Runtime/WrapperTool/HeaderParser.cpp
#	Engine/Source/Runtime/WrapperTool/HeaderParser.h
#	Engine/Source/Runtime/WrapperTool/Main.cpp
#	Engine/Source/Runtime/WrapperTool/WrapperGenerator.cpp
#	Engine/Source/Runtime/WrapperTool/WrapperGenerator.h
#	Engine/Source/Runtime/WrapperTool/WrapperTool.Rules.cs
#	Engine/Source/Test/TestParallelizing/TestParallelizing.ModuleRules.cs
#	Engine/Source/ThirdParty/FreeType/FreeType.ModuleRules.cs
#	Engine/Source/ThirdParty/GLEW/GLEW.ModuleRules.cs
#	Engine/Source/ThirdParty/STB/STB.ModuleRules.cs
#	README.md
#	SourceCode/Engine/CreateProjectFile.bat
#	SourceCode/Engine/Engine/Common/Mathematics.cpp
#	SourceCode/Engine/Engine/Containers/AnyDataType.h
#	SourceCode/Engine/Engine/Containers/Containers.Rules.cs
#	SourceCode/Engine/Engine/Containers/DynamicString.h
#	SourceCode/Engine/Engine/Containers/List.h
#	SourceCode/Engine/Engine/Containers/Pair.h
#	SourceCode/Engine/Engine/Containers/Private/ContainersAllocators.cpp
#	SourceCode/Engine/Engine/Containers/Private/ContainersAllocators.h
#	SourceCode/Engine/Engine/Containers/Stack.h
#	SourceCode/Engine/Engine/Containers/StringStream.h
#	SourceCode/Engine/Engine/Containers/ThreadSafeQueue.h
#	SourceCode/Engine/Engine/Containers/Vector.h
#	SourceCode/Engine/Engine/CoreSystem/Core.cpp
#	SourceCode/Engine/Engine/CoreSystem/Core.h
#	SourceCode/Engine/Engine/CoreSystem/CoreSystem.Rules.cs
#	SourceCode/Engine/Engine/CoreSystem/Private/CoreSystemAllocators.cpp
#	SourceCode/Engine/Engine/CoreSystem/Private/CoreSystemAllocators.h
#	SourceCode/Engine/Engine/Debugging/Debug.cpp
#	SourceCode/Engine/Engine/FontGenerator/FontGenerator.Rules.cs
#	SourceCode/Engine/Engine/FontGenerator/Main.cpp
#	SourceCode/Engine/Engine/FontSystem/Font.cpp
#	SourceCode/Engine/Engine/FontSystem/Font.h
#	SourceCode/Engine/Engine/FontSystem/FontGenerator.h
#	SourceCode/Engine/Engine/FontSystem/FontManager.cpp
#	SourceCode/Engine/Engine/FontSystem/FontSystem.Rules.cs
#	SourceCode/Engine/Engine/FontSystem/Private/FontSystemAllocators.cpp
#	SourceCode/Engine/Engine/FontSystem/Private/FontSystemAllocators.h
#	SourceCode/Engine/Engine/GameObjectSystem/Data/LightDataManager.cpp
#	SourceCode/Engine/Engine/GameObjectSystem/Data/RendererDataManager.cpp
#	SourceCode/Engine/Engine/GameObjectSystem/Data/TextRendererDataManager.cpp
#	SourceCode/Engine/Engine/GameObjectSystem/Data/TransformDataManager.cpp
#	SourceCode/Engine/Engine/GameObjectSystem/GameObjectSystem.Rules.cs
#	SourceCode/Engine/Engine/GameObjectSystem/Private/GameObjectSystemAllocators.cpp
#	SourceCode/Engine/Engine/GameObjectSystem/Transform.cpp
#	SourceCode/Engine/Engine/InputSystem/InputManager.cpp
#	SourceCode/Engine/Engine/InputSystem/InputSystem.Rules.cs
#	SourceCode/Engine/Engine/InputSystem/Private/InputSystemAllocators.cpp
#	SourceCode/Engine/Engine/InputSystem/Private/InputSystemAllocators.h
#	SourceCode/Engine/Engine/InputSystem/Private/KeyboardWrapper.cpp
#	SourceCode/Engine/Engine/MemoryManagement/Allocator/AllocatorBase.h
#	SourceCode/Engine/Engine/MemoryManagement/Allocator/CustomAllocator.cpp
#	SourceCode/Engine/Engine/MemoryManagement/Allocator/CustomAllocator.h
#	SourceCode/Engine/Engine/MemoryManagement/Allocator/DefaultAllocator.cpp
#	SourceCode/Engine/Engine/MemoryManagement/Allocator/DefaultAllocator.h
#	SourceCode/Engine/Engine/MemoryManagement/Allocator/DynamicSizeAllocator.cpp
#	SourceCode/Engine/Engine/MemoryManagement/Allocator/FrameAllocator.cpp
#	SourceCode/Engine/Engine/MemoryManagement/Allocator/FrameAllocator.h
#	SourceCode/Engine/Engine/MemoryManagement/Allocator/Private/Instantiation.cpp
#	SourceCode/Engine/Engine/MemoryManagement/MemoryManagement.Rules.cs
#	SourceCode/Engine/Engine/MemoryManagement/Singleton.h
#	SourceCode/Engine/Engine/Networking/Address.h
#	SourceCode/Engine/Engine/Networking/Connection.cpp
#	SourceCode/Engine/Engine/Networking/Connection.h
#	SourceCode/Engine/Engine/Networking/ConnectionBase.cpp
#	SourceCode/Engine/Engine/Networking/ConnectionBase.h
#	SourceCode/Engine/Engine/Networking/ConnectionProtocol.h
#	SourceCode/Engine/Engine/Networking/NetworkManager.cpp
#	SourceCode/Engine/Engine/Networking/NetworkManager.h
#	SourceCode/Engine/Engine/Networking/Networking.Rules.cs
#	SourceCode/Engine/Engine/Networking/ReliableConnection.cpp
#	SourceCode/Engine/Engine/Networking/ReliableConnection.h
#	SourceCode/Engine/Engine/Networking/ServerConnection.cpp
#	SourceCode/Engine/Engine/Networking/ServerConnection.h
#	SourceCode/Engine/Engine/Networking/Socket.cpp
#	SourceCode/Engine/Engine/Networking/Socket.h
#	SourceCode/Engine/Engine/Parallelizing/JobInfo.h
#	SourceCode/Engine/Engine/Parallelizing/JobManager.cpp
#	SourceCode/Engine/Engine/Parallelizing/JobManager.h
#	SourceCode/Engine/Engine/Parallelizing/Parallelizing.Rules.cs
#	SourceCode/Engine/Engine/Parallelizing/Private/MainFiberWorkerArguments.h
#	SourceCode/Engine/Engine/Parallelizing/Private/ParallelizingAllocators.cpp
#	SourceCode/Engine/Engine/Parallelizing/Private/ParallelizingAllocators.h
#	SourceCode/Engine/Engine/Parallelizing/Private/ThreadWorkerArguments.h
#	SourceCode/Engine/Engine/Parallelizing/Task.h
#	SourceCode/Engine/Engine/Platform/Platform.Rules.cs
#	SourceCode/Engine/Engine/Platform/PlatformFiber.Windows.cpp
#	SourceCode/Engine/Engine/Platform/PlatformFiber.h
#	SourceCode/Engine/Engine/Platform/PlatformInput.Windows.cpp
#	SourceCode/Engine/Engine/Platform/PlatformInput.h
#	SourceCode/Engine/Engine/Platform/PlatformMemory.cpp
#	SourceCode/Engine/Engine/Platform/PlatformNetwork.Windows.cpp
#	SourceCode/Engine/Engine/Platform/PlatformNetwork.h
#	SourceCode/Engine/Engine/Platform/PlatformOS.Windows.cpp
#	SourceCode/Engine/Engine/Platform/PlatformOS.h
#	SourceCode/Engine/Engine/Platform/PlatformThread.Windows.cpp
#	SourceCode/Engine/Engine/Platform/PlatformThread.h
#	SourceCode/Engine/Engine/Platform/PlatformWindow.Windows.cpp
#	SourceCode/Engine/Engine/Platform/PlatformWindow.h
#	SourceCode/Engine/Engine/Profiler/Private/ProfilerAllocators.cpp
#	SourceCode/Engine/Engine/Profiler/Private/ProfilerAllocators.h
#	SourceCode/Engine/Engine/Reflection/DataStructureType.cpp
#	SourceCode/Engine/Engine/Reflection/DataStructureType.h
#	SourceCode/Engine/Engine/Reflection/Enum.cpp
#	SourceCode/Engine/Engine/Reflection/Private/ImplementDataStructureType.cpp
#	SourceCode/Engine/Engine/Reflection/Private/ImplementDataStructureType.h
#	SourceCode/Engine/Engine/Reflection/Private/RuntimeImplementation.cpp
#	SourceCode/Engine/Engine/Reflection/Private/RuntimeImplementation.h
#	SourceCode/Engine/Engine/Reflection/Reflection.Rules.cs
#	SourceCode/Engine/Engine/Reflection/Runtime.cpp
#	SourceCode/Engine/Engine/Reflection/Runtime.h
#	SourceCode/Engine/Engine/Reflection/Type.cpp
#	SourceCode/Engine/Engine/ReflectionTool/CodePageParser.h
#	SourceCode/Engine/Engine/ReflectionTool/Main.cpp
#	SourceCode/Engine/Engine/ReflectionTool/MetaDataStructure.h
#	SourceCode/Engine/Engine/ReflectionTool/ReflectionGenerator.cpp
#	SourceCode/Engine/Engine/ReflectionTool/ReflectionTool.Rules.cs
#	SourceCode/Engine/Engine/Rendering/Color.h
#	SourceCode/Engine/Engine/Rendering/DataType.h
#	SourceCode/Engine/Engine/Rendering/DeviceInterface.cpp
#	SourceCode/Engine/Engine/Rendering/DeviceInterface.h
#	SourceCode/Engine/Engine/Rendering/GPUBuffer.h
#	SourceCode/Engine/Engine/Rendering/IDevice.h
#	SourceCode/Engine/Engine/Rendering/Material.h
#	SourceCode/Engine/Engine/Rendering/Mesh.h
#	SourceCode/Engine/Engine/Rendering/MeshInfo.cpp
#	SourceCode/Engine/Engine/Rendering/MeshInfo.h
#	SourceCode/Engine/Engine/Rendering/NativeType.h
#	SourceCode/Engine/Engine/Rendering/Pass.cpp
#	SourceCode/Engine/Engine/Rendering/Pass.h
#	SourceCode/Engine/Engine/Rendering/Private/Commands/ClearCommand.cpp
#	SourceCode/Engine/Engine/Rendering/Private/Commands/ClearCommand.h
#	SourceCode/Engine/Engine/Rendering/Private/Commands/CommandBase.h
#	SourceCode/Engine/Engine/Rendering/Private/Commands/DrawCommand.cpp
#	SourceCode/Engine/Engine/Rendering/Private/Commands/DrawCommand.h
#	SourceCode/Engine/Engine/Rendering/Private/Commands/SwitchRenderTargetCommand.cpp
#	SourceCode/Engine/Engine/Rendering/Private/OpenGL/OpenGLDevice.cpp
#	SourceCode/Engine/Engine/Rendering/Private/OpenGL/OpenGLDevice.h
#	SourceCode/Engine/Engine/Rendering/Private/Pipeline/DeferredRendering.cpp
#	SourceCode/Engine/Engine/Rendering/Private/Pipeline/DeferredRendering.h
#	SourceCode/Engine/Engine/Rendering/Private/RenderingAllocators.cpp
#	SourceCode/Engine/Engine/Rendering/Private/RenderingAllocators.h
#	SourceCode/Engine/Engine/Rendering/Private/ShaderCompiler/ArrayElementAccessStatement.h
#	SourceCode/Engine/Engine/Rendering/Private/ShaderCompiler/ArrayStatement.h
#	SourceCode/Engine/Engine/Rendering/Private/ShaderCompiler/BreakStatement.h
#	SourceCode/Engine/Engine/Rendering/Private/ShaderCompiler/CaseStatement.h
#	SourceCode/Engine/Engine/Rendering/Private/ShaderCompiler/Compiler.cpp
#	SourceCode/Engine/Engine/Rendering/Private/ShaderCompiler/Compiler.h
#	SourceCode/Engine/Engine/Rendering/Private/ShaderCompiler/ConstantStatement.h
#	SourceCode/Engine/Engine/Rendering/Private/ShaderCompiler/ContinueStatement.h
#	SourceCode/Engine/Engine/Rendering/Private/ShaderCompiler/DiscardStatement.h
#	SourceCode/Engine/Engine/Rendering/Private/ShaderCompiler/DoStatement.h
#	SourceCode/Engine/Engine/Rendering/Private/ShaderCompiler/ElseStatement.h
#	SourceCode/Engine/Engine/Rendering/Private/ShaderCompiler/ForStatement.h
#	SourceCode/Engine/Engine/Rendering/Private/ShaderCompiler/FunctionCallStatement.h
#	SourceCode/Engine/Engine/Rendering/Private/ShaderCompiler/FunctionType.h
#	SourceCode/Engine/Engine/Rendering/Private/ShaderCompiler/IfStatement.h
#	SourceCode/Engine/Engine/Rendering/Private/ShaderCompiler/MemberAccessStatement.h
#	SourceCode/Engine/Engine/Rendering/Private/ShaderCompiler/OperatorStatement.h
#	SourceCode/Engine/Engine/Rendering/Private/ShaderCompiler/ParameterType.h
#	SourceCode/Engine/Engine/Rendering/Private/ShaderCompiler/ReturnStatement.h
#	SourceCode/Engine/Engine/Rendering/Private/ShaderCompiler/SemicolonStatement.h
#	SourceCode/Engine/Engine/Rendering/Private/ShaderCompiler/ShaderParser.cpp
#	SourceCode/Engine/Engine/Rendering/Private/ShaderCompiler/ShaderParser.h
#	SourceCode/Engine/Engine/Rendering/Private/ShaderCompiler/Statement.h
#	SourceCode/Engine/Engine/Rendering/Private/ShaderCompiler/StatementsHolder.h
#	SourceCode/Engine/Engine/Rendering/Private/ShaderCompiler/SwitchStatement.h
#	SourceCode/Engine/Engine/Rendering/Private/ShaderCompiler/Type.h
#	SourceCode/Engine/Engine/Rendering/Private/ShaderCompiler/UnaryOperatorStatement.h
#	SourceCode/Engine/Engine/Rendering/Private/ShaderCompiler/VariableAccessStatement.h
#	SourceCode/Engine/Engine/Rendering/Private/ShaderCompiler/VariableStatement.h
#	SourceCode/Engine/Engine/Rendering/Private/ShaderCompiler/VariableType.h
#	SourceCode/Engine/Engine/Rendering/Private/ShaderCompiler/WhileStatement.h
#	SourceCode/Engine/Engine/Rendering/Program.cpp
#	SourceCode/Engine/Engine/Rendering/Program.h
#	SourceCode/Engine/Engine/Rendering/ProgramConstantSupplier.cpp
#	SourceCode/Engine/Engine/Rendering/ProgramConstantSupplier.h
#	SourceCode/Engine/Engine/Rendering/RenderTarget.cpp
#	SourceCode/Engine/Engine/Rendering/RenderTarget.h
#	SourceCode/Engine/Engine/Rendering/RenderTargetInfo.h
#	SourceCode/Engine/Engine/Rendering/Rendering.Rules.cs
#	SourceCode/Engine/Engine/Rendering/RenderingCommon.h
#	SourceCode/Engine/Engine/Rendering/RenderingManager.cpp
#	SourceCode/Engine/Engine/Rendering/RenderingManager.h
#	SourceCode/Engine/Engine/Rendering/Texture.cpp
#	SourceCode/Engine/Engine/Rendering/Texture.h
#	SourceCode/Engine/Engine/Rendering/Vertex.h
#	SourceCode/Engine/Engine/ResourceSystem/Enumerators.h
#	SourceCode/Engine/Engine/ResourceSystem/Private/ResourceFactory.cpp
#	SourceCode/Engine/Engine/ResourceSystem/Private/ResourceFactory.h
#	SourceCode/Engine/Engine/ResourceSystem/Private/ResourceSystemAllocators.cpp
#	SourceCode/Engine/Engine/ResourceSystem/Private/ResourceSystemAllocators.h
#	SourceCode/Engine/Engine/ResourceSystem/Resource.h
#	SourceCode/Engine/Engine/ResourceSystem/ResourceHandle.h
#	SourceCode/Engine/Engine/ResourceSystem/ResourceManager.cpp
#	SourceCode/Engine/Engine/ResourceSystem/ResourceManager.h
#	SourceCode/Engine/Engine/ResourceSystem/ResourceSystem.Rules.cs
#	SourceCode/Engine/Engine/ResourceSystem/Text.h
#	SourceCode/Engine/Engine/Test/TestFile/TestFile.Rules.cs
#	SourceCode/Engine/Engine/Test/TestLauncher/TestLauncher.Rules.cs
#	SourceCode/Engine/Engine/Test/TestLauncher/TestLauncher.cpp
#	SourceCode/Engine/Engine/Test/TestNetwork/TestNetwork.Rules.cs
#	SourceCode/Engine/Engine/Test/TestReflection/TestReflection.Rules.cs
#	SourceCode/Engine/Engine/Test/TestRendering/TestRendering.Rules.cs
#	SourceCode/Engine/Engine/Test/TestRendering/TestRendering.cpp
#	SourceCode/Engine/Engine/Threading/Fiber.cpp
#	SourceCode/Engine/Engine/Threading/Fiber.h
#	SourceCode/Engine/Engine/Threading/Thread.cpp
#	SourceCode/Engine/Engine/Threading/Thread.h
#	SourceCode/Engine/Engine/Threading/Threading.Rules.cs
#	SourceCode/Engine/Engine/Utility/ArgumentParser.h
#	SourceCode/Engine/Engine/Utility/AssetParser/InternalModelParser.cpp
#	SourceCode/Engine/Engine/Utility/AssetParser/InternalModelParser.h
#	SourceCode/Engine/Engine/Utility/AssetParser/ModelParser.h
#	SourceCode/Engine/Engine/Utility/AssetParser/OBJParser.cpp
#	SourceCode/Engine/Engine/Utility/AssetParser/OBJParser.h
#	SourceCode/Engine/Engine/Utility/FileSystem.cpp
#	SourceCode/Engine/Engine/Utility/FileSystem.h
#	SourceCode/Engine/Engine/Utility/FileWatcher.cpp
#	SourceCode/Engine/Engine/Utility/FileWatcher.h
#	SourceCode/Engine/Engine/Utility/Lexer/Constants.h
#	SourceCode/Engine/Engine/Utility/Lexer/Token.cpp
#	SourceCode/Engine/Engine/Utility/Lexer/Token.h
#	SourceCode/Engine/Engine/Utility/Lexer/Tokenizer.cpp
#	SourceCode/Engine/Engine/Utility/Lexer/Tokenizer.h
#	SourceCode/Engine/Engine/Utility/Utility.Rules.cs
#	SourceCode/Engine/Engine/Utility/Window.cpp
#	SourceCode/Engine/Engine/Utility/Window.h
#	SourceCode/Engine/Engine/Utility/YAML/YAMLArray.cpp
#	SourceCode/Engine/Engine/Utility/YAML/YAMLArray.h
#	SourceCode/Engine/Engine/Utility/YAML/YAMLCodeParser.cpp
#	SourceCode/Engine/Engine/Utility/YAML/YAMLCodeParser.h
#	SourceCode/Engine/Engine/Utility/YAML/YAMLData.cpp
#	SourceCode/Engine/Engine/Utility/YAML/YAMLData.h
#	SourceCode/Engine/Engine/Utility/YAML/YAMLObject.cpp
#	SourceCode/Engine/Engine/Utility/YAML/YAMLObject.h
#	SourceCode/Engine/Engine/Utility/YAML/YAMLParser.cpp
#	SourceCode/Engine/Engine/Utility/YAML/YAMLParser.h
#	SourceCode/Engine/Frontend/Program.cs
#	SourceCode/Engine/Frontend/System/Build/RuleLibraryBuilder.cs
#	SourceCode/Engine/Frontend/System/Build/SourceBuilder.cs
#	SourceCode/Engine/Frontend/System/BuildSystem.cs
#	SourceCode/Engine/Frontend/System/BuildSystemHelper.cs
#	SourceCode/Engine/Frontend/System/EnvironmentHelper.cs
#	SourceCode/Engine/Frontend/System/Generator/EngineProjectFileCreator.cs
#	SourceCode/Engine/Frontend/Utilities/Extensions.cs
Assets 2
Loading