Commit graph

381 commits

Author SHA1 Message Date
bmvolf
4a24a75399 Merge branch 'particlesBranch' 2023-08-18 13:57:41 +03:00
SergoDobro
0f0c553758 Merge branch 'main' into ui_new 2023-08-18 13:57:24 +03:00
bmvolf
5bd2b7d93b started vertical shoot 2023-08-18 13:53:18 +03:00
SergoDobro
f19b02f3bc GUI fixes and merges 2023-08-18 13:37:52 +03:00
AnloGames
c0997c903c LivingEntitySendPositionSupport(ЗОМБИ ХОДЯТ!!!) 2023-08-18 13:35:16 +03:00
Kaktus200020
9a6b2a0856 SlimeMerge 2023-08-18 13:31:15 +03:00
Kaktus200020
ab0947ed69 SlimeJumper 2023-08-18 13:11:49 +03:00
Kaktus200020
8e71a3c732 SlimeJumper 2023-08-18 13:09:34 +03:00
Timofey06
77c6ec9bca AddBossArena 2023-08-18 12:53:44 +03:00
42fdefab1c Merge branch 'main' of github.com:progtime-net/DangerousD 2023-08-18 12:52:18 +03:00
f624c873ff Merge branch 'main' of github.com:progtime-net/DangerousD 2023-08-18 12:51:54 +03:00
338fd044a1 Level 1 fixes 2023-08-18 12:47:53 +03:00
gravity
488a0074f4 HUD 2023-08-18 12:39:06 +03:00
AnloGames
39b9fa9242 Merge branch 'NetworkchangeStateAndMonstersSupport' 2023-08-18 12:34:46 +03:00
SergoDobro
15cc070446 merged menu controls 2023-08-18 12:31:43 +03:00
AnloGames
bed41c5bf0 NetworkAnimationSupport(ChangeState) 2023-08-18 12:30:44 +03:00
SergoDobro
8338f7910c merged sd last fixes 2023-08-18 12:06:07 +03:00
SergoDobro
2d76a9bc14 gunshot fixes 2023-08-18 11:53:23 +03:00
502a7f44c8 Merge branch 'Doors' 2023-08-18 11:52:52 +03:00
bmvolf
dcc845a517 merge commit. Added fix player and monsters 2023-08-18 11:50:24 +03:00
bmvolf
c05d13a68b Merge branch 'particlesBranch' 2023-08-18 11:49:29 +03:00
e2352d7db4 Merge branch 'Doors' of github.com:progtime-net/DangerousD into Doors 2023-08-18 11:47:38 +03:00
bf04d373b9 Door fix 2023-08-18 11:47:24 +03:00
Kaktus200020
333ca5c372 stupidSlime 2023-08-18 11:40:18 +03:00
bmvolf
5db6cee0fa fixed some bags 2023-08-18 11:39:54 +03:00
Timofey06
a0de50ba70 Fix 2023-08-18 11:39:01 +03:00
e263b9d4fc Merge branch 'Door' into Doors 2023-08-18 11:13:37 +03:00
99585effd2 Door render 2023-08-18 11:12:25 +03:00
Kaktus200020
3a6f4b786e Merge branch 'main' into particles 2023-08-18 11:08:39 +03:00
Kaktus200020
34d0a9b64b particlesAlreadyReady 2023-08-18 11:01:47 +03:00
Timofey06
4d8172f3bd ClassDoors 2023-08-18 10:44:46 +03:00
bmvolf
b30a8515d2 Merge branch 'main' into particlesBranch 2023-08-18 10:39:47 +03:00
bmvolf
b8dab6da8a added smoke after shoot 2023-08-18 10:34:41 +03:00
Ivan Filipenkov
088d9cb87c cheats 2023-08-18 10:21:53 +03:00
bmvolf
ae3d9dd65d Merge branch 'main' into particlesBranch 2023-08-18 09:06:14 +03:00
bmvolf
4f54d25f34 Merge branch 'particlesBranch' of https://github.com/progtime-net/DangerousD into particlesBranch 2023-08-18 09:05:29 +03:00
bmvolf
bcab0407a7 error with zombie and attack anmation 2023-08-18 09:04:40 +03:00
Timofey06
5f032d527b Normalize 2023-08-18 05:58:02 +03:00
Timofey06
0bcd6f29cb Merge branch 'main' of https://github.com/progtime-net/DangerousD 2023-08-18 05:56:49 +03:00
Timofey06
2e467120c5 StartWorkingWhithDoors 2023-08-18 05:56:36 +03:00
N4K
c46c2dceb4 Merge branch 'livingEntitiesVlad' 2023-08-18 05:51:35 +03:00
N4K
acc82bd646 fix map file 2023-08-18 05:51:17 +03:00
N4K
26b4c6af23 Merge branch 'main' of https://github.com/progtime-net/DangerousD 2023-08-18 05:48:40 +03:00
N4K
07412ddba1 fix conflicts 2023-08-18 05:46:37 +03:00
SergoDobro
1b9197038b Merge branch 'main' of https://github.com/progtime-net/DangerousD 2023-08-18 05:28:29 +03:00
SergoDobro
64926792c9 Created but not checked triggers 2023-08-18 05:28:09 +03:00
N4K
8372369a48 Merge branch 'main' into livingEntitiesVlad 2023-08-18 05:23:37 +03:00
N4K
8b04dcfe42 Merge branch 'main' of https://github.com/progtime-net/DangerousD 2023-08-18 05:21:06 +03:00
SergoDobro
ea55e2b4f2 Merge branch 'main' of https://github.com/progtime-net/DangerousD 2023-08-18 05:15:50 +03:00
SergoDobro
25ecea60f8 menu ui rework 2023-08-18 05:15:39 +03:00