Commit graph

371 commits

Author SHA1 Message Date
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
rawer470
c1d2a6b210 StartCreateLogicMultiPlayer2 2024-08-17 11:10:17 +03:00
bbc1a88571 Tried to fix map rendering issues 2024-08-17 10:58:46 +03:00
polten0
4d178a6aa2
Merge pull request #40 from progtime-net/fix1
fix1
2024-08-17 10:53:50 +03:00
45d71a8482
Merge pull request #41 from progtime-net/ServerBranch2
Server branch2
2024-08-17 10:53:33 +03:00
polten0
9f7c69fa4f
Merge branch 'Development' into fix1 2024-08-17 10:53:26 +03:00
2324310068
Merge branch 'Development' into ServerBranch2 2024-08-17 10:53:24 +03:00
polten0
557c371222 fix1 2024-08-17 10:50:20 +03:00
rawer470
f6663bdd3c StartCreateLogicMultiPlayer 2024-08-17 10:50:05 +03:00
dbabd56119
Merge pull request #39 from progtime-net/hot_fix2
hot fix with build
2024-08-17 10:43:12 +03:00
polten0
495381d7ca hot fix with build 2024-08-17 10:37:30 +03:00
79c5213c1b
Merge pull request #38 from progtime-net/Interactable
Interactable
2024-08-17 10:34:22 +03:00
18c2b3f54f
Merge branch 'Development' into Interactable 2024-08-17 10:34:13 +03:00
0abca86e03 Fix paths 2024-08-17 10:32:48 +03:00
SergoDobro
d710866da5 Merge branch 'Development' of github.com:progtime-net/ZoFo into Development 2024-08-17 10:07:32 +03:00
SergoDobro
aed8016bfd First animations, prepared for addition of new animations 2024-08-17 10:07:21 +03:00
c5ac15987c Add Door, reverse play of animation 2024-08-17 10:04:53 +03:00
polten0
450e8d28b0
Merge pull request #37 from progtime-net/hot_fix2
fix 2, removed blue lines, but still glitching tiles
2024-08-17 03:09:11 +03:00
polten0
bd9842cc8e
Merge branch 'Development' into hot_fix2 2024-08-17 03:09:04 +03:00
polten0
b4154bdb16 fix 2, removed blue lines, but still glitching tiles 2024-08-17 03:06:43 +03:00
rawer470
b1f24ce81b WorkServerWithGUI2 2024-08-17 01:43:50 +03:00
23ee2b79a6 Fix tilsets path on linux 2024-08-17 01:31:49 +03:00
polten0
5a73ca2e31
Merge pull request #36 from progtime-net/hot_fix2
fixed loadMap
2024-08-17 01:21:37 +03:00
rawer470
a644d6c02a WorkServerWithGUI 2024-08-17 01:18:46 +03:00
c4f34a6d8a
Merge pull request #35 from progtime-net/Interactable
Interactable
2024-08-17 01:14:17 +03:00
a811021e7c
Merge branch 'Development' into Interactable 2024-08-17 01:14:07 +03:00