From 9114a0d09caf2c1da2de0e1a89c5c90b0294fbba Mon Sep 17 00:00:00 2001 From: Pyrdacor Date: Tue, 5 Jan 2021 11:47:35 +0100 Subject: [PATCH] This is v0.1.3beta --- Ambermoon.Common/Ambermoon.Common.csproj | 2 +- Ambermoon.Core/Ambermoon.Core.csproj | 2 +- Ambermoon.Core/Misc.cs | 2 +- Ambermoon.Core/Render/Color.cs | 2 +- Ambermoon.Core/Render/ICamera3D.cs | 2 +- Ambermoon.Core/Render/IColoredRect.cs | 2 +- Ambermoon.Core/Render/IRenderLayer.cs | 2 +- Ambermoon.Core/Render/IRenderNode.cs | 2 +- Ambermoon.Core/Render/IRenderView.cs | 2 +- Ambermoon.Core/Render/ISprite.cs | 2 +- Ambermoon.Core/Render/ISurface3D.cs | 2 +- Ambermoon.Core/Render/ITextureAtlas.cs | 2 +- Ambermoon.Core/Render/RenderMap2D.cs | 2 +- Ambermoon.Core/Render/RenderMap3D.cs | 2 +- Ambermoon.Core/Render/TextAlign.cs | 2 +- Ambermoon.Core/Render/Texture.cs | 2 +- Ambermoon.Core/Render/TextureAtlasManager.cs | 2 +- .../Ambermoon.Data.Common.csproj | 4 +- .../Ambermoon.Data.Legacy.csproj | 4 +- .../Ambermoon.Renderer.OpenGL.csproj | 4 +- .../Billboard3DShader.cs | 2 +- Ambermoon.Renderer.OpenGL/BufferObject.cs | 2 +- Ambermoon.Renderer.OpenGL/ByteBuffer.cs | 2 +- Ambermoon.Renderer.OpenGL/ColorBuffer.cs | 2 +- Ambermoon.Renderer.OpenGL/ColorShader.cs | 2 +- Ambermoon.Renderer.OpenGL/ColoredRect.cs | 2 +- Ambermoon.Renderer.OpenGL/Context.cs | 2 +- Ambermoon.Renderer.OpenGL/Enums.cs | 2 +- Ambermoon.Renderer.OpenGL/FloatBuffer.cs | 2 +- Ambermoon.Renderer.OpenGL/IndexBuffer.cs | 2 +- Ambermoon.Renderer.OpenGL/IndexPool.cs | 2 +- Ambermoon.Renderer.OpenGL/Matrix.cs | 2 +- Ambermoon.Renderer.OpenGL/MutableTexture.cs | 2 +- .../OpaqueTextureShader.cs | 2 +- Ambermoon.Renderer.OpenGL/PositionBuffer.cs | 2 +- Ambermoon.Renderer.OpenGL/RenderBuffer.cs | 2 +- Ambermoon.Renderer.OpenGL/RenderLayer.cs | 2 +- Ambermoon.Renderer.OpenGL/RenderNode.cs | 2 +- Ambermoon.Renderer.OpenGL/RenderText.cs | 2 +- Ambermoon.Renderer.OpenGL/RenderView.cs | 2 +- Ambermoon.Renderer.OpenGL/Shader.cs | 2 +- Ambermoon.Renderer.OpenGL/ShaderProgram.cs | 2 +- Ambermoon.Renderer.OpenGL/Sprite.cs | 2 +- Ambermoon.Renderer.OpenGL/State.cs | 2 +- Ambermoon.Renderer.OpenGL/StateContext.cs | 2 +- Ambermoon.Renderer.OpenGL/Surface3D.cs | 2 +- Ambermoon.Renderer.OpenGL/TextShader.cs | 2 +- Ambermoon.Renderer.OpenGL/Texture.cs | 2 +- Ambermoon.Renderer.OpenGL/Texture3DShader.cs | 2 +- Ambermoon.Renderer.OpenGL/TextureAtlas.cs | 2 +- Ambermoon.Renderer.OpenGL/TextureShader.cs | 2 +- Ambermoon.Renderer.OpenGL/VectorBuffer.cs | 2 +- .../VertexArrayObject.cs | 2 +- Ambermoon.Renderer.OpenGL/WordBuffer.cs | 2 +- Ambermoon.net/Ambermoon.net.csproj | 6 +-- README.md | 40 ++++++++----------- 56 files changed, 77 insertions(+), 83 deletions(-) diff --git a/Ambermoon.Common/Ambermoon.Common.csproj b/Ambermoon.Common/Ambermoon.Common.csproj index 364b95a8..9d70a6e8 100644 --- a/Ambermoon.Common/Ambermoon.Common.csproj +++ b/Ambermoon.Common/Ambermoon.Common.csproj @@ -8,7 +8,7 @@ Github Library that contains basic stuff for other Ambermoon libraries. true - 1.1.7 + 1.1.8 diff --git a/Ambermoon.Core/Ambermoon.Core.csproj b/Ambermoon.Core/Ambermoon.Core.csproj index a6a0b399..546adbb5 100644 --- a/Ambermoon.Core/Ambermoon.Core.csproj +++ b/Ambermoon.Core/Ambermoon.Core.csproj @@ -16,7 +16,7 @@ true - + diff --git a/Ambermoon.Core/Misc.cs b/Ambermoon.Core/Misc.cs index a31a3b2b..366acffa 100644 --- a/Ambermoon.Core/Misc.cs +++ b/Ambermoon.Core/Misc.cs @@ -1,7 +1,7 @@ /* * Misc.cs - Helper functions * - * Copyright (C) 2020 Robert Schneckenhaus + * Copyright (C) 2020-2021 Robert Schneckenhaus * * This file is part of Ambermoon.net. * diff --git a/Ambermoon.Core/Render/Color.cs b/Ambermoon.Core/Render/Color.cs index 9d859828..ba8e474d 100644 --- a/Ambermoon.Core/Render/Color.cs +++ b/Ambermoon.Core/Render/Color.cs @@ -1,7 +1,7 @@ /* * Color.cs - Basic color implementation * - * Copyright (C) 2020 Robert Schneckenhaus + * Copyright (C) 2020-2021 Robert Schneckenhaus * * This file is part of Ambermoon.net. * diff --git a/Ambermoon.Core/Render/ICamera3D.cs b/Ambermoon.Core/Render/ICamera3D.cs index 4725c862..c5bb8473 100644 --- a/Ambermoon.Core/Render/ICamera3D.cs +++ b/Ambermoon.Core/Render/ICamera3D.cs @@ -1,7 +1,7 @@ /* * ICamera3D.cs - 3D camera interface * - * Copyright (C) 2020 Robert Schneckenhaus + * Copyright (C) 2020-2021 Robert Schneckenhaus * * This file is part of Ambermoon.net. * diff --git a/Ambermoon.Core/Render/IColoredRect.cs b/Ambermoon.Core/Render/IColoredRect.cs index 2d87403d..db70ec92 100644 --- a/Ambermoon.Core/Render/IColoredRect.cs +++ b/Ambermoon.Core/Render/IColoredRect.cs @@ -1,7 +1,7 @@ /* * IColoredRect.cs - Colored rectangle interface * - * Copyright (C) 2020 Robert Schneckenhaus + * Copyright (C) 2020-2021 Robert Schneckenhaus * * This file is part of Ambermoon.net. * diff --git a/Ambermoon.Core/Render/IRenderLayer.cs b/Ambermoon.Core/Render/IRenderLayer.cs index 64adb17f..f1277080 100644 --- a/Ambermoon.Core/Render/IRenderLayer.cs +++ b/Ambermoon.Core/Render/IRenderLayer.cs @@ -1,7 +1,7 @@ /* * IRenderLayer.cs - Render layer interface * - * Copyright (C) 2020 Robert Schneckenhaus + * Copyright (C) 2020-2021 Robert Schneckenhaus * * This file is part of Ambermoon.net. * diff --git a/Ambermoon.Core/Render/IRenderNode.cs b/Ambermoon.Core/Render/IRenderNode.cs index 7fa0fe4a..673e212e 100644 --- a/Ambermoon.Core/Render/IRenderNode.cs +++ b/Ambermoon.Core/Render/IRenderNode.cs @@ -1,7 +1,7 @@ /* * IRenderNode.cs - Render node interface * - * Copyright (C) 2020 Robert Schneckenhaus + * Copyright (C) 2020-2021 Robert Schneckenhaus * * This file is part of Ambermoon.net. * diff --git a/Ambermoon.Core/Render/IRenderView.cs b/Ambermoon.Core/Render/IRenderView.cs index 15c6dc50..1412cc1c 100644 --- a/Ambermoon.Core/Render/IRenderView.cs +++ b/Ambermoon.Core/Render/IRenderView.cs @@ -1,7 +1,7 @@ /* * IRenderView.cs - Render view interface * - * Copyright (C) 2020 Robert Schneckenhaus + * Copyright (C) 2020-2021 Robert Schneckenhaus * * This file is part of Ambermoon.net. * diff --git a/Ambermoon.Core/Render/ISprite.cs b/Ambermoon.Core/Render/ISprite.cs index 8207d960..e94c34fa 100644 --- a/Ambermoon.Core/Render/ISprite.cs +++ b/Ambermoon.Core/Render/ISprite.cs @@ -1,7 +1,7 @@ /* * ISprite.cs - Sprite interface * - * Copyright (C) 2020 Robert Schneckenhaus + * Copyright (C) 2020-2021 Robert Schneckenhaus * * This file is part of Ambermoon.net. * diff --git a/Ambermoon.Core/Render/ISurface3D.cs b/Ambermoon.Core/Render/ISurface3D.cs index bd51b0b2..49ac80a4 100644 --- a/Ambermoon.Core/Render/ISurface3D.cs +++ b/Ambermoon.Core/Render/ISurface3D.cs @@ -1,7 +1,7 @@ /* * ISurface3D.cs - 3D surface interface * - * Copyright (C) 2020 Robert Schneckenhaus + * Copyright (C) 2020-2021 Robert Schneckenhaus * * This file is part of Ambermoon.net. * diff --git a/Ambermoon.Core/Render/ITextureAtlas.cs b/Ambermoon.Core/Render/ITextureAtlas.cs index 5706e09f..39edb769 100644 --- a/Ambermoon.Core/Render/ITextureAtlas.cs +++ b/Ambermoon.Core/Render/ITextureAtlas.cs @@ -1,7 +1,7 @@ /* * ISprite.cs - Texture atlas interface * - * Copyright (C) 2020 Robert Schneckenhaus + * Copyright (C) 2020-2021 Robert Schneckenhaus * * This file is part of Ambermoon.net. * diff --git a/Ambermoon.Core/Render/RenderMap2D.cs b/Ambermoon.Core/Render/RenderMap2D.cs index f53fe273..90999a4a 100644 --- a/Ambermoon.Core/Render/RenderMap2D.cs +++ b/Ambermoon.Core/Render/RenderMap2D.cs @@ -1,7 +1,7 @@ /* * RenderMap2D.cs - Handles 2D map rendering * - * Copyright (C) 2020 Robert Schneckenhaus + * Copyright (C) 2020-2021 Robert Schneckenhaus * * This file is part of Ambermoon.net. * diff --git a/Ambermoon.Core/Render/RenderMap3D.cs b/Ambermoon.Core/Render/RenderMap3D.cs index f050b693..f1937649 100644 --- a/Ambermoon.Core/Render/RenderMap3D.cs +++ b/Ambermoon.Core/Render/RenderMap3D.cs @@ -1,7 +1,7 @@ /* * RenderMap3D.cs - Handles 3D map rendering * - * Copyright (C) 2020 Robert Schneckenhaus + * Copyright (C) 2020-2021 Robert Schneckenhaus * * This file is part of Ambermoon.net. * diff --git a/Ambermoon.Core/Render/TextAlign.cs b/Ambermoon.Core/Render/TextAlign.cs index 269c532f..4eca2ab8 100644 --- a/Ambermoon.Core/Render/TextAlign.cs +++ b/Ambermoon.Core/Render/TextAlign.cs @@ -1,7 +1,7 @@ /* * TextAlign.cs - Text alignment enumeration * - * Copyright (C) 2020 Robert Schneckenhaus + * Copyright (C) 2020-2021 Robert Schneckenhaus * * This file is part of Ambermoon.net. * diff --git a/Ambermoon.Core/Render/Texture.cs b/Ambermoon.Core/Render/Texture.cs index 897ee781..7eff2338 100644 --- a/Ambermoon.Core/Render/Texture.cs +++ b/Ambermoon.Core/Render/Texture.cs @@ -1,7 +1,7 @@ /* * Texture.cs - Basic texture interface * - * Copyright (C) 2020 Robert Schneckenhaus + * Copyright (C) 2020-2021 Robert Schneckenhaus * * This file is part of Ambermoon.net. * diff --git a/Ambermoon.Core/Render/TextureAtlasManager.cs b/Ambermoon.Core/Render/TextureAtlasManager.cs index a7d42242..e746fca9 100644 --- a/Ambermoon.Core/Render/TextureAtlasManager.cs +++ b/Ambermoon.Core/Render/TextureAtlasManager.cs @@ -1,7 +1,7 @@ /* * TextureAtlasManager.cs - Manages texture atlases * - * Copyright (C) 2020 Robert Schneckenhaus + * Copyright (C) 2020-2021 Robert Schneckenhaus * * This file is part of Ambermoon.net. * diff --git a/Ambermoon.Data.Common/Ambermoon.Data.Common.csproj b/Ambermoon.Data.Common/Ambermoon.Data.Common.csproj index 30bf71ce..2f0d448e 100644 --- a/Ambermoon.Data.Common/Ambermoon.Data.Common.csproj +++ b/Ambermoon.Data.Common/Ambermoon.Data.Common.csproj @@ -10,12 +10,12 @@ Github Ambermoon Amiga true - 2.0.12 + 2.0.13 485e4790-32fd-45f1-b729-c5ca93ba0fad - + diff --git a/Ambermoon.Data.Legacy/Ambermoon.Data.Legacy.csproj b/Ambermoon.Data.Legacy/Ambermoon.Data.Legacy.csproj index a75f1e92..9a9fe58d 100644 --- a/Ambermoon.Data.Legacy/Ambermoon.Data.Legacy.csproj +++ b/Ambermoon.Data.Legacy/Ambermoon.Data.Legacy.csproj @@ -9,7 +9,7 @@ Github Ambermoon Legacy Amiga Game Data true - 2.0.23 + 2.0.24 true @@ -18,7 +18,7 @@ - + diff --git a/Ambermoon.Renderer.OpenGL/Ambermoon.Renderer.OpenGL.csproj b/Ambermoon.Renderer.OpenGL/Ambermoon.Renderer.OpenGL.csproj index 0b0426b1..27c8c7c8 100644 --- a/Ambermoon.Renderer.OpenGL/Ambermoon.Renderer.OpenGL.csproj +++ b/Ambermoon.Renderer.OpenGL/Ambermoon.Renderer.OpenGL.csproj @@ -10,11 +10,11 @@ true - 1.1.11 + 1.1.12 - + diff --git a/Ambermoon.Renderer.OpenGL/Billboard3DShader.cs b/Ambermoon.Renderer.OpenGL/Billboard3DShader.cs index a13aadfe..b517fbe4 100644 --- a/Ambermoon.Renderer.OpenGL/Billboard3DShader.cs +++ b/Ambermoon.Renderer.OpenGL/Billboard3DShader.cs @@ -1,7 +1,7 @@ /* * Billboard3DShader.cs - Shader for textured 3D billboards * - * Copyright (C) 2020 Robert Schneckenhaus + * Copyright (C) 2020-2021 Robert Schneckenhaus * * This file is part of Ambermoon.net. * diff --git a/Ambermoon.Renderer.OpenGL/BufferObject.cs b/Ambermoon.Renderer.OpenGL/BufferObject.cs index 43a1d650..1f1e3960 100644 --- a/Ambermoon.Renderer.OpenGL/BufferObject.cs +++ b/Ambermoon.Renderer.OpenGL/BufferObject.cs @@ -1,7 +1,7 @@ /* * BufferObject.cs - Base class for integer based data buffers * - * Copyright (C) 2020 Robert Schneckenhaus + * Copyright (C) 2020-2021 Robert Schneckenhaus * * This file is part of Ambermoon.net. * diff --git a/Ambermoon.Renderer.OpenGL/ByteBuffer.cs b/Ambermoon.Renderer.OpenGL/ByteBuffer.cs index 4412ebaa..4dd47e9f 100644 --- a/Ambermoon.Renderer.OpenGL/ByteBuffer.cs +++ b/Ambermoon.Renderer.OpenGL/ByteBuffer.cs @@ -1,7 +1,7 @@ /* * ByteBuffer.cs - Buffer for shader byte data * - * Copyright (C) 2020 Robert Schneckenhaus + * Copyright (C) 2020-2021 Robert Schneckenhaus * * This file is part of Ambermoon.net. * diff --git a/Ambermoon.Renderer.OpenGL/ColorBuffer.cs b/Ambermoon.Renderer.OpenGL/ColorBuffer.cs index 23da84a3..41521abe 100644 --- a/Ambermoon.Renderer.OpenGL/ColorBuffer.cs +++ b/Ambermoon.Renderer.OpenGL/ColorBuffer.cs @@ -1,7 +1,7 @@ /* * ColorBuffer.cs - Buffer for shader color data * - * Copyright (C) 2020 Robert Schneckenhaus + * Copyright (C) 2020-2021 Robert Schneckenhaus * * This file is part of Ambermoon.net. * diff --git a/Ambermoon.Renderer.OpenGL/ColorShader.cs b/Ambermoon.Renderer.OpenGL/ColorShader.cs index d1e9fbf9..fd348329 100644 --- a/Ambermoon.Renderer.OpenGL/ColorShader.cs +++ b/Ambermoon.Renderer.OpenGL/ColorShader.cs @@ -1,7 +1,7 @@ /* * ColorShader.cs - Basic color shader for colored shapes * - * Copyright (C) 2020 Robert Schneckenhaus + * Copyright (C) 2020-2021 Robert Schneckenhaus * * This file is part of Ambermoon.net. * diff --git a/Ambermoon.Renderer.OpenGL/ColoredRect.cs b/Ambermoon.Renderer.OpenGL/ColoredRect.cs index 3aefa550..a6f12c85 100644 --- a/Ambermoon.Renderer.OpenGL/ColoredRect.cs +++ b/Ambermoon.Renderer.OpenGL/ColoredRect.cs @@ -1,7 +1,7 @@ /* * ColoredRect.cs - Colored rectangle * - * Copyright (C) 2020 Robert Schneckenhaus + * Copyright (C) 2020-2021 Robert Schneckenhaus * * This file is part of Ambermoon.net. * diff --git a/Ambermoon.Renderer.OpenGL/Context.cs b/Ambermoon.Renderer.OpenGL/Context.cs index 1e20ef88..bf013efc 100644 --- a/Ambermoon.Renderer.OpenGL/Context.cs +++ b/Ambermoon.Renderer.OpenGL/Context.cs @@ -1,7 +1,7 @@ /* * Context.cs - Render context which is capable of rotating the whole screen * - * Copyright (C) 2020 Robert Schneckenhaus + * Copyright (C) 2020-2021 Robert Schneckenhaus * * This file is part of Ambermoon.net. * diff --git a/Ambermoon.Renderer.OpenGL/Enums.cs b/Ambermoon.Renderer.OpenGL/Enums.cs index af32e3fb..9c50020e 100644 --- a/Ambermoon.Renderer.OpenGL/Enums.cs +++ b/Ambermoon.Renderer.OpenGL/Enums.cs @@ -1,7 +1,7 @@ /* * Enums.cs - Globally needed enumerations * - * Copyright (C) 2020 Robert Schneckenhaus + * Copyright (C) 2020-2021 Robert Schneckenhaus * * This file is part of Ambermoon.net. * diff --git a/Ambermoon.Renderer.OpenGL/FloatBuffer.cs b/Ambermoon.Renderer.OpenGL/FloatBuffer.cs index aec731f3..86dbbcbc 100644 --- a/Ambermoon.Renderer.OpenGL/FloatBuffer.cs +++ b/Ambermoon.Renderer.OpenGL/FloatBuffer.cs @@ -1,7 +1,7 @@ /* * FloatBuffer.cs - Buffer for shader float data * - * Copyright (C) 2020 Robert Schneckenhaus + * Copyright (C) 2020-2021 Robert Schneckenhaus * * This file is part of Ambermoon.net. * diff --git a/Ambermoon.Renderer.OpenGL/IndexBuffer.cs b/Ambermoon.Renderer.OpenGL/IndexBuffer.cs index b3114835..6011e8d3 100644 --- a/Ambermoon.Renderer.OpenGL/IndexBuffer.cs +++ b/Ambermoon.Renderer.OpenGL/IndexBuffer.cs @@ -1,7 +1,7 @@ /* * IndexBuffer.cs - Dynamic buffer for vertex indices * - * Copyright (C) 2020 Robert Schneckenhaus + * Copyright (C) 2020-2021 Robert Schneckenhaus * * This file is part of Ambermoon.net. * diff --git a/Ambermoon.Renderer.OpenGL/IndexPool.cs b/Ambermoon.Renderer.OpenGL/IndexPool.cs index 4cbe1326..ad650481 100644 --- a/Ambermoon.Renderer.OpenGL/IndexPool.cs +++ b/Ambermoon.Renderer.OpenGL/IndexPool.cs @@ -1,7 +1,7 @@ /* * IndexPool.cs - Pool of indices which handles index reusing * - * Copyright (C) 2020 Robert Schneckenhaus + * Copyright (C) 2020-2021 Robert Schneckenhaus * * This file is part of Ambermoon.net. * diff --git a/Ambermoon.Renderer.OpenGL/Matrix.cs b/Ambermoon.Renderer.OpenGL/Matrix.cs index 62d9b72f..8977cc39 100644 --- a/Ambermoon.Renderer.OpenGL/Matrix.cs +++ b/Ambermoon.Renderer.OpenGL/Matrix.cs @@ -1,7 +1,7 @@ /* * Matrix.cs - Basic 4x4 matrix implementation * - * Copyright (C) 2020 Robert Schneckenhaus + * Copyright (C) 2020-2021 Robert Schneckenhaus * * This file is part of Ambermoon.net. * diff --git a/Ambermoon.Renderer.OpenGL/MutableTexture.cs b/Ambermoon.Renderer.OpenGL/MutableTexture.cs index a2317ec3..5a582b14 100644 --- a/Ambermoon.Renderer.OpenGL/MutableTexture.cs +++ b/Ambermoon.Renderer.OpenGL/MutableTexture.cs @@ -1,7 +1,7 @@ /* * MutableTexture.cs - OpenGL texture creation * - * Copyright (C) 2020 Robert Schneckenhaus + * Copyright (C) 2020-2021 Robert Schneckenhaus * * This file is part of Ambermoon.net. * diff --git a/Ambermoon.Renderer.OpenGL/OpaqueTextureShader.cs b/Ambermoon.Renderer.OpenGL/OpaqueTextureShader.cs index a1918880..fa82c10e 100644 --- a/Ambermoon.Renderer.OpenGL/OpaqueTextureShader.cs +++ b/Ambermoon.Renderer.OpenGL/OpaqueTextureShader.cs @@ -1,7 +1,7 @@ /* * OpaqueTextureShader.cs - Shader for opaque textured objects * - * Copyright (C) 2020 Robert Schneckenhaus + * Copyright (C) 2020-2021 Robert Schneckenhaus * * This file is part of Ambermoon.net. * diff --git a/Ambermoon.Renderer.OpenGL/PositionBuffer.cs b/Ambermoon.Renderer.OpenGL/PositionBuffer.cs index c5ab8671..60b5b908 100644 --- a/Ambermoon.Renderer.OpenGL/PositionBuffer.cs +++ b/Ambermoon.Renderer.OpenGL/PositionBuffer.cs @@ -1,7 +1,7 @@ /* * PositionBuffer.cs - Buffer for shader position data * - * Copyright (C) 2020 Robert Schneckenhaus + * Copyright (C) 2020-2021 Robert Schneckenhaus * * This file is part of Ambermoon.net. * diff --git a/Ambermoon.Renderer.OpenGL/RenderBuffer.cs b/Ambermoon.Renderer.OpenGL/RenderBuffer.cs index 0671b4e6..3b27924c 100644 --- a/Ambermoon.Renderer.OpenGL/RenderBuffer.cs +++ b/Ambermoon.Renderer.OpenGL/RenderBuffer.cs @@ -1,7 +1,7 @@ /* * RenderBuffer.cs - Renders several buffered objects * - * Copyright (C) 2020 Robert Schneckenhaus + * Copyright (C) 2020-2021 Robert Schneckenhaus * * This file is part of Ambermoon.net. * diff --git a/Ambermoon.Renderer.OpenGL/RenderLayer.cs b/Ambermoon.Renderer.OpenGL/RenderLayer.cs index 09b308cd..4a1c01b7 100644 --- a/Ambermoon.Renderer.OpenGL/RenderLayer.cs +++ b/Ambermoon.Renderer.OpenGL/RenderLayer.cs @@ -1,7 +1,7 @@ /* * RenderLayer.cs - Render layer implementation * - * Copyright (C) 2020 Robert Schneckenhaus + * Copyright (C) 2020-2021 Robert Schneckenhaus * * This file is part of Ambermoon.net. * diff --git a/Ambermoon.Renderer.OpenGL/RenderNode.cs b/Ambermoon.Renderer.OpenGL/RenderNode.cs index abc97a4a..ceaa061a 100644 --- a/Ambermoon.Renderer.OpenGL/RenderNode.cs +++ b/Ambermoon.Renderer.OpenGL/RenderNode.cs @@ -1,7 +1,7 @@ /* * Node.cs - Basic render node implementation * - * Copyright (C) 2020 Robert Schneckenhaus + * Copyright (C) 2020-2021 Robert Schneckenhaus * * This file is part of Ambermoon.net. * diff --git a/Ambermoon.Renderer.OpenGL/RenderText.cs b/Ambermoon.Renderer.OpenGL/RenderText.cs index 3751c3c0..dbd4d23d 100644 --- a/Ambermoon.Renderer.OpenGL/RenderText.cs +++ b/Ambermoon.Renderer.OpenGL/RenderText.cs @@ -1,7 +1,7 @@ /* * RenderText.cs - Text render object * - * Copyright (C) 2020 Robert Schneckenhaus + * Copyright (C) 2020-2021 Robert Schneckenhaus * * This file is part of Ambermoon.net. * diff --git a/Ambermoon.Renderer.OpenGL/RenderView.cs b/Ambermoon.Renderer.OpenGL/RenderView.cs index 4b204927..235b0b3c 100644 --- a/Ambermoon.Renderer.OpenGL/RenderView.cs +++ b/Ambermoon.Renderer.OpenGL/RenderView.cs @@ -1,7 +1,7 @@ /* * GameView.cs - Implementation of a game render view * - * Copyright (C) 2020 Robert Schneckenhaus + * Copyright (C) 2020-2021 Robert Schneckenhaus * * This file is part of Ambermoon.net. * diff --git a/Ambermoon.Renderer.OpenGL/Shader.cs b/Ambermoon.Renderer.OpenGL/Shader.cs index 79af902b..67db84a6 100644 --- a/Ambermoon.Renderer.OpenGL/Shader.cs +++ b/Ambermoon.Renderer.OpenGL/Shader.cs @@ -1,7 +1,7 @@ /* * Shader.cs - GLSL shader handling * - * Copyright (C) 2020 Robert Schneckenhaus + * Copyright (C) 2020-2021 Robert Schneckenhaus * * This file is part of Ambermoon.net. * diff --git a/Ambermoon.Renderer.OpenGL/ShaderProgram.cs b/Ambermoon.Renderer.OpenGL/ShaderProgram.cs index 8f7cf45e..7fb8ae7d 100644 --- a/Ambermoon.Renderer.OpenGL/ShaderProgram.cs +++ b/Ambermoon.Renderer.OpenGL/ShaderProgram.cs @@ -1,7 +1,7 @@ /* * ShaderProgram.cs - GLSL shader program handling * - * Copyright (C) 2020 Robert Schneckenhaus + * Copyright (C) 2020-2021 Robert Schneckenhaus * * This file is part of Ambermoon.net. * diff --git a/Ambermoon.Renderer.OpenGL/Sprite.cs b/Ambermoon.Renderer.OpenGL/Sprite.cs index 00db5611..bc793257 100644 --- a/Ambermoon.Renderer.OpenGL/Sprite.cs +++ b/Ambermoon.Renderer.OpenGL/Sprite.cs @@ -1,7 +1,7 @@ /* * Sprite.cs - Textured sprite * - * Copyright (C) 2020 Robert Schneckenhaus + * Copyright (C) 2020-2021 Robert Schneckenhaus * * This file is part of Ambermoon.net. * diff --git a/Ambermoon.Renderer.OpenGL/State.cs b/Ambermoon.Renderer.OpenGL/State.cs index cc548149..1c31bb90 100644 --- a/Ambermoon.Renderer.OpenGL/State.cs +++ b/Ambermoon.Renderer.OpenGL/State.cs @@ -1,7 +1,7 @@ /* * State.cs - OpenGL state * - * Copyright (C) 2020 Robert Schneckenhaus + * Copyright (C) 2020-2021 Robert Schneckenhaus * * This file is part of Ambermoon.net. * diff --git a/Ambermoon.Renderer.OpenGL/StateContext.cs b/Ambermoon.Renderer.OpenGL/StateContext.cs index ef601de7..ccf9ed43 100644 --- a/Ambermoon.Renderer.OpenGL/StateContext.cs +++ b/Ambermoon.Renderer.OpenGL/StateContext.cs @@ -1,7 +1,7 @@ /* * StateContext.cs - OpenGL state switch helper * - * Copyright (C) 2020 Robert Schneckenhaus + * Copyright (C) 2020-2021 Robert Schneckenhaus * * This file is part of Ambermoon.net. * diff --git a/Ambermoon.Renderer.OpenGL/Surface3D.cs b/Ambermoon.Renderer.OpenGL/Surface3D.cs index d5a66b6e..e210ac0c 100644 --- a/Ambermoon.Renderer.OpenGL/Surface3D.cs +++ b/Ambermoon.Renderer.OpenGL/Surface3D.cs @@ -1,7 +1,7 @@ /* * Surface3D.cs - Textured 3D surface * - * Copyright (C) 2020 Robert Schneckenhaus + * Copyright (C) 2020-2021 Robert Schneckenhaus * * This file is part of Ambermoon.net. * diff --git a/Ambermoon.Renderer.OpenGL/TextShader.cs b/Ambermoon.Renderer.OpenGL/TextShader.cs index ff2df74e..8299fcd8 100644 --- a/Ambermoon.Renderer.OpenGL/TextShader.cs +++ b/Ambermoon.Renderer.OpenGL/TextShader.cs @@ -1,7 +1,7 @@ /* * TextShader.cs - Shader for text rendering * - * Copyright (C) 2020 Robert Schneckenhaus + * Copyright (C) 2020-2021 Robert Schneckenhaus * * This file is part of Ambermoon.net. * diff --git a/Ambermoon.Renderer.OpenGL/Texture.cs b/Ambermoon.Renderer.OpenGL/Texture.cs index 5aacf032..cb6c10e5 100644 --- a/Ambermoon.Renderer.OpenGL/Texture.cs +++ b/Ambermoon.Renderer.OpenGL/Texture.cs @@ -1,7 +1,7 @@ /* * Texture.cs - OpenGL texture handling * - * Copyright (C) 2020 Robert Schneckenhaus + * Copyright (C) 2020-2021 Robert Schneckenhaus * * This file is part of Ambermoon.net. * diff --git a/Ambermoon.Renderer.OpenGL/Texture3DShader.cs b/Ambermoon.Renderer.OpenGL/Texture3DShader.cs index 7ca524f6..dfac33f0 100644 --- a/Ambermoon.Renderer.OpenGL/Texture3DShader.cs +++ b/Ambermoon.Renderer.OpenGL/Texture3DShader.cs @@ -1,7 +1,7 @@ /* * Texture3DShader.cs - Shader for textured 3D objects * - * Copyright (C) 2020 Robert Schneckenhaus + * Copyright (C) 2020-2021 Robert Schneckenhaus * * This file is part of Ambermoon.net. * diff --git a/Ambermoon.Renderer.OpenGL/TextureAtlas.cs b/Ambermoon.Renderer.OpenGL/TextureAtlas.cs index f54743c0..776e7cb6 100644 --- a/Ambermoon.Renderer.OpenGL/TextureAtlas.cs +++ b/Ambermoon.Renderer.OpenGL/TextureAtlas.cs @@ -1,7 +1,7 @@ /* * TextureAtlas.cs - Texture atlas creating and handling * - * Copyright (C) 2020 Robert Schneckenhaus + * Copyright (C) 2020-2021 Robert Schneckenhaus * * This file is part of Ambermoon.net. * diff --git a/Ambermoon.Renderer.OpenGL/TextureShader.cs b/Ambermoon.Renderer.OpenGL/TextureShader.cs index 5a23d114..147c9be2 100644 --- a/Ambermoon.Renderer.OpenGL/TextureShader.cs +++ b/Ambermoon.Renderer.OpenGL/TextureShader.cs @@ -1,7 +1,7 @@ /* * TextureShader.cs - Shader for textured objects * - * Copyright (C) 2020 Robert Schneckenhaus + * Copyright (C) 2020-2021 Robert Schneckenhaus * * This file is part of Ambermoon.net. * diff --git a/Ambermoon.Renderer.OpenGL/VectorBuffer.cs b/Ambermoon.Renderer.OpenGL/VectorBuffer.cs index da88444a..f8f51549 100644 --- a/Ambermoon.Renderer.OpenGL/VectorBuffer.cs +++ b/Ambermoon.Renderer.OpenGL/VectorBuffer.cs @@ -1,7 +1,7 @@ /* * VectorBuffer.cs - Buffer for shader 3D position data * - * Copyright (C) 2020 Robert Schneckenhaus + * Copyright (C) 2020-2021 Robert Schneckenhaus * * This file is part of Ambermoon.net. * diff --git a/Ambermoon.Renderer.OpenGL/VertexArrayObject.cs b/Ambermoon.Renderer.OpenGL/VertexArrayObject.cs index 35dc692e..1457267e 100644 --- a/Ambermoon.Renderer.OpenGL/VertexArrayObject.cs +++ b/Ambermoon.Renderer.OpenGL/VertexArrayObject.cs @@ -1,7 +1,7 @@ /* * VertexArrayBuffer.cs - OpenGL VAO handling * - * Copyright (C) 2020 Robert Schneckenhaus + * Copyright (C) 2020-2021 Robert Schneckenhaus * * This file is part of Ambermoon.net. * diff --git a/Ambermoon.Renderer.OpenGL/WordBuffer.cs b/Ambermoon.Renderer.OpenGL/WordBuffer.cs index bee2c0c2..795e918b 100644 --- a/Ambermoon.Renderer.OpenGL/WordBuffer.cs +++ b/Ambermoon.Renderer.OpenGL/WordBuffer.cs @@ -1,7 +1,7 @@ /* * WordBuffer.cs - Buffer for shader word data * - * Copyright (C) 2020 Robert Schneckenhaus + * Copyright (C) 2020-2021 Robert Schneckenhaus * * This file is part of Ambermoon.net. * diff --git a/Ambermoon.net/Ambermoon.net.csproj b/Ambermoon.net/Ambermoon.net.csproj index 4b6674bb..68fb89d3 100644 --- a/Ambermoon.net/Ambermoon.net.csproj +++ b/Ambermoon.net/Ambermoon.net.csproj @@ -5,8 +5,8 @@ netcoreapp3.1 Ambermoon win-x64;linux-x64 - 0.1.2 - Copyright (c) 2020 by Robert Schneckenhaus + 0.1.3 + Copyright (C) 2020-2021 by Robert Schneckenhaus Robert Schneckenhaus Robert Schneckenhaus https://github.com/Pyrdacor/Ambermoon.net @@ -20,7 +20,7 @@ - + diff --git a/README.md b/README.md index c7787496..d3507b02 100644 --- a/README.md +++ b/README.md @@ -1,40 +1,33 @@ # Ambermoon.net -### How to run the game +## Introduction + +Ambermoon.net is a full C# rewrite of Ambermoon. + +I also created another github project called [Ambermoon](https://github.com/Pyrdacor/Ambermoon) for providing resources and research the game data. Feel free to have a look or contribute. + +If you want to support this project or contribute scroll down to the bottom. You may also checkout my already working 'SerfCity (Die Siedler) rewrite' at [freeserf.net](https://github.com/Pyrdacor/freeserf.net). -I got some questions of how to run the game: -1. You need the original game data (either ADF files or extracted files like Party_char.amb etc). -2. Put these files next to the downloaded executable file called Ambermoon.net.exe. -3. If you have not yet, install the latest .NET framework for Windows. -4. The game only runs on Windows as of now. -5. If it still doesn't work try to start from Windows CMD and check for error printouts. -6. If this still doesn't help please file an issue on the [Issue tracker](https://github.com/Pyrdacor/Ambermoon.net/issues). ## Download Version | Windows 64bit | Linux 64bit ---- | --- | --- + +0.1.3 beta | [Download](https://github.com/Pyrdacor/Ambermoon.net/releases/download/v0.1.3beta/Ambermoon.net-Windows.zip) | [Download](https://github.com/Pyrdacor/Ambermoon.net/releases/download/v0.1.3beta/Ambermoon.net-Linux.tar.gz)--- | --- | --- 0.1.2 beta | [Download](https://github.com/Pyrdacor/Ambermoon.net/releases/download/v0.1.2beta/Ambermoon.net-Windows.zip) | [Download](https://github.com/Pyrdacor/Ambermoon.net/releases/download/v0.1.2beta/Ambermoon.net-Linux.tar.gz) -0.1.1 beta | [Download](https://github.com/Pyrdacor/Ambermoon.net/releases/download/v0.1.1beta/Ambermoon.net-Windows.zip) | [Download](https://github.com/Pyrdacor/Ambermoon.net/releases/download/v0.1.1beta/Ambermoon.net-Linux.tar.gz) Older releases can be found [here](https://github.com/Pyrdacor/Ambermoon.net/releases). Other platforms will follow. [![Build status](https://ci.appveyor.com/api/projects/status/cr6temgl1vknho6t?svg=true)](https://ci.appveyor.com/project/Pyrdacor/ambermoon-net) +### How to run the game -## Introduction - -Ambermoon.net should become a full C# rewrite of Ambermoon. For the first version the original game data will be used (but not provided). The loader will be able to load ADF disk files or the extracted files like Party_char.amb etc. - -Later maybe new data (enhanced textures, etc) may be provided or even the possibility to mod several things. - -First focus lies on loading and decrypting data so parts of this project can be used by others to read and understand the original game data as well. - -I also created another github project called [Ambermoon](https://github.com/Pyrdacor/Ambermoon) for providing resources and research the game data. Feel free to have a look or contribute. - -Let's bring this game to life on modern PCs with modern resolutions and graphic APIs. :) - -You may also checkout my already working Settlers I rewrite at [freeserf.net](https://github.com/Pyrdacor/freeserf.net). +1. You need the original game data (either ADF files or extracted files like Party_char.amb etc). +2. Put these files next to the downloaded executable file called Ambermoon.net.exe. +3. If you have not yet, install the latest .NET framework for Windows. +4. The game only runs on Windows as of now. +5. If it still doesn't work try to start from Windows CMD and check for error printouts. +6. If this still doesn't help please file an issue on the [Issue tracker](https://github.com/Pyrdacor/Ambermoon.net/issues). ## Screenshots @@ -74,6 +67,7 @@ F1-F6 | Open inventory of party member 1-6 ## Change log +- Version [0.1.3 beta](https://github.com/Pyrdacor/Ambermoon.net/releases/tag/v0.1.3beta): Added more spells, bug fixing - Version [0.1.2 beta](https://github.com/Pyrdacor/Ambermoon.net/releases/tag/v0.1.2beta): Added more spells, added damage display on battle field, added critical hits - Version [0.1.1 beta](https://github.com/Pyrdacor/Ambermoon.net/releases/tag/v0.1.1beta): Fixed end battle crash, fixed monster death animation, added firepillar spell - Version [0.1.0 beta](https://github.com/Pyrdacor/Ambermoon.net/releases/tag/v0.1.0beta): Many improvements to battles and UI, some spells do damage or have effects now