Commit graph

progtime/ZoFo

Fork 0

2ec1b3b268

Merge pull request #26 from progtime-net/maploader polten0 2024-08-16 15:35:36 +03:00
621e367034 попытка 3 polten0 2024-08-16 15:32:10 +03:00
580d9a2327 ChangeMethodUpdateServer rawer470 2024-08-16 15:31:58 +03:00
37a99378d2 попытка 2 polten0 2024-08-16 15:31:47 +03:00
48ae82bf1b Single MARKPRO44 2024-08-16 15:25:50 +03:00
7a444a1e3e ServerChange rawer470 2024-08-16 15:25:08 +03:00
852de999fc Коммментарии polten0 2024-08-16 15:23:34 +03:00
69d2c06ebe ServerChange rawer470 2024-08-16 15:23:30 +03:00
bb19603645

Merge pull request #25 from progtime-net/Development SergoDobro 2024-08-16 15:22:20 +03:00
12a464bea6 GameObject Fixes SergoDobro 2024-08-16 15:21:45 +03:00
786286494a Merge branch 'ServerBranch' of github.com:progtime-net/ZoFo into ServerBranch rawer470 2024-08-16 15:20:16 +03:00
92310460b5

Merge pull request #24 from progtime-net/Development SergoDobro 2024-08-16 15:19:46 +03:00
54aded7c1d GameObjects prepared for map SergoDobro 2024-08-16 15:19:01 +03:00
dac76035aa Merge branch 'ServerBranch' of github.com:progtime-net/ZoFo into ServerBranch rawer470 2024-08-16 15:13:39 +03:00
55cd57725c

Merge pull request #23 from progtime-net/Development SergoDobro 2024-08-16 15:13:16 +03:00
10052927ae

Merge branch 'ServerBranch' into Development SergoDobro 2024-08-16 15:12:39 +03:00
32a4ff624f

Merge pull request #22 from progtime-net/GUI SergoDobro 2024-08-16 15:10:07 +03:00
069b62abee UpdateTileCreated rawer470 2024-08-16 14:05:34 +03:00
bad96b4dfc servergui dvaer 2024-08-16 13:24:05 +03:00
4723efb3dc

Merge pull request #21 from progtime-net/UpgradeInputManager SergoDobro 2024-08-16 13:08:44 +03:00
cf16b68b21

Merge branch 'Development' into UpgradeInputManager SergoDobro 2024-08-16 13:08:30 +03:00
6b5f11c8da Merge branch 'Development' of github.com:progtime-net/ZoFo into Development SergoDobro 2024-08-16 13:07:32 +03:00
866f87c0d0 GameObject Almost Finished SergoDobro 2024-08-16 13:07:27 +03:00
ba757265f2 upgrade InputManager Lev 2024-08-16 13:05:49 +03:00
0ad40ac2d3 UpdateComments2 rawer470 2024-08-16 13:04:54 +03:00
9d9709441c ReadyCreateServerGame rawer470 2024-08-16 12:35:02 +03:00
bab199096e RealizeSettings Kaktus200020 2024-08-16 12:29:51 +03:00
0363086277 merge MARKPRO44 2024-08-16 12:29:47 +03:00
02ec3acb56 Comment MARKPRO44 2024-08-16 12:29:04 +03:00
b2041c07f5

Merge pull request #20 from progtime-net/Development SergoDobro 2024-08-16 12:28:13 +03:00
2187bc4466

Merge pull request #19 from progtime-net/ServerBranch SergoDobro 2024-08-16 12:27:40 +03:00
9d49e56764

Merge branch 'Development' into ServerBranch SergoDobro 2024-08-16 12:27:21 +03:00
343f063422 AddComments rawer470 2024-08-16 12:19:54 +03:00
f840ea9e78

Merge pull request #18 from progtime-net/GUI SergoDobro 2024-08-16 12:14:46 +03:00
03fa614aed optionsDone dvaer 2024-08-16 12:09:04 +03:00
843f521a53

Merge pull request #17 from progtime-net/GUI SergoDobro 2024-08-16 11:51:02 +03:00
2e5aeede16 ConnectSinglePlayer2 rawer470 2024-08-16 11:47:00 +03:00
b38a099108 optionsDone dvaer 2024-08-16 11:44:56 +03:00
553677b074 ConnectSinglePlayer rawer470 2024-08-16 11:44:50 +03:00
973584a06e merge MARKPRO44 2024-08-16 11:44:37 +03:00
78a2f9a012 player0.1 MARKPRO44 2024-08-16 11:43:06 +03:00
226a5a5ccd Add Register Collision PetrKu09 2024-08-16 11:37:43 +03:00
86da4fe0a1

Merge pull request #14 from progtime-net/Development Andrey 2024-08-16 11:29:17 +03:00
1683fb7564

Merge pull request #15 from progtime-net/AnimationFileCreator Andrey 2024-08-16 11:28:44 +03:00
3c88b5a245

Merge pull request #16 from progtime-net/Settings&Sound Andrey 2024-08-16 11:28:28 +03:00
c2f3c84048 Add cross-platform support Mootfrost777 2024-08-16 11:25:12 +03:00
cdcebdbfc8 MajorUpdate Kaktus200020 2024-08-16 11:17:08 +03:00
2e9fccd99a ClientJoin MARKPRO44 2024-08-16 11:06:51 +03:00
96179a6708 AddSettingsManager Kaktus200020 2024-08-16 11:05:52 +03:00
6ee0b4fc73 ServerConflictUpdate rawer470 2024-08-16 10:41:25 +03:00
e5a20a508a FixConflictServer rawer470 2024-08-16 10:38:46 +03:00
828525a912 CommentServer rawer470 2024-08-16 10:32:42 +03:00
a8492abe60 Fixed gameObjects properties SergoDobro 2024-08-16 09:44:31 +03:00
15e453116e

Merge pull request #13 from progtime-net/SoundManager SergoDobro 2024-08-16 09:34:07 +03:00
1db4c4dedd

Merge pull request #12 from progtime-net/GUI_gr SergoDobro 2024-08-16 09:33:16 +03:00
01004096dd

Merge branch 'Development' into GUI_gr SergoDobro 2024-08-16 09:33:06 +03:00
a9e5cc9a2e options dvaer 2024-08-16 09:30:27 +03:00
39fff12602 SoundManagerButNotWork Kaktus200020 2024-08-16 09:25:16 +03:00
c84ecc3c9f Great Merge Completed (TODO: GUI recheck) Code Refactoring (moving gameobjects between folders) SergoDobro 2024-08-16 01:35:21 +03:00
1718de9412

Merge pull request #11 from progtime-net/ClientServerManager SergoDobro 2024-08-16 01:29:22 +03:00
7e2e042194

Merge branch 'Development' into ClientServerManager SergoDobro 2024-08-16 01:29:01 +03:00
2c8af8b868

Merge pull request #10 from progtime-net/MapLoader SergoDobro 2024-08-16 01:09:21 +03:00
e9cdcb42a6 Первая итерация парсинга тайлов polten0 2024-08-16 01:00:21 +03:00
5913e988f4 Merge branch 'gameObjects' into Development SergoDobro 2024-08-16 00:57:53 +03:00
80b7d88099

Merge pull request #8 from progtime-net/Collision SergoDobro 2024-08-16 00:36:28 +03:00
9e4a14a92e

Merge branch 'Development' into Collision SergoDobro 2024-08-16 00:36:01 +03:00
d29b8c39cc UpdateComponentCollision PetrKu09 2024-08-16 00:33:26 +03:00
e3330470fd ClientNetworkManager MARKPRO44 2024-08-15 22:12:05 +03:00
f4d2bae54d ClientNetworkManager MARKPRO44 2024-08-15 21:56:40 +03:00
c8fee7dade Merge branch 'MapLoader' of https://github.com/progtime-net/ZoFo into MapLoader polten0 2024-08-15 21:54:37 +03:00
c0c67eef03

Merge pull request #7 from progtime-net/development polten0 2024-08-15 21:55:29 +03:00
90fe705ee9 intermedia polten0 2024-08-15 21:47:35 +03:00
0593d919f1 AddDataInClassServer rawer470 2024-08-15 21:38:21 +03:00
f874938a13 AddComments rawer470 2024-08-15 19:21:30 +03:00
7187d6fc8d Merge branch 'Development' of github.com:progtime-net/ZoFo into Development Lev 2024-08-15 17:29:25 +03:00
475439a3af add register to monster 2 Lev 2024-08-15 17:28:27 +03:00
f23bd9fe9f add register entity Lev 2024-08-15 17:24:25 +03:00
695189a42d Delete Game1 SergoDobro 2024-08-15 17:22:51 +03:00
8a9867eb44 Merge branch 'GUI_gr' into Development SergoDobro 2024-08-15 17:20:10 +03:00
f3c2220769 smallEdit unknown 2024-08-15 17:17:25 +03:00
17bfe852d7

Merge pull request #6 from progtime-net/AddingEquippableItemInfo SergoDobro 2024-08-15 17:10:38 +03:00
16a40586e7 Add meet into CheckComponentCollision and Create UpdateComponentCollision PetrKu09 2024-08-15 17:06:12 +03:00
2ebbf450e7 LivingEntityRework unknown 2024-08-15 17:04:15 +03:00
4e1abba8e8 UpdateItemInfo Kaktus200020 2024-08-15 16:45:21 +03:00
86d83e8387 Create CheckComponentCollision and meet into her PetrKu09 2024-08-15 16:32:32 +03:00
fc969da956 tu rawer470 2024-08-15 16:32:02 +03:00
4207258d15 mainMenu dvaer 2024-08-15 16:21:40 +03:00
86c73093c5 Merge branch 'NetworkManagerDev' into Development rawer470 2024-08-15 16:08:44 +03:00
7dbe12e034 Create CheckComponentCollision PetrKu09 2024-08-15 16:07:30 +03:00
a46f9c2dda merge MARKPRO44 2024-08-15 16:07:08 +03:00
48f43baf2f GlobalMerge2 MARKPRO44 2024-08-15 16:02:17 +03:00
e2f24e2932 Merge branch 'NetworkManagerDev' of github.com:progtime-net/ZoFo into NetworkManagerDev rawer470 2024-08-15 15:59:43 +03:00
55151bae11 CloseConnection rawer470 2024-08-15 15:58:58 +03:00
ef84778d0d

Merge pull request #4 from progtime-net/ItemManagerUpdate SergoDobro 2024-08-15 15:44:12 +03:00
41b14a89e1 Added AppManager changes Commit by SergoDobro Сухинов Сережа 2024-08-15 15:40:08 +03:00
e20256dc4a minor fix merge Lev 2024-08-15 15:36:01 +03:00
027ed3e22e minor comments Сухинов Сережа 2024-08-15 15:14:15 +03:00
898b734c9e Client MARKPRO44 2024-08-15 15:13:47 +03:00
6f72c0e97e Connected Systems to AppManager Сухинов Сережа 2024-08-15 15:13:27 +03:00
8dbce7b229 Merge branch 'Development' of github.com:progtime-net/ZoFo into Development Lev 2024-08-15 15:12:15 +03:00