From 5a11c942813c1407376d0406ab10e53b18efe479 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Max=20G=C3=B6tz=20Hans-Georg=20K=C3=B6rschen?= <max.koerschen@informatik.hs-fulda.de> Date: Sun, 9 Feb 2025 23:24:34 +0100 Subject: [PATCH] =?UTF-8?q?Merge=20Authorship=20from=20of=20Max=20K=C3=B6r?= =?UTF-8?q?schen?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 14 +++++++++++++- src/game/entities/Building.cpp | 4 ++++ src/game/entities/Building.hpp | 4 ++++ src/game/entities/Unit.cpp | 4 ++++ src/game/entities/Unit.hpp | 4 ++++ src/game/level/Level.cpp | 4 ++++ src/game/level/Level.hpp | 4 ++++ src/game/ui/context/ContextMenu.cpp | 4 ++++ src/game/ui/context/ContextMenu.hpp | 4 ++++ src/game/ui/context/RecruitingMenu.cpp | 4 ++++ src/game/ui/context/RecruitingMenu.hpp | 4 ++++ src/game/ui/modals/HelpMenu.cpp | 4 ++++ src/game/ui/modals/HelpMenu.hpp | 4 ++++ src/game/ui/modals/UnitInfoMenu.cpp | 4 ++++ src/game/ui/modals/UnitInfoMenu.hpp | 4 ++++ 15 files changed, 69 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index ae6ca28..8b0fe8a 100644 --- a/README.md +++ b/README.md @@ -93,4 +93,16 @@ cmake .. -DCMAKE_BUILD_TYPE=Debug # Debug-Build ``` ## Prerequisites for Leveleditor -- QT 6: ```sudo apt install qt6-base-dev``` \ No newline at end of file +- QT 6: ```sudo apt install qt6-base-dev``` + + +## Authors + +Max Körschen: +- Units.cpp/hpp (Combat and movement) +- Helpmenu.cpp/hpp +- UnitInfoMenu.cpp/hpp +- RecruitingMenu.cpp/hpp and Recruiting interactions with level-class +- Building.cpp/hpp (interactions and logic) +- level.cpp/hpp (eventhandling for units and buildings, movement, attack etc) +- debugging in CombatEngine.cpp/hpp, Bullets.cpp/hpp diff --git a/src/game/entities/Building.cpp b/src/game/entities/Building.cpp index 720f69b..c084ed3 100644 --- a/src/game/entities/Building.cpp +++ b/src/game/entities/Building.cpp @@ -1,3 +1,7 @@ +/** + * @authors Max Körschen + */ + #include "Building.hpp" #include "../core/Spritesheet.hpp" #include <iostream> diff --git a/src/game/entities/Building.hpp b/src/game/entities/Building.hpp index 7120145..c070f55 100644 --- a/src/game/entities/Building.hpp +++ b/src/game/entities/Building.hpp @@ -1,3 +1,7 @@ +/** + * @authors Max Körschen + */ + #pragma once #include "../core/Engine.hpp" diff --git a/src/game/entities/Unit.cpp b/src/game/entities/Unit.cpp index f7c82fb..13ae2bd 100644 --- a/src/game/entities/Unit.cpp +++ b/src/game/entities/Unit.cpp @@ -1,3 +1,7 @@ +/** + * @authors Max Körschen + */ + #include "Unit.hpp" #include "../core/Config.hpp" #include "../physics/PhysicsBody.hpp" diff --git a/src/game/entities/Unit.hpp b/src/game/entities/Unit.hpp index 0e05e8e..0cafd20 100644 --- a/src/game/entities/Unit.hpp +++ b/src/game/entities/Unit.hpp @@ -1,3 +1,7 @@ +/** + * @authors Max Körschen + */ + #pragma once #include "../combat/Weapon.hpp" diff --git a/src/game/level/Level.cpp b/src/game/level/Level.cpp index 394a49e..a2217d5 100644 --- a/src/game/level/Level.cpp +++ b/src/game/level/Level.cpp @@ -1,3 +1,7 @@ +/** + * @authors Max Körschen + */ + #include "Level.hpp" #include "../core/Config.hpp" #include "../core/Engine.hpp" diff --git a/src/game/level/Level.hpp b/src/game/level/Level.hpp index f606e4c..b81075e 100644 --- a/src/game/level/Level.hpp +++ b/src/game/level/Level.hpp @@ -1,3 +1,7 @@ +/** + * @authors Max Körschen + */ + #pragma once #include "../combat/CombatEngine.hpp" diff --git a/src/game/ui/context/ContextMenu.cpp b/src/game/ui/context/ContextMenu.cpp index 99cf79f..f59241b 100644 --- a/src/game/ui/context/ContextMenu.cpp +++ b/src/game/ui/context/ContextMenu.cpp @@ -1,3 +1,7 @@ +/** + * @authors Max Körschen + */ + #include "ContextMenu.hpp" #include <SDL_ttf.h> diff --git a/src/game/ui/context/ContextMenu.hpp b/src/game/ui/context/ContextMenu.hpp index 165433e..871147a 100644 --- a/src/game/ui/context/ContextMenu.hpp +++ b/src/game/ui/context/ContextMenu.hpp @@ -1,3 +1,7 @@ +/** + * @authors Max Körschen + */ + #pragma once #include "../../core/Engine.hpp" diff --git a/src/game/ui/context/RecruitingMenu.cpp b/src/game/ui/context/RecruitingMenu.cpp index 004de44..1b334eb 100644 --- a/src/game/ui/context/RecruitingMenu.cpp +++ b/src/game/ui/context/RecruitingMenu.cpp @@ -1,3 +1,7 @@ +/** + * @authors Max Körschen + */ + #include "RecruitingMenu.hpp" #include <SDL_ttf.h> diff --git a/src/game/ui/context/RecruitingMenu.hpp b/src/game/ui/context/RecruitingMenu.hpp index ad37cda..8ff1321 100644 --- a/src/game/ui/context/RecruitingMenu.hpp +++ b/src/game/ui/context/RecruitingMenu.hpp @@ -1,3 +1,7 @@ +/** + * @authors Max Körschen + */ + #pragma once #include "../../core/Scene.hpp" diff --git a/src/game/ui/modals/HelpMenu.cpp b/src/game/ui/modals/HelpMenu.cpp index 175df6c..cc424e7 100644 --- a/src/game/ui/modals/HelpMenu.cpp +++ b/src/game/ui/modals/HelpMenu.cpp @@ -1,3 +1,7 @@ +/** + * @authors Max Körschen + */ + #include "HelpMenu.hpp" #include <SDL_ttf.h> diff --git a/src/game/ui/modals/HelpMenu.hpp b/src/game/ui/modals/HelpMenu.hpp index 8e484e5..c1e9aae 100644 --- a/src/game/ui/modals/HelpMenu.hpp +++ b/src/game/ui/modals/HelpMenu.hpp @@ -1,3 +1,7 @@ +/** + * @authors Max Körschen + */ + #pragma once #include "../../core/Scene.hpp" diff --git a/src/game/ui/modals/UnitInfoMenu.cpp b/src/game/ui/modals/UnitInfoMenu.cpp index 3b43b2a..50d2b7b 100644 --- a/src/game/ui/modals/UnitInfoMenu.cpp +++ b/src/game/ui/modals/UnitInfoMenu.cpp @@ -1,3 +1,7 @@ +/** + * @authors Max Körschen + */ + #include "UnitInfoMenu.hpp" #include <SDL_ttf.h> diff --git a/src/game/ui/modals/UnitInfoMenu.hpp b/src/game/ui/modals/UnitInfoMenu.hpp index 08c3183..6058ca1 100644 --- a/src/game/ui/modals/UnitInfoMenu.hpp +++ b/src/game/ui/modals/UnitInfoMenu.hpp @@ -1,3 +1,7 @@ +/** + * @authors Max Körschen + */ + #pragma once #include "../../core/Engine.hpp" -- GitLab