|
|
ae6aff16a5
|
Map format change
|
2023-08-18 00:34:36 +03:00 |
|
Ivan Filipenkov
|
cbdabf794f
|
DebugHUD
|
2023-08-17 21:53:17 +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 |
|
gravity
|
66dc9f0c7f
|
gui
|
2023-08-17 19:15:39 +03:00 |
|
N4K
|
086c0a94e9
|
monsters-main merge
|
2023-08-17 17:28:23 +03:00 |
|
Timofey06
|
a327e1b480
|
mega slime merge
|
2023-08-17 17:11:49 +03:00 |
|
N4K
|
a21ef22451
|
little changes
|
2023-08-17 16:41:16 +03:00 |
|
Kaktus200020
|
9f6b6fd16a
|
slimeReadyMaybe
|
2023-08-17 16:40:33 +03:00 |
|
|
|
591bdf24b6
|
Add player to map
|
2023-08-17 15:15:24 +03:00 |
|
Timofey06
|
b8367d3a75
|
Merge branch 'MapManager'
|
2023-08-17 15:00:58 +03:00 |
|
Timofey06
|
ea0506beec
|
SilasAlgorimVersion1End
|
2023-08-17 14:32:14 +03:00 |
|
gravity
|
144a6fdfe7
|
gui
|
2023-08-17 13:16:13 +03:00 |
|
|
|
0614b8348a
|
Add InstantiateEntities
|
2023-08-17 13:12:09 +03:00 |
|
Timofey06
|
232c8b309d
|
MergeWithBoss
|
2023-08-17 12:40:23 +03:00 |
|
|
|
bb86eee1b2
|
Merge remote-tracking branch 'origin/main' into MapManager
# Conflicts:
# DangerousD/Content/Content.mgcb
# DangerousD/GameCore/Levels/Level1.cs
# DangerousD/GameCore/Managers/AppManager.cs
# DangerousD/GameCore/Managers/GameManager.cs
|
2023-08-17 12:29:46 +03:00 |
|
Timofey06
|
e54900307d
|
SilosMasterVersion1
|
2023-08-17 12:20:20 +03:00 |
|
|
|
c0c87c23f2
|
Fix map renderer
|
2023-08-17 12:11:23 +03:00 |
|
Timofey06
|
a2fc6a5db4
|
StartSilasMaster
|
2023-08-17 10:53:35 +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 |
|
SergoDobro
|
f276bb16db
|
checking sounds
|
2023-08-17 00:55:45 +03:00 |
|
|
|
eeae43ebe0
|
MapManager Fixes(still not working)
|
2023-08-17 00:43:13 +03:00 |
|
N4K
|
403572637a
|
add animations(not all) and monsters(not all)
|
2023-08-16 23:32:54 +03:00 |
|
SergoDobro
|
e3c9630c83
|
Merge remote-tracking branch 'origin/ui'
# Conflicts:
# DangerousD/GameCore/Managers/AppManager.cs
|
2023-08-16 23:07:19 +03:00 |
|
gravity
|
5d1800c90e
|
menu background
|
2023-08-16 19:31:15 +03:00 |
|
|
|
e7e18468f4
|
Merge branch 'main' into MapManager
|
2023-08-16 19:29:16 +03:00 |
|
|
|
d0b09baca0
|
Add MapObjects
|
2023-08-16 19:25:39 +03:00 |
|
Timofey06
|
99fe39c2c5
|
SilasHand
|
2023-08-16 18:50:58 +03:00 |
|
Lev
|
913403fdcb
|
Merge branch 'main' of https://github.com/progtime-net/DangerousD
|
2023-08-16 18:03:18 +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 |
|
Kaktus200020
|
dff21f0484
|
CreateRayCast
|
2023-08-16 17:10:50 +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
|
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 |
|
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 |
|
N4K
|
4d8adebf69
|
wip
|
2023-08-15 18:49:05 +03:00 |
|
bmvolf
|
d65320f21b
|
added zombie walk and attack animation
|
2023-08-15 18:17:26 +03:00 |
|
gravity
|
bb24f6d7e6
|
ui
|
2023-08-15 17:47:33 +03:00 |
|
gravity
|
14a5b445a1
|
ui
|
2023-08-15 17:31:55 +03:00 |
|
bmvolf
|
03e6f7b75d
|
WIP
|
2023-08-15 17:21:03 +03:00 |
|
bmvolf
|
f2a6cdbd8d
|
wip
|
2023-08-15 17:20:14 +03:00 |
|
