Skip to content
Snippets Groups Projects
Commit c3d085d8 authored by Lorenz Martin Diel's avatar Lorenz Martin Diel
Browse files

Merge branch 'main' into 'lorenz_author'

# Conflicts:
#   README.md
#   src/game/level/Level.cpp
#   src/game/level/Level.hpp
#   src/game/ui/modals/UnitInfoMenu.cpp
#   src/game/ui/modals/UnitInfoMenu.hpp
parents 0ff5eab8 b7562d0b
Branches
No related tags found
1 merge request!53added author tags
Showing
with 50 additions and 3 deletions
......@@ -58,6 +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
......@@ -107,6 +108,7 @@ Max Körschen:
- level.cpp/hpp (eventhandling for units and buildings, movement, attack etc)
- debugging in CombatEngine.cpp/hpp, Bullets.cpp/hpp
Lorenz Diel:
- Units.cpp/hpp
- UnitInfoMenu.cpp/hpp
......@@ -114,3 +116,19 @@ Lorenz Diel:
- Config.cpp/hpp
- Weapon.cpp/hpp
- CombatEngine.cpp/hpp
David Maul:
- Engine.cpp/hpp
- Scene.hpp
- Spritesheet.cpp/hpp
- Tile.cpp/hpp
- Window.cpp/hpp
- Effect.cpp/hpp
- Level.cpp/hpp
- main.cpp
/**
* Engine.cpp
*
* @author David Maul
* @author Frederik Keens
*/
......
/**
* Engine.hpp
*
* @author David Maul
* @author Frederik Keens
*/
......
/**
* Scene.hpp
*
* @author David Maul
* @author Frederik Keens
*/
......
......@@ -2,8 +2,8 @@
* Spritesheet.hpp
*
* @date 30.1.2025
* @author Frederik Keens
* @author David Maul
* @author Frederik Keens
*/
#include "Spritesheet.hpp"
......
......@@ -2,8 +2,8 @@
* Spritesheet.hpp
*
* @date 30.1.2025
* @author Frederik Keens
* @author David Maul
* @author Frederik Keens
*/
#pragma once
......
/**
* Tile.cpp
*
* @author David Maul
* @author Frederik Keens
*/
......
/**
* Tile.hpp
*
* @author David Maul
* @author Frederik Keens
*/
......
/**
* Window.cpp
*
* @author David Maul
*/
#include "Window.hpp"
#include <stdexcept>
......
/**
* Window.hpp
*
* @author David Maul
*/
#pragma once
#include <SDL.h>
......
/**
* Effect.cpp
*
* @author David Maul
* @author Frederik Keens
*/
......
/**
* Effect.hpp
*
* @author David Maul
* @author Frederik Keens
*/
......
......@@ -2,6 +2,7 @@
* Building.cpp
*
* @authors Max Körschen
* @author Nicolas Will
* @author Frederik Keens
*/
......
......@@ -2,6 +2,7 @@
* Building.hpp
*
* @authors Max Körschen
* @author Nicolas Will
* @author Frederik Keens
*/
......
......@@ -2,6 +2,7 @@
* Unit.cpp
*
* @authors Max Körschen
* @author Nicolas Will
* @author Frederik Keens
* @author Lorenz Diel
*/
......
......@@ -2,6 +2,7 @@
* Unit.hpp
*
* @authors Max Körschen
* @author Nicolas Will
* @author Frederik Keens
* @author Lorenz Diel
*/
......
......@@ -2,8 +2,11 @@
* Level.cpp
*
* @authors Max Körschen
* @author Nicolas Will
* @author Frederik Keens
* @author Lorenz Diel
* @author David Maul
*/
#include "Level.hpp"
......
......@@ -2,8 +2,10 @@
* Level.hpp
*
* @authors Max Körschen
* @author Nicolas Will
* @author Frederik Keens
* @author Lorenz Diel
* @author David Maul
*/
#pragma once
......
......@@ -2,6 +2,7 @@
* main.cpp
*
* @author Frederik Keens
* @author David Maul
*/
#include "core/Engine.hpp"
......
/**
* @authors Max Körschen
* @author Nicolas Will
*/
#include "ContextMenu.hpp"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment