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 |
|
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 |
|
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 |
|
gravity
|
52743c1f89
|
add menuGUI
|
2023-08-16 17:31:54 +03:00 |
|
bmvolf
|
ff46f3694a
|
added death animation from zombie. zombie can walk between 2 points
|
2023-08-16 17:21:45 +03:00 |
|
gravity
|
50edd04b14
|
ui
|
2023-08-16 17:14:37 +03:00 |
|
SergoDobro
|
9f8e7bcbd4
|
minor naming fixes with network
|
2023-08-16 17:14:21 +03:00 |
|
Kaktus200020
|
dff21f0484
|
CreateRayCast
|
2023-08-16 17:10:50 +03:00 |
|
AnloGames
|
c875c50407
|
NetworkManagerJsonMerge
|
2023-08-16 16:50:26 +03:00 |
|
AnloGames
|
d147223eeb
|
Merge branch 'NetworkJsonSupport'
|
2023-08-16 16:49:40 +03:00 |
|
gravity
|
de62568872
|
ui
|
2023-08-16 16:19:07 +03:00 |
|
SergoDobro
|
82e4dcc1c4
|
added GameObject to OnCollision
|
2023-08-16 15:49:48 +03:00 |
|
SergoDobro
|
9e3c0f09ad
|
fixed physics
|
2023-08-16 15:46:12 +03:00 |
|
N4K
|
3b79ff9baf
|
Merge branch 'livingEntities' into livingEntitiesVlad
|
2023-08-16 15:21:14 +03:00 |
|
N4K
|
8713898e49
|
HappyNarezkaAnimations
|
2023-08-16 15:14:37 +03:00 |
|
SergoDobro
|
5a5a24dffd
|
minor changes and fixes, waiting for physics fix
|
2023-08-16 15:08:55 +03:00 |
|
AnloGames
|
ef5483a917
|
NetworkTask First Result
|
2023-08-16 14:54:03 +03:00 |
|
SergoDobro
|
a3b2fb2b81
|
minor changes during day
|
2023-08-16 14:48:44 +03:00 |
|
SergoDobro
|
5aa906a66b
|
Merge remote-tracking branch 'origin/livingEntities'
# Conflicts:
# DangerousD/Content/Content.mgcb
# DangerousD/Content/MonstersAnimations.png
# DangerousD/Content/animation1.png
# DangerousD/GameCore/GameObjects/LivingEntities/CoreEnemy.cs
# DangerousD/GameCore/GameObjects/LivingEntities/Monsters/Zombie.cs
|
2023-08-16 14:42:41 +03:00 |
|
AnloGames
|
4fd28308f2
|
NetworkTask init
|
2023-08-16 13:56:25 +03:00 |
|
bmvolf
|
4925b11ab3
|
try to move enemy
|
2023-08-16 13:36:57 +03:00 |
|
bmvolf
|
8815d65e85
|
Merge branch 'livingEntitiesVlad' into livingEntities
|
2023-08-16 13:24:33 +03:00 |
|
N4K
|
dd17d0148f
|
monstersClasses
|
2023-08-16 13:21:38 +03:00 |
|
SergoDobro
|
13a6f05475
|
merge fixes, minor monster fixes, physics to be remade very soon
|
2023-08-16 13:09:35 +03:00 |
|
SergoDobro
|
18d8ff814d
|
Merge remote-tracking branch 'origin/livingEntitiesVlad'
|
2023-08-16 12:21:18 +03:00 |
|
SergoDobro
|
e944a972d6
|
Merge remote-tracking branch 'origin/livingEntities'
# Conflicts:
# DangerousD/GameCore/GameObjects/Entity.cs
|
2023-08-16 09:58:18 +03:00 |
|
bmvolf
|
15f0571790
|
fixed errors zombie
|
2023-08-16 09:54:15 +03:00 |
|
SergoDobro
|
7bdde33394
|
added PhysicsManager to gamemanager
|
2023-08-16 00:42:57 +03:00 |
|
Lev
|
fc4ce31703
|
Merge branch 'main' of https://github.com/progtime-net/DangerousD
|
2023-08-15 19:32:58 +03:00 |
|