Commit graph

progtime/ZoFo

Fork 0

22ce0fd58f Add deleteObject Mootfrost777 2024-08-17 18:21:15 +03:00
f9aaacd3d0

Merge pull request #46 from progtime-net/map_load_collisions Andrey 2024-08-17 18:16:37 +03:00
dc3dd2d37b фикс namespace polten0 2024-08-17 18:12:34 +03:00
ec550ea093 Add wood dummy Mootfrost777 2024-08-17 18:07:12 +03:00
9078c650d4 finish collision processing polten0 2024-08-17 18:06:29 +03:00
19a7676b1d Fix namespaces, add collectable Mootfrost777 2024-08-17 17:57:04 +03:00
d95c65c12c SwitchOnServer rawer470 2024-08-17 14:03:06 +03:00
2cce4ea9b9 CreateConnectMultiplayer rawer470 2024-08-17 12:25:53 +03:00
74ec7f4deb merge5 MARKPRO44 2024-08-17 12:23:12 +03:00
9107490279 Sounds MARKPRO44 2024-08-17 12:21:00 +03:00
fcc8fac8ea Fix mouse and hud drawing Mootfrost777 2024-08-17 12:16:39 +03:00
4d67061a2b Sounds MARKPRO44 2024-08-17 12:14:49 +03:00
34fbd7f67e Sounds MARKPRO44 2024-08-17 12:12:51 +03:00
81ab544d11

Merge pull request #45 from progtime-net/UpdateEntity Andrey 2024-08-17 12:12:24 +03:00
3fad775cb2

Merge branch 'Development' into UpdateEntity Andrey 2024-08-17 12:12:16 +03:00
60b71efb09 create inputMamager Lev 2024-08-17 12:10:25 +03:00
3784e24497

Merge pull request #44 from progtime-net/FixSound Andrey 2024-08-17 12:08:49 +03:00
65bcbfa64f

Merge pull request #43 from progtime-net/StepAnimation Andrey 2024-08-17 12:05:32 +03:00
c1196e6c0a Merge remote-tracking branch 'origin/StepAnimation' into StepAnimation Mootfrost777 2024-08-17 12:03:37 +03:00
faaaa36b5c feat: StepAnimation Mootfrost777 2024-08-17 12:02:20 +03:00
114f546c31 FinalFix Kaktus200020 2024-08-17 11:52:54 +03:00
0a19331a38 Merge branch 'Development' of github.com:progtime-net/ZoFo into Development SergoDobro 2024-08-17 11:52:00 +03:00
20a25d5c8b minor changes + examples of animations SergoDobro 2024-08-17 11:51:54 +03:00
572d784fc3

Merge pull request #42 from progtime-net/Collision Andrey 2024-08-17 11:37:04 +03:00
1b77e35c32 Resolve issues PetrKu09 2024-08-17 11:36:18 +03:00
3849435115 MbReadyMultiPlayer rawer470 2024-08-17 11:24:12 +03:00
72bfd52ae5 Start resolving issues Mootfrost777 2024-08-17 11:22:38 +03:00
18cb8fbae6 Merge branch 'refs/heads/Development' into Collision Mootfrost777 2024-08-17 11:18:45 +03:00
11568f7fb2 Refactor WIP Mootfrost777 2024-08-17 11:16:18 +03:00
215b538715 StartCreateLogicMultiPlayer3 rawer470 2024-08-17 11:13:13 +03:00
997f5db24a CheckComponentCollision normak version PetrKu09 2024-08-17 11:12:27 +03:00
c1d2a6b210 StartCreateLogicMultiPlayer2 rawer470 2024-08-17 11:10:17 +03:00
bbc1a88571 Tried to fix map rendering issues Mootfrost777 2024-08-17 10:58:46 +03:00
4d178a6aa2

Merge pull request #40 from progtime-net/fix1 polten0 2024-08-17 10:53:50 +03:00
45d71a8482

Merge pull request #41 from progtime-net/ServerBranch2 Andrey 2024-08-17 10:53:33 +03:00
9f7c69fa4f

Merge branch 'Development' into fix1 polten0 2024-08-17 10:53:26 +03:00
2324310068

Merge branch 'Development' into ServerBranch2 Andrey 2024-08-17 10:53:24 +03:00
557c371222 fix1 polten0 2024-08-17 10:50:20 +03:00
f6663bdd3c StartCreateLogicMultiPlayer rawer470 2024-08-17 10:50:05 +03:00
dbabd56119

Merge pull request #39 from progtime-net/hot_fix2 Andrey 2024-08-17 10:43:12 +03:00
495381d7ca hot fix with build polten0 2024-08-17 10:37:30 +03:00
79c5213c1b

Merge pull request #38 from progtime-net/Interactable Andrey 2024-08-17 10:34:22 +03:00
18c2b3f54f

Merge branch 'Development' into Interactable Andrey 2024-08-17 10:34:13 +03:00
0abca86e03 Fix paths Mootfrost777 2024-08-17 10:32:48 +03:00
d710866da5 Merge branch 'Development' of github.com:progtime-net/ZoFo into Development SergoDobro 2024-08-17 10:07:32 +03:00
aed8016bfd First animations, prepared for addition of new animations SergoDobro 2024-08-17 10:07:21 +03:00
c5ac15987c Add Door, reverse play of animation Mootfrost777 2024-08-17 10:04:53 +03:00
450e8d28b0

Merge pull request #37 from progtime-net/hot_fix2 polten0 2024-08-17 03:09:11 +03:00
bd9842cc8e

Merge branch 'Development' into hot_fix2 polten0 2024-08-17 03:09:04 +03:00
b4154bdb16 fix 2, removed blue lines, but still glitching tiles polten0 2024-08-17 03:06:43 +03:00
b1f24ce81b WorkServerWithGUI2 rawer470 2024-08-17 01:43:50 +03:00
23ee2b79a6 Fix tilsets path on linux Mootfrost777 2024-08-17 01:31:49 +03:00
5a73ca2e31

Merge pull request #36 from progtime-net/hot_fix2 polten0 2024-08-17 01:21:37 +03:00
a644d6c02a WorkServerWithGUI rawer470 2024-08-17 01:18:46 +03:00
c4f34a6d8a

Merge pull request #35 from progtime-net/Interactable Andrey 2024-08-17 01:14:17 +03:00
a811021e7c

Merge branch 'Development' into Interactable Andrey 2024-08-17 01:14:07 +03:00
58d6627af9 Add summary Mootfrost777 2024-08-17 01:13:02 +03:00
b3f804ead4 Merge branch 'Development' of github.com:progtime-net/ZoFo into Development SergoDobro 2024-08-17 01:11:26 +03:00
bca2a30c65 minor fixes SergoDobro 2024-08-17 01:11:08 +03:00
539f8f3021 fixed loadMap polten0 2024-08-17 01:11:07 +03:00
540727f071 Add updates for interaction Mootfrost777 2024-08-17 00:59:41 +03:00
fd55b579fb HotFix dvaer 2024-08-17 00:48:59 +03:00
ade9645360

Merge pull request #34 from progtime-net/GUI gravitymm 2024-08-17 00:40:18 +03:00
a453ba9990 werge rranch 'GUI' of github.com:progtime-net/ZoFo into GUI dvaer 2024-08-17 00:30:34 +03:00
2beb47597b HotFix dvaer 2024-08-17 00:25:46 +03:00
b9d32f2567

Merge pull request #33 from progtime-net/GUI gravitymm 2024-08-17 00:12:04 +03:00
2bca370fe1

Merge branch 'Development' into GUI gravitymm 2024-08-17 00:11:37 +03:00
8f17932f0b GUI dvaer 2024-08-17 00:02:36 +03:00
4d6c32bd37 Fix server Mootfrost777 2024-08-16 23:52:51 +03:00
5e2666fbd5 bug fix SergoDobro 2024-08-16 23:50:59 +03:00
7bce47259c Merge branch 'refs/heads/Development' into Interactable Mootfrost777 2024-08-16 23:44:17 +03:00
684033ce6f Merge remote-tracking branch 'origin/Development' into Development Mootfrost777 2024-08-16 23:42:44 +03:00
af5253146a Merge pull request #31 from progtime-net/UpdateEntity Andrey 2024-08-16 23:38:43 +03:00
ea08cc83c2

Merge pull request #31 from progtime-net/UpdateEntity Andrey 2024-08-16 23:38:43 +03:00
505565f6f4

Merge branch 'Development' into UpdateEntity Andrey 2024-08-16 23:38:35 +03:00
ceb10ce7c4

Merge pull request #32 from progtime-net/ServerBranch Andrey 2024-08-16 23:37:45 +03:00
e594049c0d

Merge branch 'Development' into ServerBranch Andrey 2024-08-16 23:37:36 +03:00
d8144c22c1 Add door Mootfrost777 2024-08-16 23:31:09 +03:00
b0f9bbdeec Add Interatable class Mootfrost777 2024-08-16 23:12:12 +03:00
a2df1b746a ChangeHierarchyUpdateClasses rawer470 2024-08-16 22:11:10 +03:00
dc238315e9 pull2 MARKPRO44 2024-08-16 22:07:50 +03:00
d9bb9e053b pull MARKPRO44 2024-08-16 22:06:36 +03:00
e9698a8669 Added basic drawing, temporary removed data sending in SendData SergoDobro 2024-08-16 22:01:41 +03:00
9882de9308 Add Register Collision v2 PetrKu09 2024-08-16 19:24:54 +03:00
fc3af23d69 Merge branch 'master' of github.com:progtime-net/ZoFo Mootfrost777 2024-08-16 19:19:28 +03:00
cf630924bc Update architecture Mootfrost777 2024-08-16 19:16:32 +03:00
8bf1bff778 COnnected maploader and objects creation + mapobject fix + graphicsDeviceFix SergoDobro 2024-08-16 18:21:50 +03:00
eef6e038b8 add register game objects Lev 2024-08-16 18:06:51 +03:00
2ff38cf990 Single MARKPRO44 2024-08-16 18:02:40 +03:00
5ef0a660cc

Merge pull request #30 from progtime-net/map_fix polten0 2024-08-16 17:46:10 +03:00
906cca843d hot fix on map load polten0 2024-08-16 17:44:06 +03:00
1ca4f29729

Merge pull request #29 from progtime-net/UpdateSettings Kaktus200020 2024-08-16 16:46:20 +03:00
bafd19b78e

Merge branch 'Development' into UpdateSettings Kaktus200020 2024-08-16 16:46:08 +03:00
cd9da3fb61 FinalUpdate Kaktus200020 2024-08-16 16:41:48 +03:00
5a5d48ac07

Merge pull request #28 from progtime-net/map SergoDobro 2024-08-16 16:32:52 +03:00
4654dc0d5c hot fix, check StopObject polten0 2024-08-16 16:23:42 +03:00
4c765c46f0 hot fix polten0 2024-08-16 16:20:18 +03:00
651b43b8d1 Добавил создание обьектов из карты polten0 2024-08-16 16:19:36 +03:00
37b8623b6c

Merge pull request #27 from progtime-net/ServerBranch SergoDobro 2024-08-16 15:42:00 +03:00
91d15a9de5 ClirntReadyDataSend rawer470 2024-08-16 15:39:58 +03:00