Monti
|
b8398669ec
|
Merge branch 'Development' of github.com:progtime-net/ZoFo into Development
|
2024-08-18 10:26:45 +03:00 |
|
Monti
|
7c9e13a490
|
animationBronya
|
2024-08-18 10:26:14 +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
|
7226b99075
|
Merge pull request #54 from progtime-net/map-fix
Map fix
|
2024-08-18 01:22:20 +03:00 |
|
polten0
|
3e9f6d6c7f
|
fixes
|
2024-08-18 01:15:18 +03:00 |
|
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 |
|
|
|
8ab6f3d434
|
Merge pull request #52 from progtime-net/Player
Player
|
2024-08-18 00:20:38 +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
|
6afd91b0b7
|
hotfixes
|
2024-08-17 23:34:20 +03:00 |
|
SergoDobro
|
a6544a20f2
|
Merge pull request #51 from progtime-net/Collision
Collision
|
2024-08-17 23:19:33 +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 |
|
Kaktus200020
|
85b55f6f41
|
addCollectable
|
2024-08-17 22:26:02 +03:00 |
|
MARKPRO44
|
473820b14d
|
Fix Bags
|
2024-08-17 21:50:23 +03:00 |
|
MARKPRO44
|
b105f67df2
|
FixServer
|
2024-08-17 21:22:18 +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
|
a2ea37f1ba
|
Merge pull request #49 from progtime-net/Development
Development
|
2024-08-17 20:00:08 +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 |
|
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 |
|
Kaktus200020
|
9e00e4d05d
|
LootData
|
2024-08-17 19:36:30 +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 |
|
SergoDobro
|
d8a278d2e4
|
Merge pull request #48 from progtime-net/MinorFixesAndConnections
minor overall
|
2024-08-17 19:02:09 +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 |
|
|
|
ec550ea093
|
Add wood dummy
|
2024-08-17 18:07:12 +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 |
|
MARKPRO44
|
74ec7f4deb
|
merge5
|
2024-08-17 12:23:12 +03:00 |
|
MARKPRO44
|
9107490279
|
Sounds
|
2024-08-17 12:21:00 +03:00 |
|
|
|
fcc8fac8ea
|
Fix mouse and hud drawing
|
2024-08-17 12:16:39 +03:00 |
|
MARKPRO44
|
4d67061a2b
|
Sounds
|
2024-08-17 12:14:49 +03:00 |
|
MARKPRO44
|
34fbd7f67e
|
Sounds
|
2024-08-17 12:12:51 +03:00 |
|
|
|
81ab544d11
|
Merge pull request #45 from progtime-net/UpdateEntity
create inputMamager
|
2024-08-17 12:12:24 +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 |
|
|
|
65bcbfa64f
|
Merge pull request #43 from progtime-net/StepAnimation
Step animation
|
2024-08-17 12:05:32 +03:00 |
|
|
|
c1196e6c0a
|
Merge remote-tracking branch 'origin/StepAnimation' into StepAnimation
# Conflicts:
# ZoFo/GameCore/Graphics/GraphicsComponent.cs
|
2024-08-17 12:03:37 +03:00 |
|
