Commit graph

226 commits

Author SHA1 Message Date
polten0
28487fdee6 fixed map 2024-08-20 05:06:57 +03:00
92df5ee629
Merge branch 'DevelopmentX' into AddingLootToMap 2024-08-20 03:30:16 +03:00
SergoDobro
a4e877668b minor fixes + layerDepth attempt failed 2024-08-20 01:15:48 +03:00
SergoDobro
dd47d58851
Merge branch 'DevelopmentX' into PlayerLog 2024-08-20 00:43:50 +03:00
Lev
3742690e5c fix InputManager and add some logic in player for his attack 2024-08-20 00:39:20 +03:00
SergoDobro
f44ad37c1b added reflection in mapobject creation and fixed Collisions 2024-08-19 17:25:05 +03:00
SergoDobro
4a04bf7b7f
Merge pull request #79 from progtime-net/AssetsManager
Assets manager
2024-08-19 14:38:06 +03:00
polten0
0ccc504022 подготовка анимаций тайлов 2024-08-19 13:09:19 +03:00
SergoDobro
06ce01e3a3
Merge pull request #80 from progtime-net/GUInew
Gu inew
2024-08-19 12:41:45 +03:00
dvaer
98d193b7e0 base2 2024-08-19 12:36:10 +03:00
773d454b77
Merge branch 'DevelopmentX' into AssetsManager 2024-08-19 12:08:18 +03:00
b4c059bd12 Add AssetManager 2024-08-19 11:52:12 +03:00
Lev
fef09f3d4a upgrade player movement and upgrade InputManager 2024-08-19 02:25:09 +03:00
SergoDobro
ec275c7584 hotfixes
camera
scaling
2024-08-19 01:20:28 +03:00
dvaer
7590907b20 base 2024-08-19 01:10:57 +03:00
57f130e6f1
Merge pull request #76 from progtime-net/MapDevelopment
Дописал/переаисал Collectbles и его наследников, добавли кучу иконок,…
2024-08-19 00:48:36 +03:00
269905b339 Add recursive load of animations 2024-08-19 00:41:26 +03:00
polten0
15f92ad95b
Merge branch 'DevelopmentX' into MapDevelopment 2024-08-19 00:33:36 +03:00
polten0
b895535153 Дописал/переаисал Collectbles и его наследников, добавли кучу иконок, карта обрабатывает пикапы. 2024-08-19 00:24:57 +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
11d224414f Add AssetManager.cs 2024-08-18 23:38:49 +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
SergoDobro
f0074edfd1
Merge branch 'DevelopmentX' into UpdateZombie 2024-08-18 19:30:48 +03:00
Kaktus200020
ba4fce8c24 updateAnimations 2024-08-18 19:27:38 +03:00
AnloGames
30b3e650cc SerializableDTO 2024-08-18 19:06:12 +03:00
Kaktus200020
58adb036a4 try1 2024-08-18 18:03:18 +03:00
dfaaf07e24 Fix paths to run game without sources 2024-08-18 17:17:46 +03:00
Lev
c737089e7f fix merge bags 2024-08-18 15:52:35 +03:00
polten0
1dd6ad7794
Merge branch 'DevelopmentX' into MapDevelopment 2024-08-18 15:47:54 +03:00
polten0
aec49ff1ed finaly some working stuff 2024-08-18 15:35:58 +03:00
SergoDobro
df4b1c64b7
Merge branch 'FixingDevelopment' into PlayerMovement 2024-08-18 15:23:48 +03:00
polten0
d0db438d37 pull from dev 2024-08-18 14:40:24 +03:00
polten0
e3bf42e60d saaving 2024-08-18 14:33:44 +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
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
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
Lev
a69f133d0a fix SounManager 2024-08-18 12:47:13 +03:00
SergoDobro
7a9875ff7b commit 2024-08-18 12:44:13 +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
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