 PBA3H25ABU
|
6d9fee91db
|
Merge branch 'main' of https://git.bib.de/PBA3H25ABU/ClearTheZone
# Conflicts:
# Assets/Scenes/Story1.unity
# Assets/Scenes/Story1.unity.rej
# Assets/Scripts/Bullet.cs
# Assets/Scripts/EnemyHealth.cs
# Assets/Scripts/Shoot.cs
|
2026-08-20 11:44:36 +02:00 |
|
|
PBA3H25ABU
|
94d5f82635
|
Merge branch 'main' of https://git.bib.de/PBA3H25ABU/ClearTheZone
# Conflicts:
# Assets/Scenes/Story1.unity
# Assets/Scripts/Bullet.cs
# Assets/Scripts/EnemyHealth.cs
# Assets/Scripts/Shoot.cs
|
2026-08-20 11:44:27 +02:00 |
|
|
PBA3H25ABU
|
89d2a8a758
|
Reapply "Reapply "fix1.2""
This reverts commit a3ead4845c.
|
2026-08-20 11:38:54 +02:00 |
|
|
PBA3H25ABU
|
a3ead4845c
|
Revert "Reapply "fix1.2""
This reverts commit dea33b7613.
|
2026-08-20 11:38:49 +02:00 |
|
|
PBA3H25ABU
|
dea33b7613
|
Reapply "fix1.2"
This reverts commit 0b1a359bd9.
|
2026-08-20 11:38:40 +02:00 |
|
|
PBA3H25ABU
|
0b1a359bd9
|
Revert "fix1.2"
This reverts commit c35a879034.
|
2026-08-20 11:38:34 +02:00 |
|
|
PBA3H25ABU
|
c35a879034
|
fix1.2
|
2026-08-20 11:35:35 +02:00 |
|
|
PBA3H25ABU
|
1db2ec9a94
|
fix1
|
2026-08-20 11:35:03 +02:00 |
|
 NBTEMP\bib
|
392d23632b
|
Merge branch 'main' of https://git.bib.de/PBA3H25ABU/ClearTheZone
# Conflicts:
# Assets/Scenes/Story1.unity
|
2026-08-20 11:32:10 +02:00 |
|
|
NBTEMP\bib
|
0597756f41
|
gegner berabietet
|
2026-08-20 11:31:38 +02:00 |
|
|
PBA3H25ABU
|
b8d1d2d76a
|
Merge branch 'main' of https://git.bib.de/PBA3H25ABU/ClearTheZone
|
2026-08-20 11:15:11 +02:00 |
|
|
PBA3H25ABU
|
abe59525e2
|
großer fehler
|
2026-08-20 11:15:06 +02:00 |
|
|
PBA3H25ABU
|
6303895fb4
|
Merge branch 'main' of https://git.bib.de/PBA3H25ABU/ClearTheZone
# Conflicts:
# Assets/Scenes/Story1.unity
# Assets/Scripts/Shoot.cs
|
2026-08-20 11:11:28 +02:00 |
|
|
PBA3H25ABU
|
d27b860d72
|
bullet
|
2026-08-20 11:10:17 +02:00 |
|
|
GodGodGod20081
|
85ece04586
|
Merge branch 'main' of https://git.bib.de/PBA3H25ABU/ClearTheZone
|
2026-08-20 10:45:50 +02:00 |
|
|
GodGodGod20081
|
1503b5dda6
|
tür bewegt
|
2026-08-20 10:43:54 +02:00 |
|
|
NBTEMP\bib
|
2e3688fa38
|
Merge branch 'main' of https://git.bib.de/PBA3H25ABU/ClearTheZone
|
2026-08-20 10:43:33 +02:00 |
|
|
NBTEMP\bib
|
4a23cacf12
|
waffen realoden reapriert
|
2026-08-20 10:43:24 +02:00 |
|
|
PBA3H25ABU
|
8cd4da3aad
|
Tag und Player prefab bearbeitet
|
2026-08-20 10:42:41 +02:00 |
|
|
PBA3H25ABU
|
e8d6a385c4
|
Merge branch 'main' of https://git.bib.de/PBA3H25ABU/ClearTheZone
|
2026-08-20 09:52:10 +02:00 |
|
|
PBA3H25ABU
|
cca8e87739
|
Bullet und health script
|
2026-08-20 09:52:06 +02:00 |
|
|
NBTEMP\bib
|
2604185ce4
|
hab das fedenkreutz gemacht
|
2026-07-30 15:57:33 +02:00 |
|
|
NBTEMP\bib
|
3ae0ed6f0a
|
pausemnü behohebn
|
2026-07-21 16:35:19 +02:00 |
|
|
NBTEMP\bib
|
7cc9554e6a
|
montzions ui pausenmenü ui lebns ui nachladen pausen menü neues digsein
|
2026-07-16 15:09:38 +02:00 |
|
|
PBA3H25ABU
|
c320f54ec9
|
Merge branch 'main' of https://git.bib.de/PBA3H25ABU/ClearTheZone
|
2026-07-16 11:07:39 +02:00 |
|
|
PBA3H25ABU
|
82c106d040
|
Waffen Prefab fix Game map spielbar mit Charakter waffe kann schießen pause maneger und Equiepment bearbeitet und health skript hinzugefügt
|
2026-07-16 11:07:21 +02:00 |
|
|
NBTEMP\bib
|
6db27d3c44
|
Merge branch 'main' of https://git.bib.de/PBA3H25ABU/ClearTheZone
|
2026-07-16 11:03:09 +02:00 |
|
|
NBTEMP\bib
|
49d2852e14
|
weiß ich nicht mehr
|
2026-07-16 11:03:02 +02:00 |
|
|
GodGodGod20081
|
65e6ffed94
|
Merge branch 'main' of https://git.bib.de/PBA3H25ABU/ClearTheZone
# Conflicts:
# Assets/Prefabs/AR.prefab
# Assets/Prefabs/Pistole.prefab
|
2026-06-26 13:42:03 +02:00 |
|
|
GodGodGod20081
|
e68e753523
|
movement und animation tweaks
|
2026-06-26 13:41:37 +02:00 |
|
|
PBA3H25ABU
|
f9295a93aa
|
Map 1 fertig equipmentManager kann die ausrüstung wechseln waffen preffebs bearbeitet
|
2026-06-26 13:41:28 +02:00 |
|
|
GodGodGod20081
|
83c852c1ab
|
Merge branch 'main' of https://git.bib.de/PBA3H25ABU/ClearTheZone
|
2026-06-25 12:44:09 +02:00 |
|
|
GodGodGod20081
|
cdcd374639
|
neuer character modifiziert und skeleton vom alten in den neuen
|
2026-06-25 12:43:48 +02:00 |
|
|
PBA3H25ABU
|
19df668261
|
Merge branch 'main' of https://git.bib.de/PBA3H25ABU/ClearTheZone
|
2026-06-25 12:42:18 +02:00 |
|
|
PBA3H25ABU
|
d7d88fe70a
|
Reload Animation von Ar und Pistole außerdem Shot script soweit fertig
|
2026-06-25 12:42:14 +02:00 |
|
|
GodGodGod20081
|
54f675d28b
|
Merge branch 'main' of https://git.bib.de/PBA3H25ABU/ClearTheZone
|
2026-06-25 10:54:05 +02:00 |
|
|
GodGodGod20081
|
a4fa40b2fb
|
besserer character
|
2026-06-25 10:53:53 +02:00 |
|
|
PBA3H25ABU
|
f66d78348a
|
Shot Script angefangen kleine änderung am AR Model
|
2026-06-25 10:53:22 +02:00 |
|
|
PBA3H25ABU
|
22c4e0d7a9
|
PlayerController laufen funktioniert jetzt
|
2026-06-19 12:34:03 +02:00 |
|
|
GodGodGod20081
|
65166c14a6
|
Merge branch 'main' of https://git.bib.de/PBA3H25ABU/ClearTheZone
|
2026-06-19 12:21:37 +02:00 |
|
|
GodGodGod20081
|
66944bcc14
|
Merge branch 'main' of https://git.bib.de/PBA3H25ABU/ClearTheZone
|
2026-06-19 12:21:26 +02:00 |
|
|
PBA3H25ABU
|
c041a1fe9f
|
Prefabs und materials bearbeitet
|
2026-06-19 12:21:22 +02:00 |
|
|
GodGodGod20081
|
8d4ffbf9ed
|
unity starter asset package importiert
|
2026-06-19 12:21:09 +02:00 |
|
|
PBA3H25ABU
|
0781c89f8e
|
Merge branch 'main' of https://git.bib.de/PBA3H25ABU/ClearTheZone
|
2026-06-18 15:06:03 +02:00 |
|
|
PBA3H25ABU
|
988b763272
|
Pausen funktion funktioniert komplet UI handler bisschen geändert
|
2026-06-18 15:04:35 +02:00 |
|
|
GodGodGod20081
|
ce681510ea
|
door script improve
|
2026-06-18 13:53:07 +02:00 |
|
|
GodGodGod20081
|
ef3f1c8615
|
Merge branch 'main' of https://git.bib.de/PBA3H25ABU/ClearTheZone
|
2026-06-18 12:59:07 +02:00 |
|
|
GodGodGod20081
|
6d6ba0a17f
|
messa
|
2026-06-18 12:58:50 +02:00 |
|
|
PBA3H25ABU
|
ba65eef664
|
Merge branch 'main' of https://git.bib.de/PBA3H25ABU/ClearTheZone
|
2026-06-18 12:57:47 +02:00 |
|
|
PBA3H25ABU
|
a69bedb394
|
Bullet und Pistolen prefab und Pausen Menue angefangen
|
2026-06-18 12:57:35 +02:00 |
|