Commit graph

226 commits

Author SHA1 Message Date
rawer470
a644d6c02a WorkServerWithGUI 2024-08-17 01:18:46 +03:00
a811021e7c
Merge branch 'Development' into Interactable 2024-08-17 01:14:07 +03:00
58d6627af9 Add summary 2024-08-17 01:13:02 +03:00
SergoDobro
bca2a30c65 minor fixes 2024-08-17 01:11:08 +03:00
polten0
539f8f3021 fixed loadMap 2024-08-17 01:11:07 +03:00
540727f071 Add updates for interaction 2024-08-17 00:59:41 +03:00
4d6c32bd37 Fix server 2024-08-16 23:52:51 +03:00
7bce47259c Merge branch 'refs/heads/Development' into Interactable 2024-08-16 23:44:17 +03:00
af5253146a Merge pull request #31 from progtime-net/UpdateEntity
add register game objects
2024-08-16 23:42:18 +03:00
505565f6f4
Merge branch 'Development' into UpdateEntity 2024-08-16 23:38:35 +03:00
e594049c0d
Merge branch 'Development' into ServerBranch 2024-08-16 23:37:36 +03:00
b0f9bbdeec Add Interatable class 2024-08-16 23:12:12 +03:00
rawer470
a2df1b746a ChangeHierarchyUpdateClasses 2024-08-16 22:11:10 +03:00
MARKPRO44
dc238315e9 pull2 2024-08-16 22:07:50 +03:00
MARKPRO44
d9bb9e053b pull 2024-08-16 22:06:36 +03:00
SergoDobro
e9698a8669 Added basic drawing, temporary removed data sending in SendData 2024-08-16 22:01:41 +03:00
PetrKu09
9882de9308 Add Register Collision v2 2024-08-16 19:24:54 +03:00
SergoDobro
8bf1bff778 COnnected maploader and objects creation + mapobject fix + graphicsDeviceFix 2024-08-16 18:21:50 +03:00
Lev
eef6e038b8 add register game objects 2024-08-16 18:06:51 +03:00
MARKPRO44
2ff38cf990 Single 2024-08-16 18:02:40 +03:00
polten0
906cca843d hot fix on map load 2024-08-16 17:44:06 +03:00
Kaktus200020
bafd19b78e
Merge branch 'Development' into UpdateSettings 2024-08-16 16:46:08 +03:00
Kaktus200020
cd9da3fb61 FinalUpdate 2024-08-16 16:41:48 +03:00
SergoDobro
5a5d48ac07
Merge pull request #28 from progtime-net/map
Закончил первую итерацию загрузки карты. Требуется доработка будущая, но сейчас работа пойдет над самой картой
2024-08-16 16:32:52 +03:00
polten0
4c765c46f0 hot fix 2024-08-16 16:20:18 +03:00
polten0
651b43b8d1 Добавил создание обьектов из карты 2024-08-16 16:19:36 +03:00
SergoDobro
37b8623b6c
Merge pull request #27 from progtime-net/ServerBranch
Server branch
2024-08-16 15:42:00 +03:00
polten0
2ec1b3b268
Merge pull request #26 from progtime-net/maploader
Maploader
2024-08-16 15:35:36 +03:00
polten0
621e367034 попытка 3 2024-08-16 15:32:10 +03:00
polten0
37a99378d2 попытка 2 2024-08-16 15:31:47 +03:00
MARKPRO44
48ae82bf1b Single 2024-08-16 15:25:50 +03:00
polten0
852de999fc Коммментарии 2024-08-16 15:23:34 +03:00
rawer470
dac76035aa Merge branch 'ServerBranch' of github.com:progtime-net/ZoFo into ServerBranch 2024-08-16 15:13:39 +03:00
SergoDobro
10052927ae
Merge branch 'ServerBranch' into Development 2024-08-16 15:12:39 +03:00
rawer470
069b62abee UpdateTileCreated 2024-08-16 14:05:34 +03:00
SergoDobro
cf16b68b21
Merge branch 'Development' into UpgradeInputManager 2024-08-16 13:08:30 +03:00
Lev
ba757265f2 upgrade InputManager 2024-08-16 13:05:49 +03:00
rawer470
0ad40ac2d3 UpdateComments2 2024-08-16 13:04:54 +03:00
Kaktus200020
bab199096e RealizeSettings 2024-08-16 12:29:51 +03:00
MARKPRO44
0363086277 merge 2024-08-16 12:29:47 +03:00
MARKPRO44
02ec3acb56 Comment 2024-08-16 12:29:04 +03:00
SergoDobro
9d49e56764
Merge branch 'Development' into ServerBranch 2024-08-16 12:27:21 +03:00
SergoDobro
843f521a53
Merge pull request #17 from progtime-net/GUI
optionsDone
2024-08-16 11:51:02 +03:00
dvaer
b38a099108 optionsDone 2024-08-16 11:44:56 +03:00
rawer470
553677b074 ConnectSinglePlayer 2024-08-16 11:44:50 +03:00
PetrKu09
226a5a5ccd Add Register Collision 2024-08-16 11:37:43 +03:00
3c88b5a245
Merge pull request #16 from progtime-net/Settings&Sound
Settings&sound
2024-08-16 11:28:28 +03:00
Kaktus200020
cdcebdbfc8 MajorUpdate 2024-08-16 11:17:08 +03:00
Kaktus200020
96179a6708 AddSettingsManager 2024-08-16 11:05:52 +03:00
rawer470
e5a20a508a FixConflictServer 2024-08-16 10:38:46 +03:00