Commit graph

359 commits

Author SHA1 Message Date
Ivan Filipenkov
3a3542af7e Merge remote-tracking branch 'origin/main' 2023-08-18 01:52:42 +03:00
Ivan Filipenkov
d4b29d7203 GameManager.Remove 2023-08-18 01:52:31 +03:00
bmvolf
621bef7d0a Merge branch 'particlesBranch' 2023-08-18 01:47:29 +03:00
bmvolf
24919cf07f player can shoot 2023-08-18 01:44:29 +03:00
e73e363a78 Merge branch 'DebugMap'
# Conflicts:
#	DangerousD/GameCore/GameObjects/LivingEntities/Player/Player.cs
2023-08-18 01:40:27 +03:00
9c9b2b035e Main map convert to new format 2023-08-18 01:36:16 +03:00
b9f0740c17 Add map god mode 2023-08-18 01:29:21 +03:00
AnloGames
424583837a Pre 3 player support 2023-08-18 01:20:35 +03:00
MARKPRO44
925b03fd3a commit 000 2023-08-18 01:11:17 +03:00
Timofey06
5013d77972 Merge branch 'TimofeyPlan' 2023-08-18 01:07:28 +03:00
Timofey06
dec773d290 CameraAndScaleFix 2023-08-18 01:06:16 +03:00
2deaa74ede Add debug level 2023-08-18 01:05:36 +03:00
N4K
5118ab6305 Merge branch 'main' into livingEntitiesVlad 2023-08-18 00:52:12 +03:00
N4K
839c78d1a4 main merge 2023-08-18 00:50:24 +03:00
gravity
7e3bbd7143 Merge branch 'main' of https://github.com/progtime-net/DangerousD 2023-08-18 00:35:26 +03:00
c786c09639 Merge branch 'main' into DebugMap 2023-08-18 00:35:25 +03:00
ae6aff16a5 Map format change 2023-08-18 00:34:36 +03:00
gravity
2963ac6ac7 HUD 2023-08-18 00:33:01 +03:00
N4K
3962ce4eac spider changes 2023-08-18 00:25:34 +03:00
Ivan Filipenkov
0a9b55800d fix menu font 2023-08-18 00:20:43 +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
bmvolf
e6d0f2b8a0 Merge branch 'livingEntities' 2023-08-17 23:54:56 +03:00
bmvolf
801f0e97d8 updated death 2023-08-17 23:53:50 +03:00
gravity
b848347c56 HUD 2023-08-17 23:46:30 +03:00
Ivan Filipenkov
9a149199ac fix 2023-08-17 23:44:41 +03:00
bmvolf
607d047c6d Merge branch 'main' into livingEntities 2023-08-17 23:32:02 +03:00
bmvolf
14faf8d0a0 Merge branch 'main' into livingEntities 2023-08-17 23:31:15 +03:00
Ivan Filipenkov
dd4a5c7fb2 GameManager.Remove(GameObject) 2023-08-17 22:40:30 +03:00
Ivan Filipenkov
b48bec2d6d fix jump 2023-08-17 22:32:39 +03:00
Ivan Filipenkov
12d44ff9f1 fix debug hud 2023-08-17 22:19:45 +03:00
Ivan Filipenkov
cbdabf794f DebugHUD 2023-08-17 21:53:17 +03:00
Ivan Filipenkov
180fdae2ec fix collisions 2023-08-17 21:31:07 +03:00
gravity
7f981ccd5a ui 2023-08-17 20:58:11 +03:00
gravity
566e42d6d2 Merge branch 'main' of https://github.com/progtime-net/DangerousD 2023-08-17 20:52:11 +03:00
gravity
0f62ed8b33 gui 2023-08-17 20:51:51 +03:00
Kaktus200020
68933de8a9 Merge branch 'main' of https://github.com/progtime-net/DangerousD 2023-08-17 20:14:53 +03:00
Kaktus200020
d1e880eedc PlayerAdding 2023-08-17 20:13:38 +03:00
gravity
d8acf7104a gui 2023-08-17 20:02:59 +03:00
bmvolf
a3d9efdea7 Merge branch 'main' into livingEntities 2023-08-17 20:00:08 +03:00
bmvolf
8bf77eab60 fixed some lags 2023-08-17 19:21:51 +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
AnloGames
d3a0c64596 Some fixes 2023-08-17 18:46:46 +03:00
bmvolf
c1538670ba start work for hanchman 2023-08-17 18:22:43 +03:00
AnloGames
005ce1cfb8 NetworkManager Sound fix 2023-08-17 18:08:33 +03:00
Lev
c206dfe294 higjskzscc 2023-08-17 18:03:48 +03:00