Commit graph

143 commits

Author SHA1 Message Date
bmvolf
06be965359 started huch animation 2023-08-17 16:10:20 +03:00
bmvolf
0a2e3d6b1f player animation changed 2023-08-17 15:27:10 +03:00
bmvolf
71dc642a1d started work wirk with player 2023-08-17 15:10:08 +03:00
bmvolf
9568f313fd merge commit 2023-08-17 13:24:03 +03:00
bmvolf
594da62dfa for merge to main 2023-08-17 13:21:12 +03:00
Lev
ba4466d966 Merge branch 'main' of https://github.com/progtime-net/DangerousD 2023-08-17 13:20:08 +03:00
Lev
d7a4772fe4 Fix RayCast 2023-08-17 13:19:58 +03:00
bmvolf
412239498e Merge branch 'main' into livingEntities 2023-08-17 13:18:41 +03:00
SergoDobro
6b40bbe881 fixes 2023-08-17 13:14:14 +03:00
AnloGames
62a32ccdce TryCatchNetworkFix 2023-08-17 13:05:43 +03:00
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
AnloGames
1cfebd30bb Login And Sound Network Pripilivanie 2023-08-17 12:35:26 +03:00
Timofey06
e54900307d SilosMasterVersion1 2023-08-17 12:20:20 +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
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
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
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
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
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
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
Timofey06
d0442c2534 Merge branch 'main' of https://github.com/progtime-net/DangerousD 2023-08-16 19:17:52 +03:00
Timofey06
469050e4cd NewPeregruzkaDlyDraw 2023-08-16 19:17:10 +03:00
Timofey06
99fe39c2c5 SilasHand 2023-08-16 18:50:58 +03:00
SergoDobro
306305e449 cool game name 2023-08-16 18:48:41 +03:00
Lev
913403fdcb Merge branch 'main' of https://github.com/progtime-net/DangerousD 2023-08-16 18:03:18 +03:00
Lev
d2bbdf5a49 Merge branch 'RayCast' 2023-08-16 17:59:51 +03:00
Lev
6dab4794b0 RayCast с одной перегрузкой 2023-08-16 17:58:27 +03:00