Commit graph

101 commits

Author SHA1 Message Date
SergoDobro
ffff0fb299 Merge branch 'DevelopmentX' of github.com:progtime-net/ZoFo into DevelopmentX 2024-08-20 20:10:57 +03:00
SergoDobro
0ae47df396 fix 2024-08-20 20:10:34 +03:00
AnloGames
250118d51c brbrbrcoommit 2024-08-20 19:55:11 +03:00
SergoDobro
439009ad4d
Merge branch 'DevelopmentX' into AddPlayers 2024-08-20 19:29:12 +03:00
AnloGames
128f304780 MultiplyPlayersShootInterractCommit 2024-08-20 19:05:02 +03:00
AnloGames
a3ffef519a MultiplyPlayerCommit 2024-08-20 18:28:51 +03:00
SergoDobro
d7e3ff1b06
Merge branch 'DevelopmentX' into exitzone 2024-08-20 18:00:17 +03:00
SergoDobro
e9150c1717 Merge branch 'DevelopmentX' of github.com:progtime-net/ZoFo into DevelopmentX 2024-08-20 17:55:00 +03:00
SergoDobro
dd72218287 Attack fixes 2024-08-20 17:54:52 +03:00
AnloGames
09ecf63c80 AddTodoToAddDifferentPlayers 2024-08-20 17:36:45 +03:00
SergoDobro
4421ceefd8
Merge branch 'DevelopmentX' into NetworkMultiplyPlayers2 2024-08-20 16:34:21 +03:00
SergoDobro
3a978ea51b player attack fixes 2024-08-20 15:46:59 +03:00
rawer470
f870a2f129 Multiplayer 2024-08-20 15:17:18 +03:00
AnloGames
549c7e34a3 Merge Net part 3 done 2024-08-20 14:03:23 +03:00
rawer470
12c006fe0d exit zone 2024-08-20 13:24:17 +03:00
AnloGames
e57291cb4c StopObjectCreatedCommit 2024-08-20 12:17:53 +03:00
SergoDobro
f7688a7785 merge net part 1 2024-08-20 12:12:27 +03:00
SergoDobro
eea3e899a9
Merge branch 'DevelopmentX' into NetworkManagerRDPProtocolImplementation 2024-08-20 11:43:14 +03:00
SergoDobro
4884abad87 minor overall + shakeeffect 2024-08-20 04:28:06 +03:00
AnloGames
090a3dd3aa NetworkGameStartCommit 2024-08-20 04:03:12 +03:00
SergoDobro
a4e877668b minor fixes + layerDepth attempt failed 2024-08-20 01:15:48 +03:00
rawer470
bed68922a9 StartMultiplayerGame 2024-08-20 01:03:01 +03:00
AnloGames
332680a8eb DESERIALIZATION-FIX-COMMIT 2024-08-19 19:40:03 +03:00
SergoDobro
f9aeb1319c
Merge branch 'DevelopmentX' into UpdateZombie 2024-08-19 19:21:18 +03:00
Kaktus200020
76a62a0a26 finishZombie 2024-08-19 18:56:18 +03:00
SergoDobro
f44ad37c1b added reflection in mapobject creation and fixed Collisions 2024-08-19 17:25:05 +03:00
AnloGames
2c3405d007 FirstWorkingRdpCommit 2024-08-19 12:33:43 +03:00
AnloGames
dae5cab5c6 RDP-ServerNM 2024-08-19 11:48:57 +03:00
SergoDobro
784deabe9b Working Version 2024-08-19 10:13:05 +03:00
SergoDobro
a1d209ba37 scaling 2024-08-19 01:43:34 +03:00
SergoDobro
ec275c7584 hotfixes
camera
scaling
2024-08-19 01:20:28 +03:00
SergoDobro
5542dfbc58
Merge branch 'DevelopmentX' into PlayerLogic 2024-08-18 23:54:02 +03:00
Lev
22e63c7c88 add shootEvent, OnInteract events to Game, Player can move with WASD and arrows 2024-08-18 23:44:35 +03:00
AnloGames
749f1d2bc3 BaseCommit 2024-08-18 22:57:21 +03:00
SergoDobro
c9c281a4be Object delete allowed + minor collision fix 2024-08-18 22:51:47 +03:00
SergoDobro
a62bbc16bb
Merge branch 'DevelopmentX' into TriggerZoneFeature 2024-08-18 20:02:15 +03:00
SergoDobro
51ece0112c Physics: added triggers 2024-08-18 19:47:03 +03:00
AnloGames
30b3e650cc SerializableDTO 2024-08-18 19:06:12 +03:00
Lev
c737089e7f fix merge bags 2024-08-18 15:52:35 +03:00
polten0
aec49ff1ed finaly some working stuff 2024-08-18 15:35:58 +03:00
SergoDobro
0336c3095b Player List Added + animations 2024-08-18 15:15:14 +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
SergoDobro
022cc97afd
Merge pull request #58 from progtime-net/ForwardingDataServer
Forwarding data server
2024-08-18 13:51:29 +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
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
SergoDobro
e0960fc839 working version 2024-08-18 12:04:34 +03:00
rawer470
c7969d12fc DebugForwarding 2024-08-18 11:54:05 +03:00