Commit graph

80 commits

Author SHA1 Message Date
SergoDobro
8338f7910c merged sd last fixes 2023-08-18 12:06:07 +03:00
Kaktus200020
333ca5c372 stupidSlime 2023-08-18 11:40:18 +03:00
Timofey06
5f032d527b Normalize 2023-08-18 05:58:02 +03:00
N4K
acc82bd646 fix map file 2023-08-18 05:51:17 +03:00
N4K
07412ddba1 fix conflicts 2023-08-18 05:46:37 +03:00
N4K
8372369a48 Merge branch 'main' into livingEntitiesVlad 2023-08-18 05:23:37 +03:00
Timofey06
0ff736e29d Merge branch 'Camera' 2023-08-18 05:14:15 +03:00
N4K
0bb77fe09d spider changes 2023-08-18 05:12:32 +03:00
Timofey06
08acf4fd1f FullCamerFixToScale4 2023-08-18 05:11:17 +03:00
AnloGames
a0cb764e11 Another Network Improvment(2 players support) 2023-08-18 04:19:39 +03:00
AnloGames
0681d14f06 Only 2 Players Support 2023-08-18 04:07:28 +03:00
SergoDobro
465fc40562 added cool sign 2023-08-18 03:41:38 +03:00
Kaktus200020
731e69d92e tiltedSlime 2023-08-18 03:03:11 +03:00
ba49674c3b Boss level 2023-08-18 02:13:01 +03:00
AnloGames
424583837a Pre 3 player support 2023-08-18 01:20:35 +03:00
gravity
7e3bbd7143 Merge branch 'main' of https://github.com/progtime-net/DangerousD 2023-08-18 00:35:26 +03:00
gravity
2963ac6ac7 HUD 2023-08-18 00:33:01 +03:00
AnloGames
a1adb49918 Network Fix 2.0 2023-08-18 00:10:42 +03:00
AnloGames
3ec1fa3ab8 GLOBAL NETWORK FIX 2023-08-18 00:03:01 +03:00
gravity
2e4a17edfa HUD 2023-08-18 00:01:16 +03:00
gravity
e67d56d6bf HUD 2023-08-17 23:58:37 +03:00
gravity
5b5fd85436 HUD 2023-08-17 23:55:17 +03:00
gravity
b848347c56 HUD 2023-08-17 23:46:30 +03:00
bmvolf
14faf8d0a0 Merge branch 'main' into livingEntities 2023-08-17 23:31:15 +03:00
Ivan Filipenkov
cbdabf794f DebugHUD 2023-08-17 21:53:17 +03:00
gravity
d8acf7104a gui 2023-08-17 20:02:59 +03:00
gravity
7ea6e46775 Merge branch 'ui' of https://github.com/progtime-net/DangerousD into ui 2023-08-17 19:18:23 +03:00
gravity
66dc9f0c7f gui 2023-08-17 19:15:39 +03:00
N4K
cbcffe8d48 fixbugs 2023-08-17 17:36:29 +03:00
N4K
086c0a94e9 monsters-main merge 2023-08-17 17:28:23 +03:00
Timofey06
a327e1b480 mega slime merge 2023-08-17 17:11:49 +03:00
Timofey06
b8367d3a75 Merge branch 'MapManager' 2023-08-17 15:00:58 +03:00
AnloGames
7fee10dd29 Network List Of tasks Support 2023-08-17 14:31:20 +03:00
gravity
4ffae54437 gui 2023-08-17 13:21:21 +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
N4K
116dc8ecc5 Merge branch 'main' into livingEntitiesVlad 2023-08-17 13:08:41 +03:00
AnloGames
ccc6937ac9 NetworkFix 2023-08-17 12:50:20 +03:00
AnloGames
1ea1113bfb MergeFixCommit 2023-08-17 12:41:13 +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
c0c87c23f2 Fix map renderer 2023-08-17 12:11:23 +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
bmvolf
68b7481813 edited animations 2023-08-17 10:56:50 +03:00
SergoDobro
634a986e70 minoryrefectlring 2023-08-17 02:08: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