SergoDobro
|
25cc668576
|
Merge pull request #53 from progtime-net/LootData
Loot data
|
2024-08-18 01:07:18 +03:00 |
|
SergoDobro
|
3ec0069f75
|
Hot fixes
|
2024-08-18 00:38:41 +03:00 |
|
Kaktus200020
|
8eab09980a
|
updateLoot
|
2024-08-18 00:31:53 +03:00 |
|
|
|
076dc73135
|
Merge branch 'Development' into Player
|
2024-08-18 00:20:15 +03:00 |
|
SergoDobro
|
0f6937dbf4
|
updates sets position on client
|
2024-08-17 23:48:39 +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 |
|
rawer470
|
a06f9c7ddb
|
MaybeFinallyMultiplayer
|
2024-08-17 22:25:03 +03:00 |
|
MARKPRO44
|
473820b14d
|
Fix Bags
|
2024-08-17 21:50:23 +03:00 |
|
SergoDobro
|
2503173729
|
fastFix
|
2024-08-17 20:16:16 +03:00 |
|
SergoDobro
|
96e6e37b56
|
minor fixes and cleaning
|
2024-08-17 20:12:25 +03:00 |
|
Levbegining
|
754a529d4a
|
Merge pull request #50 from progtime-net/Development
Development
|
2024-08-17 20:08:36 +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 |
|
Lev
|
c9d766242f
|
add vectors in UpdateInput, add event ActionEvent and Subscribing to the actions of the input manager
|
2024-08-17 19:42:55 +03:00 |
|
|
|
ae050576d5
|
Fix start
|
2024-08-17 19:32:12 +03:00 |
|
|
|
89978f0fc3
|
fix: content and usings
|
2024-08-17 19:13:46 +03:00 |
|
rawer470
|
6c07557deb
|
FixGetIp
|
2024-08-17 19:02:02 +03:00 |
|
SergoDobro
|
48e4864030
|
Merge branch 'Development' into MinorFixesAndConnections
|
2024-08-17 19:01:25 +03:00 |
|
|
|
2a5dde0169
|
Merge pull request #47 from progtime-net/Colleclables
Colleclables
|
2024-08-17 18:59:32 +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 |
|
|
|
f9aaacd3d0
|
Merge pull request #46 from progtime-net/map_load_collisions
Закончил загрузку коллизий
|
2024-08-17 18:16:37 +03:00 |
|
polten0
|
dc3dd2d37b
|
фикс namespace
|
2024-08-17 18:12:34 +03:00 |
|
polten0
|
9078c650d4
|
finish collision processing
|
2024-08-17 18:06:29 +03:00 |
|
|
|
19a7676b1d
|
Fix namespaces, add collectable
|
2024-08-17 17:57:04 +03:00 |
|
rawer470
|
d95c65c12c
|
SwitchOnServer
|
2024-08-17 14:03:06 +03:00 |
|
rawer470
|
2cce4ea9b9
|
CreateConnectMultiplayer
|
2024-08-17 12:25:53 +03:00 |
|
|
|
fcc8fac8ea
|
Fix mouse and hud drawing
|
2024-08-17 12:16:39 +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 |
|
|
|
3784e24497
|
Merge pull request #44 from progtime-net/FixSound
FinalFix
|
2024-08-17 12:08:49 +03:00 |
|
Kaktus200020
|
114f546c31
|
FinalFix
|
2024-08-17 11:52:54 +03:00 |
|
|
|
572d784fc3
|
Merge pull request #42 from progtime-net/Collision
Collision
|
2024-08-17 11:37:04 +03:00 |
|
PetrKu09
|
1b77e35c32
|
Resolve issues
|
2024-08-17 11:36:18 +03:00 |
|
|
|
72bfd52ae5
|
Start resolving issues
|
2024-08-17 11:22:38 +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 |
|
rawer470
|
215b538715
|
StartCreateLogicMultiPlayer3
|
2024-08-17 11:13:13 +03:00 |
|
PetrKu09
|
997f5db24a
|
CheckComponentCollision normak version
|
2024-08-17 11:12:27 +03:00 |
|
rawer470
|
c1d2a6b210
|
StartCreateLogicMultiPlayer2
|
2024-08-17 11:10:17 +03:00 |
|
|
|
bbc1a88571
|
Tried to fix map rendering issues
|
2024-08-17 10:58:46 +03:00 |
|
|
|
2324310068
|
Merge branch 'Development' into ServerBranch2
|
2024-08-17 10:53:24 +03:00 |
|
rawer470
|
f6663bdd3c
|
StartCreateLogicMultiPlayer
|
2024-08-17 10:50:05 +03:00 |
|
SergoDobro
|
d710866da5
|
Merge branch 'Development' of github.com:progtime-net/ZoFo into Development
|
2024-08-17 10:07:32 +03:00 |
|
SergoDobro
|
aed8016bfd
|
First animations, prepared for addition of new animations
|
2024-08-17 10:07:21 +03:00 |
|
polten0
|
bd9842cc8e
|
Merge branch 'Development' into hot_fix2
|
2024-08-17 03:09:04 +03:00 |
|
polten0
|
b4154bdb16
|
fix 2, removed blue lines, but still glitching tiles
|
2024-08-17 03:06:43 +03:00 |
|
rawer470
|
b1f24ce81b
|
WorkServerWithGUI2
|
2024-08-17 01:43:50 +03:00 |
|
|
|
23ee2b79a6
|
Fix tilsets path on linux
|
2024-08-17 01:31:49 +03:00 |
|
polten0
|
5a73ca2e31
|
Merge pull request #36 from progtime-net/hot_fix2
fixed loadMap
|
2024-08-17 01:21:37 +03:00 |
|
