Commit graph

401 commits

Author SHA1 Message Date
Kaktus200020
1655a9ad80 addLootAndEnemies 2024-08-20 02:37:36 +03:00
polten0
95f09874cc Added dirt 2024-08-20 01:14:35 +03:00
polten0
a5fa81adb8 grass support, campfire, bit of TileStamps 2024-08-20 00:22:03 +03:00
polten0
0ccc504022 подготовка анимаций тайлов 2024-08-19 13:09:19 +03:00
polten0
e922061a9f add zombie template 2024-08-19 12:19:21 +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
SergoDobro
a1d209ba37 scaling 2024-08-19 01:43:34 +03:00
SergoDobro
ec275c7584 hotfixes
camera
scaling
2024-08-19 01:20:28 +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
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
SergoDobro
3497d5c887
Merge pull request #73 from progtime-net/ObjectDeletion
Object delete allowed + minor collision fix
2024-08-18 23:09:11 +03:00
SergoDobro
c9c281a4be Object delete allowed + minor collision fix 2024-08-18 22:51:47 +03:00
SergoDobro
d638fa585a
Merge pull request #71 from progtime-net/TriggerZoneFeature
Physics: added triggers
2024-08-18 20:02:27 +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
6948a4e181
Merge pull request #70 from progtime-net/UpdateZombie
Update zombie
2024-08-18 19:31:06 +03:00
SergoDobro
f0074edfd1
Merge branch 'DevelopmentX' into UpdateZombie 2024-08-18 19:30:48 +03:00
e2f287f7c2
Merge pull request #69 from progtime-net/DevelopmentX
Development x
2024-08-18 19:30:24 +03:00
Kaktus200020
ba4fce8c24 updateAnimations 2024-08-18 19:27:38 +03:00
AnloGames
30b3e650cc SerializableDTO 2024-08-18 19:06:12 +03:00
7244981e86
Merge pull request #68 from progtime-net/texture-flipping
Add flipping and rotation around left-top edge
2024-08-18 18:14:47 +03:00
22c595878d Add flipping and rotation around left-top edge 2024-08-18 18:12:43 +03:00
Kaktus200020
122dada6ea finis pls 2024-08-18 18:11:05 +03:00
Kaktus200020
58adb036a4 try1 2024-08-18 18:03:18 +03:00
Kaktus200020
e848bd77be addAnimationsZombie 2024-08-18 17:55:36 +03:00
97cd62759c
Merge pull request #67 from progtime-net/fix-paths
Fix paths to run game without sources
2024-08-18 17:21:31 +03:00
dfaaf07e24 Fix paths to run game without sources 2024-08-18 17:17:46 +03:00
Kaktus200020
7325f9d308 addRockAndBuildings 2024-08-18 16:54:40 +03:00
polten0
46c28524c7 Merge branch 'MapDevelopment' of https://github.com/progtime-net/ZoFo into MapDevelopment 2024-08-18 16:06:25 +03:00
polten0
d8a8b04066 add TileStamps 2024-08-18 16:05:43 +03:00
5069d1a4a6
Merge pull request #66 from progtime-net/MapDevelopment
Map development
2024-08-18 15:53:15 +03:00
c9caf6e0c0
Merge pull request #65 from progtime-net/DevelopmentX
Development x
2024-08-18 15:52:58 +03:00
Lev
c737089e7f fix merge bags 2024-08-18 15:52:35 +03:00
c35d030a64 Merge branch 'master' of github.com:progtime-net/ZoFo into DevelopmentX 2024-08-18 15:52:10 +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
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
polten0
d098ef2e00 pulled info from dev 2024-08-18 15:18:29 +03:00
polten0
2d9fdecdf9 s 2024-08-18 15:15:32 +03:00