Niklumm
|
784f75f4db
|
Update .gitignore
|
2025-11-17 16:05:22 +01:00 |
|
Niklumm
|
9873b963fa
|
Merge branch 'main' of https://git.efi.th-nuernberg.de/gitea/guballaro99746/Stone_Development
|
2025-11-17 16:03:54 +01:00 |
|
pumcookie
|
7dacd91b32
|
finalev2
|
2025-11-17 15:34:05 +01:00 |
|
pumcookie
|
4d2df95404
|
Merge remote-tracking branch 'origin/main'
# Conflicts:
# .idea/workspace.xml
|
2025-11-17 15:33:29 +01:00 |
|
marcelbls
|
1527b661ea
|
Merge branch 'main' of https://git.efi.th-nuernberg.de/gitea/guballaro99746/Stone_Development
|
2025-11-17 15:33:31 +01:00 |
|
marcelbls
|
b1a825b386
|
update
|
2025-11-17 15:33:21 +01:00 |
|
pumcookie
|
c002d7dd4b
|
Merge branch 'refs/heads/project_tests'
# Conflicts:
# .idea/workspace.xml
# CMakeLists.txt
# tests.cpp
|
2025-11-17 15:32:15 +01:00 |
|
pumcookie
|
72aac0894d
|
trying merge
|
2025-11-17 15:23:42 +01:00 |
|
marcelbls
|
6b8e5f7204
|
Cmake List update
|
2025-11-17 15:11:42 +01:00 |
|
marcelbls
|
480fd67817
|
Merge branch 'main' into project_tests
|
2025-11-17 15:09:56 +01:00 |
|
marcelbls
|
366f7b1c37
|
updated
|
2025-11-17 15:08:48 +01:00 |
|
pumcookie
|
0da8b5ee41
|
Merge remote-tracking branch 'origin/main'
|
2025-11-17 15:07:56 +01:00 |
|
marcelbls
|
cdc533c586
|
updated
|
2025-11-17 15:03:34 +01:00 |
|
Legaeli
|
aac593edb3
|
Gitignore
|
2025-11-17 15:02:40 +01:00 |
|
|
|
b73ba1a0e0
|
Merge branch 'project_tests'
# Conflicts:
# cmake-build-debug/Prog3B.exe
# cmake-build-debug/Testing/Temporary/LastTest.log
|
2025-11-17 15:00:11 +01:00 |
|
marcelbls
|
d4ceaeb516
|
lles wieder da
|
2025-11-17 14:59:21 +01:00 |
|
marcelbls
|
b48ce207fc
|
Merge branch 'main' of https://git.efi.th-nuernberg.de/gitea/guballaro99746/Stone_Development
|
2025-11-17 14:58:35 +01:00 |
|
marcelbls
|
ca71990a2d
|
Alles weg
|
2025-11-17 14:58:22 +01:00 |
|
|
|
c9701664ae
|
gitignore
|
2025-11-17 14:53:50 +01:00 |
|
marcelbls
|
ca3f80284c
|
update
|
2025-11-17 14:24:28 +01:00 |
|
|
|
35e35cad9b
|
gitignore
|
2025-11-17 14:19:36 +01:00 |
|
|
|
8c67791c90
|
gitignore
|
2025-11-17 14:14:50 +01:00 |
|
|
|
2822ce206e
|
gitignore
|
2025-11-17 14:14:32 +01:00 |
|
|
|
92e4646f11
|
Finale
|
2025-11-17 14:07:46 +01:00 |
|
|
|
873ec1d29c
|
Finale
|
2025-11-17 13:15:20 +01:00 |
|
|
|
09ec5b288e
|
Merge remote-tracking branch 'refs/remotes/origin/project_tests'
# Conflicts:
# CMakeLists.txt
# cmake-build-debug/CMakeFiles/3.30.5/CMakeDetermineCompilerABI_C.bin
# cmake-build-debug/CMakeFiles/3.30.5/CMakeDetermineCompilerABI_CXX.bin
# cmake-build-debug/CMakeFiles/3.30.5/CompilerIdC/a.exe
# cmake-build-debug/CMakeFiles/3.30.5/CompilerIdCXX/a.exe
# cmake-build-debug/CMakeFiles/CMakeConfigureLog.yaml
# cmake-build-debug/CMakeFiles/clion-Debug-log.txt
# cmake-build-debug/Prog3B.exe
# cmake-build-debug/Testing/Temporary/LastTest.log
# cmake-build-debug/compile_commands.json
|
2025-11-17 13:14:48 +01:00 |
|
|
|
c72b95036d
|
Kurz vor Finale
|
2025-11-17 13:12:52 +01:00 |
|
|
|
3625bf2506
|
Merge remote-tracking branch 'origin/project_developer'
|
2025-11-17 13:12:07 +01:00 |
|
|
|
1ff4c9397c
|
Merge branch 'architect'
# Conflicts:
# cmake-build-debug/CMakeFiles/Prog3B.dir/gamecube.cpp.obj
# cmake-build-debug/CMakeFiles/Prog3B.dir/main.cpp.obj
# cmake-build-debug/Prog3B.exe
# cmake-build-debug/Testing/Temporary/LastTest.log
|
2025-11-17 13:11:47 +01:00 |
|
marcelbls
|
7c8ea0c30e
|
update Test.cpp
|
2025-11-17 09:30:31 +01:00 |
|
marcelbls
|
9e322748dc
|
Tests implementiert
|
2025-11-17 09:26:31 +01:00 |
|
|
|
27ea219f41
|
Backup
|
2025-11-16 17:57:29 +01:00 |
|
Legaeli
|
7eedd59f6f
|
Bugs fixed. Funktioniert wie geplant. Ich erwarte eine Gehalsterhöhung Chef
|
2025-11-04 08:33:08 +01:00 |
|
Legaeli
|
3c5d04cbe3
|
Projekt kompiliert noch nicht, wahrscheinlich pathing Fehler. Alle Funktionen implementiert.
|
2025-11-03 17:14:01 +01:00 |
|
marcelbls
|
86776f70bc
|
commit for merge
|
2025-11-03 15:25:36 +01:00 |
|
marcelbls
|
dd23eef896
|
Update tests.cpp
|
2025-11-03 15:18:36 +01:00 |
|
marcelbls
|
5a8a8ab255
|
Cmake List angepasst
|
2025-11-03 15:17:20 +01:00 |
|
|
|
42649ea0db
|
ANFORDERUNGEN
|
2025-11-03 15:16:26 +01:00 |
|
marcelbls
|
85c69bf196
|
Cmake list angepasst
|
2025-11-03 15:11:59 +01:00 |
|
Niklumm
|
1bdcedb100
|
update test
|
2025-11-03 15:09:05 +01:00 |
|
marcelbls
|
99f3b60261
|
Test.cpp erstellt und Cmake angepasst
|
2025-11-03 14:57:34 +01:00 |
|
|
|
fd43435619
|
Merge branch 'main' of https://git.efi.th-nuernberg.de/gitea/guballaro99746/Stone_Development into project_leader
|
2025-11-03 14:52:54 +01:00 |
|
Niklumm
|
8b720d8b5b
|
Update design.txt
|
2025-11-03 14:48:40 +01:00 |
|
marcelbls
|
1f6cb722f8
|
Merge branch 'main' into project_tests
|
2025-11-03 14:46:25 +01:00 |
|
Niklumm
|
558c9160f6
|
Merge branch 'main' into architect
|
2025-11-03 14:43:04 +01:00 |
|
|
|
6855f5fd28
|
Requirements
|
2025-11-03 14:40:16 +01:00 |
|
|
|
1a1f0d56cd
|
Requirements
|
2025-11-03 14:38:43 +01:00 |
|
marcelbls
|
3b0da0a8a5
|
Neue test.txt Datei
Neue test.txt Datei
|
2025-11-03 14:33:44 +01:00 |
|
Niklumm
|
0579b6054c
|
Create design.txt
|
2025-11-03 14:30:38 +01:00 |
|
Niklumm
|
3b1a499293
|
branch commit?
|
2025-11-03 14:27:20 +01:00 |
|
