Commit graph

18 commits

Author SHA1 Message Date
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
473820b14d Fix Bags 2024-08-17 21:50:23 +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
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
19a7676b1d Fix namespaces, add collectable 2024-08-17 17:57:04 +03:00
PetrKu09
1b77e35c32 Resolve issues 2024-08-17 11:36:18 +03:00
18cb8fbae6 Merge branch 'refs/heads/Development' into Collision
# Conflicts:
#	ZoFo/GameCore/GameManagers/CollisionManager/CollisionManager.cs
2024-08-17 11:18:45 +03:00
PetrKu09
997f5db24a CheckComponentCollision normak version 2024-08-17 11:12:27 +03:00
PetrKu09
9882de9308 Add Register Collision v2 2024-08-16 19:24:54 +03:00
PetrKu09
226a5a5ccd Add Register Collision 2024-08-16 11:37:43 +03:00
SergoDobro
c84ecc3c9f Great Merge Completed (TODO: GUI recheck)
Code Refactoring (moving gameobjects between folders)
2024-08-16 01:35:21 +03:00
PetrKu09
16a40586e7 Add meet into CheckComponentCollision and Create UpdateComponentCollision 2024-08-15 17:06:12 +03:00
PetrKu09
86d83e8387 Create CheckComponentCollision and meet into her 2024-08-15 16:32:32 +03:00
PetrKu09
362c72439f great merge dev and CollisionManager 2024-08-15 15:09:17 +03:00