Commit graph

296 commits

Author SHA1 Message Date
Kaktus200020
ab0947ed69 SlimeJumper 2023-08-18 13:11:49 +03:00
Kaktus200020
8e71a3c732 SlimeJumper 2023-08-18 13:09:34 +03:00
Kaktus200020
333ca5c372 stupidSlime 2023-08-18 11:40:18 +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
Ivan Filipenkov
088d9cb87c cheats 2023-08-18 10:21:53 +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
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
Kaktus200020
9585b85f70 - 2023-08-18 04:27:40 +03:00
Kaktus200020
7b45a41dc1 ParticlesReady 2023-08-18 04:22:29 +03:00
AnloGames
6229d7dda4 merge commit 2023-08-18 04:19:55 +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
bmvolf
f26c88ffdc nightCommit 2023-08-18 03:16:42 +03:00
Kaktus200020
731e69d92e tiltedSlime 2023-08-18 03:03:11 +03:00
Timofey06
dd6728967f Merge branch 'SilasMaster' 2023-08-18 03:02:27 +03:00
Timofey06
c9523578e4 SilasCommit 2023-08-18 02:59:53 +03:00
Ivan Filipenkov
e7c375d9e7 ladders somewhat work 2023-08-18 02:27:44 +03:00
bmvolf
5f36ee7b79 edited player 2023-08-18 02:19:11 +03:00
ba49674c3b Boss level 2023-08-18 02:13:01 +03:00
Ivan Filipenkov
52b404c9db laaaaaaaaaadder 2023-08-18 01:58:34 +03:00
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