Commit graph

496 commits

Author SHA1 Message Date
MARKPRO44
b105f67df2 FixServer 2024-08-17 21:22:18 +03:00
SergoDobro
2503173729 fastFix 2024-08-17 20:16:16 +03:00
unknown
c8108d6781 PlayerWeaponAFK 2024-08-17 20:14:55 +03:00
SergoDobro
96e6e37b56 minor fixes and cleaning 2024-08-17 20:12:25 +03:00
Levbegining
754a529d4a
Merge pull request #50 from progtime-net/Development
Development
2024-08-17 20:08:36 +03:00
SergoDobro
a2ea37f1ba
Merge pull request #49 from progtime-net/Development
Development
2024-08-17 20:00:08 +03:00
SergoDobro
30d663b278
Merge branch 'Collision' into Development 2024-08-17 19:58:04 +03:00
PetrKu09
d0dc0c4714 Add CollisionComponent designer 2024-08-17 19:50:47 +03:00
SergoDobro
8358be3a40 disabled Map 2024-08-17 19:48:33 +03:00
Lev
c9d766242f add vectors in UpdateInput, add event ActionEvent and Subscribing to the actions of the input manager 2024-08-17 19:42:55 +03:00
Kaktus200020
9e00e4d05d LootData 2024-08-17 19:36:30 +03:00
ae050576d5 Fix start 2024-08-17 19:32:12 +03:00
unknown
f43411c840 AddFirstFilePNG 2024-08-17 19:16:17 +03:00
89978f0fc3 fix: content and usings 2024-08-17 19:13:46 +03:00
SergoDobro
d8a278d2e4
Merge pull request #48 from progtime-net/MinorFixesAndConnections
minor overall
2024-08-17 19:02:09 +03:00
rawer470
6c07557deb FixGetIp 2024-08-17 19:02:02 +03:00
SergoDobro
48e4864030
Merge branch 'Development' into MinorFixesAndConnections 2024-08-17 19:01:25 +03:00
2a5dde0169
Merge pull request #47 from progtime-net/Colleclables
Colleclables
2024-08-17 18:59:32 +03:00
SergoDobro
5a6d56128c minor overall 2024-08-17 18:58:49 +03:00
22ce0fd58f Add deleteObject 2024-08-17 18:21:15 +03:00
f9aaacd3d0
Merge pull request #46 from progtime-net/map_load_collisions
Закончил загрузку коллизий
2024-08-17 18:16:37 +03:00
polten0
dc3dd2d37b фикс namespace 2024-08-17 18:12:34 +03:00
ec550ea093 Add wood dummy 2024-08-17 18:07:12 +03:00
polten0
9078c650d4 finish collision processing 2024-08-17 18:06:29 +03:00
19a7676b1d Fix namespaces, add collectable 2024-08-17 17:57:04 +03:00
rawer470
d95c65c12c SwitchOnServer 2024-08-17 14:03:06 +03:00
rawer470
2cce4ea9b9 CreateConnectMultiplayer 2024-08-17 12:25:53 +03:00
MARKPRO44
74ec7f4deb merge5 2024-08-17 12:23:12 +03:00
MARKPRO44
9107490279 Sounds 2024-08-17 12:21:00 +03:00
fcc8fac8ea Fix mouse and hud drawing 2024-08-17 12:16:39 +03:00
MARKPRO44
4d67061a2b Sounds 2024-08-17 12:14:49 +03:00
MARKPRO44
34fbd7f67e Sounds 2024-08-17 12:12:51 +03:00
81ab544d11
Merge pull request #45 from progtime-net/UpdateEntity
create inputMamager
2024-08-17 12:12:24 +03:00
3fad775cb2
Merge branch 'Development' into UpdateEntity 2024-08-17 12:12:16 +03:00
Lev
60b71efb09 create inputMamager 2024-08-17 12:10:25 +03:00
3784e24497
Merge pull request #44 from progtime-net/FixSound
FinalFix
2024-08-17 12:08:49 +03:00
65bcbfa64f
Merge pull request #43 from progtime-net/StepAnimation
Step animation
2024-08-17 12:05:32 +03:00
c1196e6c0a Merge remote-tracking branch 'origin/StepAnimation' into StepAnimation
# Conflicts:
#	ZoFo/GameCore/Graphics/GraphicsComponent.cs
2024-08-17 12:03:37 +03:00
faaaa36b5c feat: StepAnimation 2024-08-17 12:02:20 +03:00
Kaktus200020
114f546c31 FinalFix 2024-08-17 11:52:54 +03:00
SergoDobro
0a19331a38 Merge branch 'Development' of github.com:progtime-net/ZoFo into Development 2024-08-17 11:52:00 +03:00
SergoDobro
20a25d5c8b minor changes + examples of animations 2024-08-17 11:51:54 +03:00
572d784fc3
Merge pull request #42 from progtime-net/Collision
Collision
2024-08-17 11:37:04 +03:00
PetrKu09
1b77e35c32 Resolve issues 2024-08-17 11:36:18 +03:00
rawer470
3849435115 MbReadyMultiPlayer 2024-08-17 11:24:12 +03:00
72bfd52ae5 Start resolving issues 2024-08-17 11:22:38 +03:00
18cb8fbae6 Merge branch 'refs/heads/Development' into Collision
# Conflicts:
#	ZoFo/GameCore/GameManagers/CollisionManager/CollisionManager.cs
2024-08-17 11:18:45 +03:00
11568f7fb2 Refactor WIP 2024-08-17 11:16:18 +03:00
rawer470
215b538715 StartCreateLogicMultiPlayer3 2024-08-17 11:13:13 +03:00
PetrKu09
997f5db24a CheckComponentCollision normak version 2024-08-17 11:12:27 +03:00