Commit graph

464 commits

Author SHA1 Message Date
dvaer
a453ba9990 werge rranch 'GUI' of github.com:progtime-net/ZoFo into GUI 2024-08-17 00:30:34 +03:00
dvaer
2beb47597b HotFix 2024-08-17 00:25:46 +03:00
gravitymm
b9d32f2567
Merge pull request #33 from progtime-net/GUI
GUI
2024-08-17 00:12:04 +03:00
gravitymm
2bca370fe1
Merge branch 'Development' into GUI 2024-08-17 00:11:37 +03:00
dvaer
8f17932f0b GUI 2024-08-17 00:02:36 +03:00
4d6c32bd37 Fix server 2024-08-16 23:52:51 +03:00
SergoDobro
5e2666fbd5 bug fix 2024-08-16 23:50:59 +03:00
7bce47259c Merge branch 'refs/heads/Development' into Interactable 2024-08-16 23:44:17 +03:00
684033ce6f Merge remote-tracking branch 'origin/Development' into Development 2024-08-16 23:42:44 +03:00
af5253146a Merge pull request #31 from progtime-net/UpdateEntity
add register game objects
2024-08-16 23:42:18 +03:00
ea08cc83c2
Merge pull request #31 from progtime-net/UpdateEntity
add register game objects
2024-08-16 23:38:43 +03:00
505565f6f4
Merge branch 'Development' into UpdateEntity 2024-08-16 23:38:35 +03:00
ceb10ce7c4
Merge pull request #32 from progtime-net/ServerBranch
ChangeHierarchyUpdateClasses
2024-08-16 23:37:45 +03:00
e594049c0d
Merge branch 'Development' into ServerBranch 2024-08-16 23:37:36 +03:00
d8144c22c1 Add door 2024-08-16 23:31:09 +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
fc3af23d69 Merge branch 'master' of github.com:progtime-net/ZoFo 2024-08-16 19:19:28 +03:00
cf630924bc Update architecture 2024-08-16 19:16:32 +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
5ef0a660cc
Merge pull request #30 from progtime-net/map_fix
hot fix on map load
2024-08-16 17:46:10 +03:00
polten0
906cca843d hot fix on map load 2024-08-16 17:44:06 +03:00
Kaktus200020
1ca4f29729
Merge pull request #29 from progtime-net/UpdateSettings
Update settings
2024-08-16 16:46:20 +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
4654dc0d5c hot fix, check StopObject 2024-08-16 16:23:42 +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
rawer470
91d15a9de5 ClirntReadyDataSend 2024-08-16 15:39:58 +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
rawer470
580d9a2327 ChangeMethodUpdateServer 2024-08-16 15:31:58 +03:00
polten0
37a99378d2 попытка 2 2024-08-16 15:31:47 +03:00
MARKPRO44
48ae82bf1b Single 2024-08-16 15:25:50 +03:00
rawer470
7a444a1e3e ServerChange 2024-08-16 15:25:08 +03:00
polten0
852de999fc Коммментарии 2024-08-16 15:23:34 +03:00
rawer470
69d2c06ebe ServerChange 2024-08-16 15:23:30 +03:00
SergoDobro
bb19603645
Merge pull request #25 from progtime-net/Development
GameObject Fixes
2024-08-16 15:22:20 +03:00
SergoDobro
12a464bea6 GameObject Fixes 2024-08-16 15:21:45 +03:00
rawer470
786286494a Merge branch 'ServerBranch' of github.com:progtime-net/ZoFo into ServerBranch 2024-08-16 15:20:16 +03:00
SergoDobro
92310460b5
Merge pull request #24 from progtime-net/Development
GameObjects prepared for map
2024-08-16 15:19:46 +03:00
SergoDobro
54aded7c1d GameObjects prepared for map 2024-08-16 15:19:01 +03:00