Commit graph

245 commits

Author SHA1 Message Date
rawer470
6c07557deb FixGetIp 2024-08-17 19:02:02 +03:00
rawer470
d95c65c12c SwitchOnServer 2024-08-17 14:03:06 +03:00
rawer470
2cce4ea9b9 CreateConnectMultiplayer 2024-08-17 12:25:53 +03:00
rawer470
3849435115 MbReadyMultiPlayer 2024-08-17 11:24:12 +03:00
rawer470
215b538715 StartCreateLogicMultiPlayer3 2024-08-17 11:13:13 +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
58d6627af9 Add summary 2024-08-17 01:13:02 +03:00
SergoDobro
b3f804ead4 Merge branch 'Development' of github.com:progtime-net/ZoFo into Development 2024-08-17 01:11:26 +03:00
SergoDobro
bca2a30c65 minor fixes 2024-08-17 01:11:08 +03:00
polten0
539f8f3021 fixed loadMap 2024-08-17 01:11:07 +03:00
540727f071 Add updates for interaction 2024-08-17 00:59:41 +03:00
gravitymm
ade9645360
Merge pull request #34 from progtime-net/GUI
G UI
2024-08-17 00:40:18 +03:00
dvaer
a453ba9990 werge rranch 'GUI' of github.com:progtime-net/ZoFo into GUI 2024-08-17 00:30:34 +03:00
dvaer
2beb47597b HotFix 2024-08-17 00:25:46 +03:00
gravitymm
b9d32f2567
Merge pull request #33 from progtime-net/GUI
GUI
2024-08-17 00:12:04 +03:00
gravitymm
2bca370fe1
Merge branch 'Development' into GUI 2024-08-17 00:11:37 +03:00
dvaer
8f17932f0b GUI 2024-08-17 00:02:36 +03:00
4d6c32bd37 Fix server 2024-08-16 23:52:51 +03:00
SergoDobro
5e2666fbd5 bug fix 2024-08-16 23:50:59 +03:00
7bce47259c Merge branch 'refs/heads/Development' into Interactable 2024-08-16 23:44:17 +03:00
684033ce6f Merge remote-tracking branch 'origin/Development' into Development 2024-08-16 23:42:44 +03:00
af5253146a Merge pull request #31 from progtime-net/UpdateEntity
add register game objects
2024-08-16 23:42:18 +03:00
ea08cc83c2
Merge pull request #31 from progtime-net/UpdateEntity
add register game objects
2024-08-16 23:38:43 +03:00
505565f6f4
Merge branch 'Development' into UpdateEntity 2024-08-16 23:38:35 +03:00
ceb10ce7c4
Merge pull request #32 from progtime-net/ServerBranch
ChangeHierarchyUpdateClasses
2024-08-16 23:37:45 +03:00
e594049c0d
Merge branch 'Development' into ServerBranch 2024-08-16 23:37:36 +03:00