SergoDobro
|
7e2e042194
|
Merge branch 'Development' into ClientServerManager
|
2024-08-16 01:29:01 +03:00 |
|
SergoDobro
|
2c8af8b868
|
Merge pull request #10 from progtime-net/MapLoader
Map loader
|
2024-08-16 01:09:21 +03:00 |
|
polten0
|
e9cdcb42a6
|
Первая итерация парсинга тайлов
|
2024-08-16 01:00:21 +03:00 |
|
SergoDobro
|
5913e988f4
|
Merge branch 'gameObjects' into Development
|
2024-08-16 00:57:53 +03:00 |
|
SergoDobro
|
80b7d88099
|
Merge pull request #8 from progtime-net/Collision
Collision merged 1 merge conflict fix
|
2024-08-16 00:36:28 +03:00 |
|
SergoDobro
|
9e4a14a92e
|
Merge branch 'Development' into Collision
|
2024-08-16 00:36:01 +03:00 |
|
PetrKu09
|
d29b8c39cc
|
UpdateComponentCollision
|
2024-08-16 00:33:26 +03:00 |
|
MARKPRO44
|
e3330470fd
|
ClientNetworkManager
|
2024-08-15 22:12:05 +03:00 |
|
MARKPRO44
|
f4d2bae54d
|
ClientNetworkManager
|
2024-08-15 21:56:40 +03:00 |
|
polten0
|
c8fee7dade
|
Merge branch 'MapLoader' of https://github.com/progtime-net/ZoFo into MapLoader
|
2024-08-15 21:54:37 +03:00 |
|
polten0
|
c0c67eef03
|
Merge pull request #7 from progtime-net/development
Development
|
2024-08-15 21:55:29 +03:00 |
|
polten0
|
90fe705ee9
|
intermedia
|
2024-08-15 21:47:35 +03:00 |
|
rawer470
|
0593d919f1
|
AddDataInClassServer
|
2024-08-15 21:38:21 +03:00 |
|
rawer470
|
f874938a13
|
AddComments
|
2024-08-15 19:21:30 +03:00 |
|
Lev
|
7187d6fc8d
|
Merge branch 'Development' of github.com:progtime-net/ZoFo into Development
|
2024-08-15 17:29:25 +03:00 |
|
Lev
|
475439a3af
|
add register to monster 2
|
2024-08-15 17:28:27 +03:00 |
|
Lev
|
f23bd9fe9f
|
add register entity
|
2024-08-15 17:24:25 +03:00 |
|
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 |
|
unknown
|
f3c2220769
|
smallEdit
|
2024-08-15 17:17:25 +03:00 |
|
SergoDobro
|
17bfe852d7
|
Merge pull request #6 from progtime-net/AddingEquippableItemInfo
UpdateItemInfo
|
2024-08-15 17:10:38 +03:00 |
|
PetrKu09
|
16a40586e7
|
Add meet into CheckComponentCollision and Create UpdateComponentCollision
|
2024-08-15 17:06:12 +03:00 |
|
unknown
|
2ebbf450e7
|
LivingEntityRework
|
2024-08-15 17:04:15 +03:00 |
|
Kaktus200020
|
4e1abba8e8
|
UpdateItemInfo
|
2024-08-15 16:45:21 +03:00 |
|
PetrKu09
|
86d83e8387
|
Create CheckComponentCollision and meet into her
|
2024-08-15 16:32:32 +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 |
|
PetrKu09
|
7dbe12e034
|
Create CheckComponentCollision
|
2024-08-15 16:07:30 +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 |
|
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 |
|