Commit graph

60 commits

Author SHA1 Message Date
PetrKu09
16a40586e7 Add meet into CheckComponentCollision and Create UpdateComponentCollision 2024-08-15 17:06:12 +03:00
PetrKu09
86d83e8387 Create CheckComponentCollision and meet into her 2024-08-15 16:32:32 +03:00
PetrKu09
7dbe12e034 Create CheckComponentCollision 2024-08-15 16:07:30 +03:00
PetrKu09
3d9e37d10a Merge branch 'Development' of github.com:progtime-net/ZoFo into Development 2024-08-15 15:10:45 +03:00
PetrKu09
362c72439f great merge dev and CollisionManager 2024-08-15 15:09:17 +03:00
SergoDobro
4859adadd2
Merge pull request #1 from progtime-net/NetworkManagerDev
Network manager dev
2024-08-15 14:40:14 +03:00
SergoDobro
1fcb3d5692
Merge pull request #3 from progtime-net/MapProcessing
Подготовка в карты, мержим структуры карты.
2024-08-15 14:37:56 +03:00
Ilya
2d84270589 Add macos mgcb fix script 2024-08-15 13:06:54 +03:00
MARKPRO44
a27a9255dd Merge remote-tracking branch 'refs/remotes/origin/NetworkManagerDev' into NetworkManagerDev 2024-08-15 12:04:22 +03:00
MARKPRO44
de8020d065 merge 2024-08-15 11:50:21 +03:00
rawer470
d6daa3d063 UpdateListen 2024-08-15 11:46:01 +03:00
MARKPRO44
7d3e4da143 eventClientNetworkManager 2024-08-15 11:43:09 +03:00
MARKPRO44
45f47d794e ArchitectureClientNetworkManager 2024-08-15 11:30:32 +03:00
Lev
ba42178c38 Merge branch 'ItemManager' into Development 2024-08-15 11:09:38 +03:00
Lev
0808af6713 Merge branch 'NetworkManagerDev' into Development 2024-08-15 11:03:22 +03:00
Lev
cd79d47665 Merge remote-tracking branch 'origin/NetworkManagerDev' into Development 2024-08-15 11:00:00 +03:00
rawer470
0daefa41a6 UpdateServerNetworkManager 2024-08-15 10:58:19 +03:00
MARKPRO44
f5ad504af6 Client 2024-08-15 10:51:22 +03:00
polten0
a24415bab7 MapElements, наполнил для json Serialize/Deserialize 2024-08-15 10:47:54 +03:00
Lev
675ea6fc5c Merge remote-tracking branch 'origin/GUI_gr' into Development 2024-08-15 10:46:04 +03:00
Lev
d4996b9dee minor fix GraficsComponent and TODO 2024-08-15 10:44:36 +03:00
MARKPRO44
17677fbbf0 NetworkManager 2024-08-15 10:39:42 +03:00
Lev
4084d98021 Merge branch 'gameObjects' into Development 2024-08-15 10:35:48 +03:00
MARKPRO44
6e89e12021 ClientNetworkManager 2024-08-15 10:35:02 +03:00
Lev
fef35a1840 Merge branch 'develop' into Development 2024-08-15 10:34:09 +03:00
rawer470
a6fb094bfb AddServerClass 2024-08-15 10:31:46 +03:00
Lev
f363aa873a Merge branch 'gameObjects' of github.com:progtime-net/ZoFo into gameObjects 2024-08-15 10:29:46 +03:00
Lev
c751d8fdd8 minor changes GraficsComponent 2024-08-15 10:27:02 +03:00
Сухинов Сережа
10752f230c Merge checked
Fixed Monogame Library target version
2024-08-15 10:22:58 +03:00
Kaktus200020
f5d563f887 addItemManagerWithUnworkMethods 2024-08-15 10:19:09 +03:00
Сухинов Сережа
a5f3a17d1d Merge branch 'AppManagerBranch' into Development 2024-08-15 10:14:19 +03:00
Lev
6593b9c1d6 add tile and stopTile and partlially done the ZoFo_grafics 2024-08-15 10:06:58 +03:00
polten0
13533ee367 Создал MapManager, кода нет 2024-08-15 10:02:50 +03:00
Сухинов Сережа
388858f6d2 minor changes 2024-08-15 09:44:36 +03:00
Сухинов Сережа
2fb9c235e0 Minor formatting 2024-08-15 02:26:35 +03:00
Сухинов Сережа
fc18c517fb Added basic AppManager and inputManager
Deleted Game1, because it is AppManager

Added TODOs

TODO:
Uncomment AbstractGUI when merged with GUIBranch
Uncomment server and client when merged with serverBranch
2024-08-15 02:26:04 +03:00
rawer470
ccc784b79c CreateUpdates 2024-08-15 02:11:05 +03:00
Lev
09dff14367 fix bags in entity and add ZoFo_grafics with bag 2024-08-15 02:05:36 +03:00
dvaer
0018fbb894 add_class 2024-08-15 02:04:45 +03:00
Lev
1f54391527 add abstract logic of entity 2024-08-15 01:47:12 +03:00
dvaer
b583fee683 Merge branch 'master' into GUI_gr 2024-08-15 01:33:53 +03:00
dvaer
03b5a5917c add 2024-08-15 01:32:31 +03:00
dbf81f5624
Fix MonogameLibrary 2024-08-15 01:28:48 +03:00
unknown
4e9c54906b addClassesFromIPlayer 2024-08-15 01:27:00 +03:00
dvaer
9b8947ecd6 add 2024-08-15 01:26:24 +03:00
dvaer
7e71d2f938 add 2024-08-15 01:15:21 +03:00
unknown
c2d070cd8d 2element 2024-08-15 01:07:51 +03:00
rawer470
7585fc0c3f StartWork 2024-08-15 01:07:29 +03:00
dvaer
b67c131150 Merge branch 'refs/heads/master' into GUI_gr 2024-08-15 01:05:37 +03:00
Lev
2b52b10a72 AddFiles 2024-08-15 00:57:39 +03:00