Commit graph

355 commits

Author SHA1 Message Date
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
Timofey06
4d61e90c30 FixGraficDelegate 2023-08-17 11:03:16 +03:00
bmvolf
1ef6e71ab6 Merge branch 'livingEntities' 2023-08-17 11:01:02 +03:00
bmvolf
68b7481813 edited animations 2023-08-17 10:56:50 +03:00
Timofey06
a2fc6a5db4 StartSilasMaster 2023-08-17 10:53:35 +03:00
N4K
a70a221d49 Merge branch 'livingEntities' into livingEntitiesVlad 2023-08-17 10:47:55 +03:00
SergoDobro
a12a7bad36 settings manager 2023-08-17 10:43:49 +03:00
bmvolf
39848a42ce Merge branch 'main' into livingEntities 2023-08-17 10:43:22 +03:00
N4K
d6b4366b66 animation1 deleted(megakryto) 2023-08-17 10:41:11 +03:00
bmvolf
7cb3a13280 animation1 deleted 2023-08-17 10:33:49 +03:00
bmvolf
ab09c174cf Merge branch 'livingEntitiesVlad' into livingEntities 2023-08-17 10:01:46 +03:00
N4K
3533e2e9ba littleChanges 2023-08-17 09:58:08 +03:00
bmvolf
5e5cc3ef74 edited core enemy 2023-08-17 09:56:55 +03:00
SergoDobro
634a986e70 minoryrefectlring 2023-08-17 02:08:34 +03:00
ced2895873 Fix rendering 2023-08-17 02:00:34 +03:00
SergoDobro
dca6928daf Merge branch 'ui'
# Conflicts:
#	DangerousD/GameCore/Managers/AppManager.cs
2023-08-17 01:16:37 +03:00
SergoDobro
b2755a3e69 minor fixes 2023-08-17 01:06:12 +03:00
SergoDobro
f276bb16db checking sounds 2023-08-17 00:55:45 +03:00
eeae43ebe0 MapManager Fixes(still not working) 2023-08-17 00:43:13 +03:00
polten0
7b16ad9543 createAnimFiles 2023-08-17 00:02:44 +03:00
N4K
403572637a add animations(not all) and monsters(not all) 2023-08-16 23:32:54 +03:00
SergoDobro
87878820af 100 commit! 2023-08-16 23:08:18 +03:00
SergoDobro
e3c9630c83 Merge remote-tracking branch 'origin/ui'
# Conflicts:
#	DangerousD/GameCore/Managers/AppManager.cs
2023-08-16 23:07:19 +03:00
368d08cb41 BIG MapManager commit 2023-08-16 23:06:13 +03:00
MARKPRO44
f4420ea93e OptionsGUI.v.1.1 2023-08-16 22:56:10 +03:00
SergoDobro
44cf28c30a Merge branch 'main' of https://github.com/progtime-net/DangerousD 2023-08-16 21:52:55 +03:00
Timofey06
48106c2bdf AddDelegateOfAnimetionsEnd 2023-08-16 19:34:11 +03:00
gravity
5d1800c90e menu background 2023-08-16 19:31:15 +03:00
e7e18468f4 Merge branch 'main' into MapManager 2023-08-16 19:29:16 +03:00
d0b09baca0 Add MapObjects 2023-08-16 19:25:39 +03:00
Timofey06
d0442c2534 Merge branch 'main' of https://github.com/progtime-net/DangerousD 2023-08-16 19:17:52 +03:00