Commit graph

530 commits

Author SHA1 Message Date
Сухинов Сережа
6f72c0e97e Connected Systems to AppManager
item manager is now public
Server got Update(gametime)
Client got Update(gametime) and Draw(spriteBatch)

Added Commented PlatyerData
2024-08-15 15:13:27 +03:00
Lev
8dbce7b229 Merge branch 'Development' of github.com:progtime-net/ZoFo into Development 2024-08-15 15:12:15 +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
unknown
6c75e9294b Merge branch 'gameObjects' of https://github.com/progtime-net/ZoFo into gameObjects 2024-08-15 15:01:48 +03:00
polten0
24332f240b начал делать загрузку карты 2024-08-15 15:00:57 +03:00
rawer470
757c56c1ea UpdateServer 2024-08-15 15:00:02 +03:00
unknown
74d5833ac6 ent 2024-08-15 14:59:29 +03:00
Kaktus200020
a779d9078e RealizeMethodsInItemManager 2024-08-15 14:50:09 +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
dvaer
fb2b685136 addDebugHUD 2024-08-15 11:36:04 +03:00
Lev
fbb79e958a commit to fix condlicts with CollisionManager 2024-08-15 11:34:32 +03:00
MARKPRO44
45f47d794e ArchitectureClientNetworkManager 2024-08-15 11:30:32 +03:00
PetrKu09
3f89779fc4 Add Register Rectangle in CollMng 2024-08-15 11:28:04 +03:00
PetrKu09
125dcbe78b Full add methods and fields to collisionManager and CollisionComponent 2024-08-15 11:20:36 +03:00
Lev
06b805db14 Merge branch 'GUI_gr' into Development 2024-08-15 11:15:54 +03:00
dvaer
59b04ce7f1 add 2024-08-15 11:15:02 +03:00
PetrKu09
3a2f27e5e3 Add Method for Events 2024-08-15 11:13:21 +03:00
Lev
55c100225f Merge branch 'GUI_gr' into Development 2024-08-15 11:12:59 +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
PetrKu09
c2ee512271 Add Lists to ColMng and add methds to ColMng --2nd try-- 2024-08-15 11:00:27 +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
dvaer
a21e97c342 Merge branch 'Development' into GUI_gr 2024-08-15 10:47:20 +03:00
Lev
675ea6fc5c Merge remote-tracking branch 'origin/GUI_gr' into Development 2024-08-15 10:46:04 +03:00
PetrKu09
332f405cf5 Add Lists to ColMng and add methds to ColMng 2024-08-15 10:44:58 +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
rawer470
0febf367b3 Merge branch 'master' of github.com:progtime-net/ZoFo 2024-08-15 10:35:11 +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
dvaer
10c651b042 content 2024-08-15 10:32:56 +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
PetrKu09
6fd3fd21c4 Create folder-CollisionManager and add 1st date with events 2024-08-15 10:22:21 +03:00
Kaktus200020
f5d563f887 addItemManagerWithUnworkMethods 2024-08-15 10:19:09 +03:00
PetrKu09
50c9ef4f19 Create folder-CollisionManager and add 1st date with collision--test 2024-08-15 10:16:22 +03:00
Сухинов Сережа
a5f3a17d1d Merge branch 'AppManagerBranch' into Development 2024-08-15 10:14:19 +03:00