SergoDobro
|
695189a42d
|
Delete Game1
|
2024-08-15 17:22:51 +03:00 |
|
SergoDobro
|
8a9867eb44
|
Merge branch 'GUI_gr' into Development
|
2024-08-15 17:20:10 +03:00 |
|
SergoDobro
|
17bfe852d7
|
Merge pull request #6 from progtime-net/AddingEquippableItemInfo
UpdateItemInfo
|
2024-08-15 17:10:38 +03:00 |
|
Kaktus200020
|
4e1abba8e8
|
UpdateItemInfo
|
2024-08-15 16:45:21 +03:00 |
|
rawer470
|
fc969da956
|
tu
|
2024-08-15 16:32:02 +03:00 |
|
dvaer
|
4207258d15
|
mainMenu
|
2024-08-15 16:21:40 +03:00 |
|
rawer470
|
86c73093c5
|
Merge branch 'NetworkManagerDev' into Development
|
2024-08-15 16:08:44 +03:00 |
|
MARKPRO44
|
a46f9c2dda
|
merge
|
2024-08-15 16:07:08 +03:00 |
|
MARKPRO44
|
48f43baf2f
|
GlobalMerge2
|
2024-08-15 16:02:17 +03:00 |
|
rawer470
|
e2f24e2932
|
Merge branch 'NetworkManagerDev' of github.com:progtime-net/ZoFo into NetworkManagerDev
|
2024-08-15 15:59:43 +03:00 |
|
rawer470
|
55151bae11
|
CloseConnection
|
2024-08-15 15:58:58 +03:00 |
|
SergoDobro
|
ef84778d0d
|
Merge pull request #4 from progtime-net/ItemManagerUpdate
RealizeMethodsInItemManager
|
2024-08-15 15:44:12 +03:00 |
|
Сухинов Сережа
|
41b14a89e1
|
Added AppManager changes Commit by SergoDobro
|
2024-08-15 15:40:08 +03:00 |
|
Lev
|
e20256dc4a
|
minor fix merge
|
2024-08-15 15:36:01 +03:00 |
|
Сухинов Сережа
|
027ed3e22e
|
minor comments
|
2024-08-15 15:14:15 +03:00 |
|
MARKPRO44
|
898b734c9e
|
Client
|
2024-08-15 15:13:47 +03:00 |
|
Сухинов Сережа
|
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 |
|
rawer470
|
757c56c1ea
|
UpdateServer
|
2024-08-15 15:00:02 +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 |
|