Commit graph

progtime/ZoFo

Fork 0

6948a4e181

Merge pull request #70 from progtime-net/UpdateZombie SergoDobro 2024-08-18 19:31:06 +03:00
f0074edfd1

Merge branch 'DevelopmentX' into UpdateZombie SergoDobro 2024-08-18 19:30:48 +03:00
e2f287f7c2

Merge pull request #69 from progtime-net/DevelopmentX Andrey 2024-08-18 19:30:24 +03:00
ba4fce8c24 updateAnimations Kaktus200020 2024-08-18 19:27:38 +03:00
30b3e650cc SerializableDTO AnloGames 2024-08-18 19:06:12 +03:00
7244981e86

Merge pull request #68 from progtime-net/texture-flipping Andrey 2024-08-18 18:14:47 +03:00
22c595878d Add flipping and rotation around left-top edge Mootfrost777 2024-08-18 18:12:43 +03:00
122dada6ea finis pls Kaktus200020 2024-08-18 18:11:05 +03:00
58adb036a4 try1 Kaktus200020 2024-08-18 18:03:18 +03:00
e848bd77be addAnimationsZombie Kaktus200020 2024-08-18 17:55:36 +03:00
97cd62759c

Merge pull request #67 from progtime-net/fix-paths Andrey 2024-08-18 17:21:31 +03:00
dfaaf07e24 Fix paths to run game without sources Mootfrost777 2024-08-18 17:17:46 +03:00
7325f9d308 addRockAndBuildings Kaktus200020 2024-08-18 16:54:40 +03:00
46c28524c7 Merge branch 'MapDevelopment' of https://github.com/progtime-net/ZoFo into MapDevelopment polten0 2024-08-18 16:06:25 +03:00
d8a8b04066 add TileStamps polten0 2024-08-18 16:05:43 +03:00
5069d1a4a6

Merge pull request #66 from progtime-net/MapDevelopment Andrey 2024-08-18 15:53:15 +03:00
c9caf6e0c0

Merge pull request #65 from progtime-net/DevelopmentX Andrey 2024-08-18 15:52:58 +03:00
c737089e7f fix merge bags Lev 2024-08-18 15:52:35 +03:00
c35d030a64 Merge branch 'master' of github.com:progtime-net/ZoFo into DevelopmentX Mootfrost777 2024-08-18 15:52:10 +03:00
1dd6ad7794

Merge branch 'DevelopmentX' into MapDevelopment polten0 2024-08-18 15:47:54 +03:00
aec49ff1ed finaly some working stuff polten0 2024-08-18 15:35:58 +03:00
0ea1f44072

Merge pull request #64 from progtime-net/FixingDevelopment SergoDobro 2024-08-18 15:31:14 +03:00
4ce34d4c86

Merge pull request #63 from progtime-net/PlayerMovement SergoDobro 2024-08-18 15:24:26 +03:00
df4b1c64b7

Merge branch 'FixingDevelopment' into PlayerMovement SergoDobro 2024-08-18 15:23:48 +03:00
d098ef2e00 pulled info from dev polten0 2024-08-18 15:18:29 +03:00
2d9fdecdf9 s polten0 2024-08-18 15:15:32 +03:00
0336c3095b Player List Added + animations SergoDobro 2024-08-18 15:15:14 +03:00
0d34a8e8cd fixeeeees polten0 2024-08-18 14:44:38 +03:00
21a84ec5fa

Merge pull request #62 from progtime-net/StepAnimation SergoDobro 2024-08-18 14:42:26 +03:00
5f8f69eeff

Merge branch 'FixingDevelopment' into StepAnimation SergoDobro 2024-08-18 14:42:15 +03:00
d0db438d37 pull from dev polten0 2024-08-18 14:40:24 +03:00
b4ea811502

Merge pull request #61 from progtime-net/BasicZombie SergoDobro 2024-08-18 14:39:47 +03:00
50f1c5f4fc Add zombie Kaktus200020 2024-08-18 14:37:07 +03:00
e3bf42e60d saaving polten0 2024-08-18 14:33:44 +03:00
1a6f1c0fce addToClient Kaktus200020 2024-08-18 14:33:23 +03:00
aa6f003605

Merge pull request #60 from progtime-net/PathFix Andrey 2024-08-18 14:29:00 +03:00
18b507047a fixing Content! SergoDobro 2024-08-18 14:24:30 +03:00
7a1883c6d0 Fix soundManager Mootfrost777 2024-08-18 14:24:04 +03:00
429b24689e

Merge pull request #59 from progtime-net/GUI SergoDobro 2024-08-18 14:05:04 +03:00
c196968b04

Merge branch 'FixingDevelopment' into GUI SergoDobro 2024-08-18 14:04:48 +03:00
091e720763 PauseHUDBaseItem dvaer 2024-08-18 13:53:48 +03:00
022cc97afd

Merge pull request #58 from progtime-net/ForwardingDataServer SergoDobro 2024-08-18 13:51:29 +03:00
410454447b

Merge pull request #57 from progtime-net/Development SergoDobro 2024-08-18 13:28:01 +03:00
593f53fc47 fix minor ClientNetworkManager and ServerNetworkManager Lev 2024-08-18 13:23:31 +03:00
cd2e112c3a FixGetIp rawer470 2024-08-18 13:19:13 +03:00
f074cc04f9

Merge pull request #56 from progtime-net/GraphicsComponent-refactor SergoDobro 2024-08-18 13:05:36 +03:00
8e66435fe5

Merge branch 'Development2' into GraphicsComponent-refactor SergoDobro 2024-08-18 13:05:09 +03:00
b9c015455d Fixed graphics partially SergoDobro 2024-08-18 13:02:33 +03:00
a69f133d0a fix SounManager Lev 2024-08-18 12:47:13 +03:00
7a9875ff7b commit SergoDobro 2024-08-18 12:44:13 +03:00
600411cd55 Merge branch 'Development' into GraphicsComponent-refactor Mootfrost777 2024-08-18 12:41:21 +03:00
8581fef566 FixErrorMgcbAnimation rawer470 2024-08-18 12:13:37 +03:00
e0960fc839 working version SergoDobro 2024-08-18 12:04:34 +03:00
c7969d12fc DebugForwarding rawer470 2024-08-18 11:54:05 +03:00
7f47a63e46 hotfix animation maker SergoDobro 2024-08-18 11:33:04 +03:00
be0d38bb95 Fix inheritance Mootfrost777 2024-08-18 10:53:42 +03:00
d111c2f8cd

Merge pull request #55 from progtime-net/ServerBranchMultiPlayer SergoDobro 2024-08-18 10:48:35 +03:00
61c12a1144

Merge branch 'Development' into ServerBranchMultiPlayer SergoDobro 2024-08-18 10:48:29 +03:00
0afee1fb81 WorkConnectMultiPlayer rawer470 2024-08-18 10:43:02 +03:00
b8398669ec Merge branch 'Development' of github.com:progtime-net/ZoFo into Development Monti 2024-08-18 10:26:45 +03:00
7c9e13a490 animationBronya Monti 2024-08-18 10:26:14 +03:00
e2ac9286e5 Collisions ara Working!!!! Next Is Trigger! it is 2:40... help me.... SergoDobro 2024-08-18 02:41:09 +03:00
7226b99075

Merge pull request #54 from progtime-net/map-fix SergoDobro 2024-08-18 01:22:20 +03:00
3e9f6d6c7f fixes polten0 2024-08-18 01:15:18 +03:00
25cc668576

Merge pull request #53 from progtime-net/LootData SergoDobro 2024-08-18 01:07:18 +03:00
5a7fc98597 Fix entities displaying Mootfrost777 2024-08-18 00:57:50 +03:00
3ec0069f75 Hot fixes SergoDobro 2024-08-18 00:38:41 +03:00
8eab09980a updateLoot Kaktus200020 2024-08-18 00:31:53 +03:00
bd25894407 Fix Mootfrost777 2024-08-18 00:26:36 +03:00
8ab6f3d434

Merge pull request #52 from progtime-net/Player Andrey 2024-08-18 00:20:38 +03:00
076dc73135

Merge branch 'Development' into Player Andrey 2024-08-18 00:20:15 +03:00
fb2366c03c Merge branch 'refs/heads/Development' into GraphicsComponent-refactor Mootfrost777 2024-08-17 23:49:59 +03:00
0f6937dbf4 updates sets position on client SergoDobro 2024-08-17 23:48:39 +03:00
fd3c8305f2 Split GraphicsComponent.cs to animated and static Mootfrost777 2024-08-17 23:45:08 +03:00
6afd91b0b7 hotfixes SergoDobro 2024-08-17 23:34:20 +03:00
a6544a20f2

Merge pull request #51 from progtime-net/Collision SergoDobro 2024-08-17 23:19:33 +03:00
409fac0679

Merge branch 'Development' into Collision SergoDobro 2024-08-17 23:19:25 +03:00
a69f44468c Player now appears on client side + entityidsearch SergoDobro 2024-08-17 23:13:11 +03:00
85b55f6f41 addCollectable Kaktus200020 2024-08-17 22:26:02 +03:00
a06f9c7ddb MaybeFinallyMultiplayer rawer470 2024-08-17 22:25:03 +03:00
473820b14d Fix Bags MARKPRO44 2024-08-17 21:50:23 +03:00
b105f67df2 FixServer MARKPRO44 2024-08-17 21:22:18 +03:00
2503173729 fastFix SergoDobro 2024-08-17 20:16:16 +03:00
c8108d6781 PlayerWeaponAFK unknown 2024-08-17 20:14:55 +03:00
96e6e37b56 minor fixes and cleaning SergoDobro 2024-08-17 20:12:25 +03:00
754a529d4a

Merge pull request #50 from progtime-net/Development Levbegining 2024-08-17 20:08:36 +03:00
a2ea37f1ba

Merge pull request #49 from progtime-net/Development SergoDobro 2024-08-17 20:00:08 +03:00
30d663b278

Merge branch 'Collision' into Development SergoDobro 2024-08-17 19:58:04 +03:00
d0dc0c4714 Add CollisionComponent designer PetrKu09 2024-08-17 19:50:47 +03:00
8358be3a40 disabled Map SergoDobro 2024-08-17 19:48:33 +03:00
c9d766242f add vectors in UpdateInput, add event ActionEvent and Subscribing to the actions of the input manager Lev 2024-08-17 19:42:55 +03:00
9e00e4d05d LootData Kaktus200020 2024-08-17 19:36:30 +03:00
ae050576d5 Fix start Mootfrost777 2024-08-17 19:32:12 +03:00
f43411c840 AddFirstFilePNG unknown 2024-08-17 19:16:17 +03:00
89978f0fc3 fix: content and usings Mootfrost777 2024-08-17 19:13:46 +03:00
d8a278d2e4

Merge pull request #48 from progtime-net/MinorFixesAndConnections SergoDobro 2024-08-17 19:02:09 +03:00
6c07557deb FixGetIp rawer470 2024-08-17 19:02:02 +03:00
48e4864030

Merge branch 'Development' into MinorFixesAndConnections SergoDobro 2024-08-17 19:01:25 +03:00
2a5dde0169

Merge pull request #47 from progtime-net/Colleclables Andrey 2024-08-17 18:59:32 +03:00
5a6d56128c minor overall SergoDobro 2024-08-17 18:58:49 +03:00