Commit graph

101 commits

Author SHA1 Message Date
be0d38bb95 Fix inheritance 2024-08-18 10:53:42 +03:00
SergoDobro
61c12a1144
Merge branch 'Development' into ServerBranchMultiPlayer 2024-08-18 10:48:29 +03:00
SergoDobro
e2ac9286e5 Collisions ara Working!!!! Next Is Trigger! it is 2:40... help me.... 2024-08-18 02:41:09 +03:00
SergoDobro
3ec0069f75 Hot fixes 2024-08-18 00:38:41 +03:00
SergoDobro
6afd91b0b7 hotfixes 2024-08-17 23:34:20 +03:00
SergoDobro
409fac0679
Merge branch 'Development' into Collision 2024-08-17 23:19:25 +03:00
SergoDobro
a69f44468c Player now appears on client side + entityidsearch 2024-08-17 23:13:11 +03:00
MARKPRO44
b105f67df2 FixServer 2024-08-17 21:22:18 +03:00
SergoDobro
96e6e37b56 minor fixes and cleaning 2024-08-17 20:12:25 +03:00
SergoDobro
30d663b278
Merge branch 'Collision' into Development 2024-08-17 19:58:04 +03:00
PetrKu09
d0dc0c4714 Add CollisionComponent designer 2024-08-17 19:50:47 +03:00
SergoDobro
8358be3a40 disabled Map 2024-08-17 19:48:33 +03:00
SergoDobro
48e4864030
Merge branch 'Development' into MinorFixesAndConnections 2024-08-17 19:01:25 +03:00
SergoDobro
5a6d56128c minor overall 2024-08-17 18:58:49 +03:00
22ce0fd58f Add deleteObject 2024-08-17 18:21:15 +03:00
rawer470
d95c65c12c SwitchOnServer 2024-08-17 14:03:06 +03:00
3fad775cb2
Merge branch 'Development' into UpdateEntity 2024-08-17 12:12:16 +03:00
Lev
60b71efb09 create inputMamager 2024-08-17 12:10:25 +03:00
rawer470
215b538715 StartCreateLogicMultiPlayer3 2024-08-17 11:13:13 +03:00
rawer470
c1d2a6b210 StartCreateLogicMultiPlayer2 2024-08-17 11:10:17 +03:00
2324310068
Merge branch 'Development' into ServerBranch2 2024-08-17 10:53:24 +03:00
SergoDobro
aed8016bfd First animations, prepared for addition of new animations 2024-08-17 10:07:21 +03:00
rawer470
b1f24ce81b WorkServerWithGUI2 2024-08-17 01:43:50 +03:00
rawer470
a644d6c02a WorkServerWithGUI 2024-08-17 01:18:46 +03:00
SergoDobro
bca2a30c65 minor fixes 2024-08-17 01:11:08 +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
rawer470
a2df1b746a ChangeHierarchyUpdateClasses 2024-08-16 22:11:10 +03:00
SergoDobro
e9698a8669 Added basic drawing, temporary removed data sending in SendData 2024-08-16 22:01:41 +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
rawer470
580d9a2327 ChangeMethodUpdateServer 2024-08-16 15:31:58 +03:00
SergoDobro
12a464bea6 GameObject Fixes 2024-08-16 15:21:45 +03:00
rawer470
0ad40ac2d3 UpdateComments2 2024-08-16 13:04:54 +03:00
SergoDobro
9d49e56764
Merge branch 'Development' into ServerBranch 2024-08-16 12:27:21 +03:00
rawer470
343f063422 AddComments 2024-08-16 12:19:54 +03:00
rawer470
553677b074 ConnectSinglePlayer 2024-08-16 11:44:50 +03:00
rawer470
6ee0b4fc73 ServerConflictUpdate 2024-08-16 10:41:25 +03:00
rawer470
e5a20a508a FixConflictServer 2024-08-16 10:38:46 +03:00
rawer470
828525a912 CommentServer 2024-08-16 10:32:42 +03:00
SergoDobro
c84ecc3c9f Great Merge Completed (TODO: GUI recheck)
Code Refactoring (moving gameobjects between folders)
2024-08-16 01:35:21 +03:00
SergoDobro
7e2e042194
Merge branch 'Development' into ClientServerManager 2024-08-16 01:29:01 +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
f23bd9fe9f add register entity 2024-08-15 17:24:25 +03:00
rawer470
fc969da956 tu 2024-08-15 16:32:02 +03:00
rawer470
55151bae11 CloseConnection 2024-08-15 15:58:58 +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
rawer470
757c56c1ea UpdateServer 2024-08-15 15:00:02 +03:00