Commit graph

432 commits

Author SHA1 Message Date
dvaer
7f5bba6244 Textures 2024-08-20 17:44:32 +03:00
dvaer
5ecf46da29 Textures 2024-08-20 17:02:15 +03:00
dvaer
22bf643d0a Inventory 2024-08-20 14:08:37 +03:00
SergoDobro
b246532a6e player's health can decrease 2024-08-20 11:34:11 +03:00
SergoDobro
d819caeee2
Merge pull request #90 from progtime-net/MinorOverallAndParticles
minor overall + shakeeffect
2024-08-20 10:45:30 +03:00
SergoDobro
6d5f9e49ca
Merge branch 'DevelopmentX' into MinorOverallAndParticles 2024-08-20 10:44:16 +03:00
SergoDobro
64e8950a7d
Merge pull request #85 from progtime-net/GUIHUD
HUDInvOtherMenu
2024-08-20 05:18:05 +03:00
SergoDobro
d9ae6c395d
Merge branch 'DevelopmentX' into GUIHUD 2024-08-20 05:17:43 +03:00
SergoDobro
04c9b1a0b2
Merge pull request #88 from progtime-net/hot_fix
fixed map
2024-08-20 05:09:19 +03:00
polten0
28487fdee6 fixed map 2024-08-20 05:06:57 +03:00
SergoDobro
4884abad87 minor overall + shakeeffect 2024-08-20 04:28:06 +03:00
1990f2ba56
Merge pull request #86 from progtime-net/AddingLootToMap
Adding loot to map
2024-08-20 03:30:34 +03:00
92df5ee629
Merge branch 'DevelopmentX' into AddingLootToMap 2024-08-20 03:30:16 +03:00
Kaktus200020
1655a9ad80 addLootAndEnemies 2024-08-20 02:37:36 +03:00
dvaer
2d6f8c47da HUDInvOtherMenu 2024-08-20 01:51:36 +03:00
SergoDobro
a4e877668b minor fixes + layerDepth attempt failed 2024-08-20 01:15:48 +03:00
polten0
95f09874cc Added dirt 2024-08-20 01:14:35 +03:00
SergoDobro
b228c526a3
Merge pull request #84 from progtime-net/PlayerLog
Player log
2024-08-20 00:45:36 +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
polten0
a5fa81adb8 grass support, campfire, bit of TileStamps 2024-08-20 00:22:03 +03:00
SergoDobro
baf0c9f093 hotfix 2024-08-19 19:29:24 +03:00
SergoDobro
bfda449911
Merge pull request #82 from progtime-net/UpdateZombie
Update zombie
2024-08-19 19:21:32 +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
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
polten0
e922061a9f add zombie template 2024-08-19 12:19:21 +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
53dede972f
Merge pull request #78 from progtime-net/DevelopmentX
Development x
2024-08-19 11:43:56 +03:00
SergoDobro
784deabe9b Working Version 2024-08-19 10:13:05 +03:00
Lev
fef09f3d4a upgrade player movement and upgrade InputManager 2024-08-19 02:25:09 +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
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
4c8b65f7e5
Merge pull request #77 from progtime-net/animations-recursive
Add recursive load of animations
2024-08-19 00:42:12 +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
df49c509ad
Merge pull request #75 from progtime-net/PlayerLogic
Player logic
2024-08-18 23:54:11 +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
f379f14ec7 debug draw 2024-08-18 23:34:26 +03:00
SergoDobro
21cb1d09aa
Merge pull request #74 from progtime-net/map_creation
addRockAndBuildings
2024-08-18 23:28:11 +03:00