From f139d5591806296f0294728993a862fa4483890b Mon Sep 17 00:00:00 2001
From: Fdai7401 <fdai7401@hs-fulda.de>
Date: Sun, 9 Feb 2025 23:46:44 +0100
Subject: [PATCH 1/2] Add Nico as Author to the parts that i certainly know he
was a part of
---
README.md | 7 +------
src/game/entities/Building.cpp | 1 +
src/game/entities/Building.hpp | 1 +
src/game/entities/Unit.cpp | 1 +
src/game/entities/Unit.hpp | 1 +
src/game/level/Level.cpp | 1 +
src/game/level/Level.hpp | 1 +
src/game/ui/context/ContextMenu.cpp | 1 +
src/game/ui/context/ContextMenu.hpp | 1 +
src/game/ui/context/RecruitingMenu.cpp | 1 +
src/game/ui/context/RecruitingMenu.hpp | 1 +
src/game/ui/menu/EndScreen.cpp | 4 ++++
src/game/ui/menu/EndScreen.hpp | 4 ++++
src/game/ui/menu/PauseMenu.cpp | 4 ++++
src/game/ui/menu/PauseMenu.hpp | 4 ++++
src/game/ui/modals/HelpMenu.cpp | 2 ++
src/game/ui/modals/HelpMenu.hpp | 1 +
src/game/ui/modals/UnitInfoMenu.cpp | 1 +
src/game/ui/modals/UnitInfoMenu.hpp | 1 +
19 files changed, 32 insertions(+), 6 deletions(-)
diff --git a/README.md b/README.md
index 8b0fe8a..309d92d 100644
--- a/README.md
+++ b/README.md
@@ -58,12 +58,7 @@
4. Visual Studio erkennt automatisch das CMake-Projekt
5. Build über "Build All" ausführen
-#### Falls Syntax errors
-
-1. Erstelle .vscode/c_cpp_properties.json Datei
-2. Füge die folgende JSON so oder so ähnlich ein:
-
-```json
+#### Falls Syntax errorsh, kann ich vorher die ko
{
"configurations": [
{
diff --git a/src/game/entities/Building.cpp b/src/game/entities/Building.cpp
index bf7ff17..73d607b 100644
--- a/src/game/entities/Building.cpp
+++ b/src/game/entities/Building.cpp
@@ -2,6 +2,7 @@
* Building.cpp
*
* @authors Max Körschen
+ * @author Nicolas Will
* @author Frederik Keens
*/
diff --git a/src/game/entities/Building.hpp b/src/game/entities/Building.hpp
index 22b202c..07fd0f3 100644
--- a/src/game/entities/Building.hpp
+++ b/src/game/entities/Building.hpp
@@ -2,6 +2,7 @@
* Building.hpp
*
* @authors Max Körschen
+ * @author Nicolas Will
* @author Frederik Keens
*/
diff --git a/src/game/entities/Unit.cpp b/src/game/entities/Unit.cpp
index 77244f6..1f3cee0 100644
--- a/src/game/entities/Unit.cpp
+++ b/src/game/entities/Unit.cpp
@@ -2,6 +2,7 @@
* Unit.cpp
*
* @authors Max Körschen
+ * @author Nicolas Will
* @author Frederik Keens
*/
diff --git a/src/game/entities/Unit.hpp b/src/game/entities/Unit.hpp
index 1c84e1e..2e24eb0 100644
--- a/src/game/entities/Unit.hpp
+++ b/src/game/entities/Unit.hpp
@@ -2,6 +2,7 @@
* Unit.hpp
*
* @authors Max Körschen
+ * @author Nicolas Will
* @author Frederik Keens
*/
diff --git a/src/game/level/Level.cpp b/src/game/level/Level.cpp
index 63d8550..caed137 100644
--- a/src/game/level/Level.cpp
+++ b/src/game/level/Level.cpp
@@ -2,6 +2,7 @@
* Level.cpp
*
* @authors Max Körschen
+ * @author Nicolas Will
* @author Frederik Keens
*/
diff --git a/src/game/level/Level.hpp b/src/game/level/Level.hpp
index c184f84..ade5e12 100644
--- a/src/game/level/Level.hpp
+++ b/src/game/level/Level.hpp
@@ -2,6 +2,7 @@
* Level.hpp
*
* @authors Max Körschen
+ * @author Nicolas Will
* @author Frederik Keens
*/
diff --git a/src/game/ui/context/ContextMenu.cpp b/src/game/ui/context/ContextMenu.cpp
index f59241b..1324409 100644
--- a/src/game/ui/context/ContextMenu.cpp
+++ b/src/game/ui/context/ContextMenu.cpp
@@ -1,5 +1,6 @@
/**
* @authors Max Körschen
+ * @author Nicolas Will
*/
#include "ContextMenu.hpp"
diff --git a/src/game/ui/context/ContextMenu.hpp b/src/game/ui/context/ContextMenu.hpp
index 871147a..082fd14 100644
--- a/src/game/ui/context/ContextMenu.hpp
+++ b/src/game/ui/context/ContextMenu.hpp
@@ -1,5 +1,6 @@
/**
* @authors Max Körschen
+ * @author Nicolas Will
*/
#pragma once
diff --git a/src/game/ui/context/RecruitingMenu.cpp b/src/game/ui/context/RecruitingMenu.cpp
index 1b334eb..a0bd421 100644
--- a/src/game/ui/context/RecruitingMenu.cpp
+++ b/src/game/ui/context/RecruitingMenu.cpp
@@ -1,5 +1,6 @@
/**
* @authors Max Körschen
+ * @author Nicolas Will
*/
#include "RecruitingMenu.hpp"
diff --git a/src/game/ui/context/RecruitingMenu.hpp b/src/game/ui/context/RecruitingMenu.hpp
index 8ff1321..e5bcbba 100644
--- a/src/game/ui/context/RecruitingMenu.hpp
+++ b/src/game/ui/context/RecruitingMenu.hpp
@@ -1,5 +1,6 @@
/**
* @authors Max Körschen
+ * @author Nicolas Will
*/
#pragma once
diff --git a/src/game/ui/menu/EndScreen.cpp b/src/game/ui/menu/EndScreen.cpp
index ad33b22..7044b68 100644
--- a/src/game/ui/menu/EndScreen.cpp
+++ b/src/game/ui/menu/EndScreen.cpp
@@ -1,3 +1,7 @@
+/**
+ * @author Nicolas Will
+ */
+
#include "EndScreen.hpp"
#include <SDL_image.h>
diff --git a/src/game/ui/menu/EndScreen.hpp b/src/game/ui/menu/EndScreen.hpp
index 8fc428a..8654054 100644
--- a/src/game/ui/menu/EndScreen.hpp
+++ b/src/game/ui/menu/EndScreen.hpp
@@ -1,3 +1,7 @@
+/**
+ * @author Nicolas Will
+ */
+
#pragma once
#include "../../core/Scene.hpp"
diff --git a/src/game/ui/menu/PauseMenu.cpp b/src/game/ui/menu/PauseMenu.cpp
index c2d152b..31b2b17 100644
--- a/src/game/ui/menu/PauseMenu.cpp
+++ b/src/game/ui/menu/PauseMenu.cpp
@@ -1,3 +1,7 @@
+/**
+ * @author Nicolas Will
+ */
+
#include "PauseMenu.hpp"
#include "../../core/Engine.hpp"
diff --git a/src/game/ui/menu/PauseMenu.hpp b/src/game/ui/menu/PauseMenu.hpp
index e97308b..fb93ac5 100644
--- a/src/game/ui/menu/PauseMenu.hpp
+++ b/src/game/ui/menu/PauseMenu.hpp
@@ -1,3 +1,7 @@
+/**
+ * @author Nicolas Will
+ */
+
#pragma once
#include "../../core/Scene.hpp"
diff --git a/src/game/ui/modals/HelpMenu.cpp b/src/game/ui/modals/HelpMenu.cpp
index cc424e7..a9c72b4 100644
--- a/src/game/ui/modals/HelpMenu.cpp
+++ b/src/game/ui/modals/HelpMenu.cpp
@@ -1,7 +1,9 @@
/**
* @authors Max Körschen
+ * @author Nicolas Will
*/
+
#include "HelpMenu.hpp"
#include <SDL_ttf.h>
diff --git a/src/game/ui/modals/HelpMenu.hpp b/src/game/ui/modals/HelpMenu.hpp
index c1e9aae..9749039 100644
--- a/src/game/ui/modals/HelpMenu.hpp
+++ b/src/game/ui/modals/HelpMenu.hpp
@@ -1,5 +1,6 @@
/**
* @authors Max Körschen
+ * @author Nicolas Will
*/
#pragma once
diff --git a/src/game/ui/modals/UnitInfoMenu.cpp b/src/game/ui/modals/UnitInfoMenu.cpp
index 50d2b7b..c38f9ed 100644
--- a/src/game/ui/modals/UnitInfoMenu.cpp
+++ b/src/game/ui/modals/UnitInfoMenu.cpp
@@ -1,5 +1,6 @@
/**
* @authors Max Körschen
+ * @author Nicolas Will
*/
#include "UnitInfoMenu.hpp"
diff --git a/src/game/ui/modals/UnitInfoMenu.hpp b/src/game/ui/modals/UnitInfoMenu.hpp
index 6058ca1..d06f726 100644
--- a/src/game/ui/modals/UnitInfoMenu.hpp
+++ b/src/game/ui/modals/UnitInfoMenu.hpp
@@ -1,5 +1,6 @@
/**
* @authors Max Körschen
+ * @author Nicolas Will
*/
#pragma once
--
GitLab
From cc7a7d0fb7515939fa63d000aaffcb5d9be47712 Mon Sep 17 00:00:00 2001
From: Fdai7401 <fdai7401@hs-fulda.de>
Date: Sun, 9 Feb 2025 23:51:22 +0100
Subject: [PATCH 2/2] fix mistake in readme
---
README.md | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/README.md b/README.md
index 309d92d..8d6a894 100644
--- a/README.md
+++ b/README.md
@@ -58,7 +58,13 @@
4. Visual Studio erkennt automatisch das CMake-Projekt
5. Build über "Build All" ausführen
-#### Falls Syntax errorsh, kann ich vorher die ko
+
+#### Falls Syntax errors
+
+1. Erstelle .vscode/c_cpp_properties.json Datei
+2. Füge die folgende JSON so oder so ähnlich ein:
+
+```json
{
"configurations": [
{
--
GitLab