Commit graph

353 commits

Author SHA1 Message Date
c9caf6e0c0
Merge pull request #65 from progtime-net/DevelopmentX
Development x
2024-08-18 15:52:58 +03:00
c35d030a64 Merge branch 'master' of github.com:progtime-net/ZoFo into DevelopmentX 2024-08-18 15:52:10 +03:00
SergoDobro
0ea1f44072
Merge pull request #64 from progtime-net/FixingDevelopment
Fixing development
2024-08-18 15:31:14 +03:00
SergoDobro
4ce34d4c86
Merge pull request #63 from progtime-net/PlayerMovement
Player movement
2024-08-18 15:24:26 +03:00
SergoDobro
df4b1c64b7
Merge branch 'FixingDevelopment' into PlayerMovement 2024-08-18 15:23:48 +03:00
SergoDobro
0336c3095b Player List Added + animations 2024-08-18 15:15:14 +03:00
SergoDobro
21a84ec5fa
Merge pull request #62 from progtime-net/StepAnimation
Step animation
2024-08-18 14:42:26 +03:00
SergoDobro
5f8f69eeff
Merge branch 'FixingDevelopment' into StepAnimation 2024-08-18 14:42:15 +03:00
SergoDobro
b4ea811502
Merge pull request #61 from progtime-net/BasicZombie
Basic zombie
2024-08-18 14:39:47 +03:00
Kaktus200020
50f1c5f4fc Add zombie 2024-08-18 14:37:07 +03:00
Kaktus200020
1a6f1c0fce addToClient 2024-08-18 14:33:23 +03:00
aa6f003605
Merge pull request #60 from progtime-net/PathFix
Fix soundManager
2024-08-18 14:29:00 +03:00
SergoDobro
18b507047a fixing Content! 2024-08-18 14:24:30 +03:00
7a1883c6d0 Fix soundManager 2024-08-18 14:24:04 +03:00
SergoDobro
429b24689e
Merge pull request #59 from progtime-net/GUI
G UI
2024-08-18 14:05:04 +03:00
SergoDobro
c196968b04
Merge branch 'FixingDevelopment' into GUI 2024-08-18 14:04:48 +03:00
dvaer
091e720763 PauseHUDBaseItem 2024-08-18 13:53:48 +03:00
SergoDobro
022cc97afd
Merge pull request #58 from progtime-net/ForwardingDataServer
Forwarding data server
2024-08-18 13:51:29 +03:00
SergoDobro
410454447b
Merge pull request #57 from progtime-net/Development
Development
2024-08-18 13:28:01 +03:00
Lev
593f53fc47 fix minor ClientNetworkManager and ServerNetworkManager 2024-08-18 13:23:31 +03:00
rawer470
cd2e112c3a FixGetIp 2024-08-18 13:19:13 +03:00
SergoDobro
f074cc04f9
Merge pull request #56 from progtime-net/GraphicsComponent-refactor
Graphics component refactor
2024-08-18 13:05:36 +03:00
SergoDobro
8e66435fe5
Merge branch 'Development2' into GraphicsComponent-refactor 2024-08-18 13:05:09 +03:00
SergoDobro
b9c015455d Fixed graphics partially 2024-08-18 13:02:33 +03:00
Lev
a69f133d0a fix SounManager 2024-08-18 12:47:13 +03:00
SergoDobro
7a9875ff7b commit 2024-08-18 12:44:13 +03:00
600411cd55 Merge branch 'Development' into GraphicsComponent-refactor 2024-08-18 12:41:21 +03:00
rawer470
8581fef566 FixErrorMgcbAnimation 2024-08-18 12:13:37 +03:00
SergoDobro
e0960fc839 working version 2024-08-18 12:04:34 +03:00
rawer470
c7969d12fc DebugForwarding 2024-08-18 11:54:05 +03:00
SergoDobro
7f47a63e46 hotfix animation maker 2024-08-18 11:33:04 +03:00
be0d38bb95 Fix inheritance 2024-08-18 10:53:42 +03:00
SergoDobro
d111c2f8cd
Merge pull request #55 from progtime-net/ServerBranchMultiPlayer
Server branch multi player
2024-08-18 10:48:35 +03:00
SergoDobro
61c12a1144
Merge branch 'Development' into ServerBranchMultiPlayer 2024-08-18 10:48:29 +03:00
rawer470
0afee1fb81 WorkConnectMultiPlayer 2024-08-18 10:43:02 +03:00
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
5a7fc98597 Fix entities displaying 2024-08-18 00:57:50 +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
bd25894407 Fix 2024-08-18 00:26:36 +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
fb2366c03c Merge branch 'refs/heads/Development' into GraphicsComponent-refactor 2024-08-17 23:49:59 +03:00
SergoDobro
0f6937dbf4 updates sets position on client 2024-08-17 23:48:39 +03:00
fd3c8305f2 Split GraphicsComponent.cs to animated and static 2024-08-17 23:45:08 +03:00