Commit graph

285 commits

Author SHA1 Message Date
MARKPRO44
695a8fb871 Merge branch 'main' of https://github.com/progtime-net/DangerousD 2023-08-17 15:47:10 +03:00
Lev
6e4eaf7915 Merge branch 'main' of https://github.com/progtime-net/DangerousD 2023-08-17 15:40:10 +03:00
MARKPRO44
c35f288fba FrankBall_2 2023-08-17 15:28:00 +03:00
bmvolf
0a2e3d6b1f player animation changed 2023-08-17 15:27:10 +03:00
591bdf24b6 Add player to map 2023-08-17 15:15:24 +03:00
bmvolf
71dc642a1d started work wirk with player 2023-08-17 15:10:08 +03:00
Lev
22db3d31eb Merge branch 'main' of https://github.com/progtime-net/DangerousD 2023-08-17 15:08:46 +03:00
Lev
37bb9fbb66 Some Изменения 2023-08-17 15:07:59 +03:00
Timofey06
b8367d3a75 Merge branch 'MapManager' 2023-08-17 15:00:58 +03:00
Timofey06
6f1d81372e Merge branch 'Boss' 2023-08-17 14:35:40 +03:00
Timofey06
ea0506beec SilasAlgorimVersion1End 2023-08-17 14:32:14 +03:00
AnloGames
7fee10dd29 Network List Of tasks Support 2023-08-17 14:31:20 +03:00
6fb9145c67 Fixes 2023-08-17 13:46:02 +03:00
polten0
7b6d750bc1 Merge branch 'main' into livingEntitiesHunchMan 2023-08-17 13:40:24 +03:00
2de1a409fb Fix Entity spawn position 2023-08-17 13:38:38 +03:00
bmvolf
9568f313fd merge commit 2023-08-17 13:24:03 +03:00
gravity
4ffae54437 gui 2023-08-17 13:21:21 +03:00
bmvolf
594da62dfa for merge to main 2023-08-17 13:21:12 +03:00
Lev
ba4466d966 Merge branch 'main' of https://github.com/progtime-net/DangerousD 2023-08-17 13:20:08 +03:00
Lev
d7a4772fe4 Fix RayCast 2023-08-17 13:19:58 +03:00
bmvolf
412239498e Merge branch 'main' into livingEntities 2023-08-17 13:18:41 +03:00
gravity
144a6fdfe7 gui 2023-08-17 13:16:13 +03:00
N4K
d7312c4c62 Merge branch 'main' into livingEntitiesVlad 2023-08-17 13:15:59 +03:00
SergoDobro
6b40bbe881 fixes 2023-08-17 13:14:14 +03:00
0614b8348a Add InstantiateEntities 2023-08-17 13:12:09 +03:00
polten0
8581af20b9 fix3 2023-08-17 13:09:42 +03:00
N4K
116dc8ecc5 Merge branch 'main' into livingEntitiesVlad 2023-08-17 13:08:41 +03:00
polten0
00b71fc645 fixesAdnSomeHunchManAdditions2 2023-08-17 13:07:05 +03:00
AnloGames
62a32ccdce TryCatchNetworkFix 2023-08-17 13:05:43 +03:00
polten0
b9d259bfa0 fixesAdnSomeHunchManAdditions 2023-08-17 13:05:16 +03:00
bmvolf
4c415fc4f5 try to do vision zombie 2023-08-17 13:01:04 +03:00
AnloGames
ccc6937ac9 NetworkFix 2023-08-17 12:50:20 +03:00
Lev
c87b8d9089 Merge branch 'main' of https://github.com/progtime-net/DangerousD 2023-08-17 12:42:44 +03:00
Lev
e00a5ebf73 Fix bags in RayCast 2023-08-17 12:41:56 +03:00
AnloGames
29d147ad2d Merge branch 'main' of https://github.com/progtime-net/DangerousD 2023-08-17 12:41:21 +03:00
AnloGames
1ea1113bfb MergeFixCommit 2023-08-17 12:41:13 +03:00
Timofey06
232c8b309d MergeWithBoss 2023-08-17 12:40:23 +03:00
N4K
55a585eeb0 add CheckRectangle method and little changes in monsters 2023-08-17 12:38:48 +03:00
AnloGames
1cfebd30bb Login And Sound Network Pripilivanie 2023-08-17 12:35:26 +03:00
bb86eee1b2 Merge remote-tracking branch 'origin/main' into MapManager
# Conflicts:
#	DangerousD/Content/Content.mgcb
#	DangerousD/GameCore/Levels/Level1.cs
#	DangerousD/GameCore/Managers/AppManager.cs
#	DangerousD/GameCore/Managers/GameManager.cs
2023-08-17 12:29:46 +03:00
Timofey06
e54900307d SilosMasterVersion1 2023-08-17 12:20:20 +03:00
c0c87c23f2 Fix map renderer 2023-08-17 12:11:23 +03:00
MARKPRO44
044f2f410e FrankBalls_1 2023-08-17 11:52:37 +03:00
SergoDobro
ea4a2f31fc first steps 2023-08-17 11:49:12 +03:00
bmvolf
adc2d44243 added player death 2023-08-17 11:40:52 +03:00
polten0
d34f541a7d Merge branch 'main' into livingEntitiesHunchMan 2023-08-17 11:22:22 +03:00
polten0
38257457a9 StartSomething 2023-08-17 11:18:22 +03:00
N4K
0ad20e3638 Merge branch 'main' into livingEntitiesVlad 2023-08-17 11:12:57 +03:00
Timofey06
f7ef5e835b FixErrorsInGraficDelegate 2023-08-17 11:11:23 +03:00
Timofey06
590540ab61 FixDelegateInGraficComponent 2023-08-17 11:08:05 +03:00