Commit graph

61 commits

Author SHA1 Message Date
bd73824cb4 Fix GetIp 2024-08-23 22:45:53 +03:00
SergoDobro
4f5270ba9b
Merge branch 'DevelopmentX' into GUITextures 2024-08-20 19:34:15 +03:00
dvaer
766d154877 Craft 2024-08-20 19:27:53 +03:00
Kaktus200020
46274c85c7 addExitZone 2024-08-20 19:10:16 +03:00
SergoDobro
d7e3ff1b06
Merge branch 'DevelopmentX' into exitzone 2024-08-20 18:00:17 +03:00
SergoDobro
dd72218287 Attack fixes 2024-08-20 17:54:52 +03:00
dvaer
7b1b04fdb3 Textures 2024-08-20 17:53:00 +03:00
dvaer
7f5bba6244 Textures 2024-08-20 17:44:32 +03:00
SergoDobro
6261cb5bf8
Merge branch 'DevelopmentX' into GUITextures 2024-08-20 17:14:21 +03:00
dvaer
5ecf46da29 Textures 2024-08-20 17:02:15 +03:00
SergoDobro
2047fc9552 Added bonfire 2024-08-20 16:49:33 +03:00
SergoDobro
406c6a3cce
Merge branch 'DevelopmentX' into AddSoundToGUI 2024-08-20 15:51:26 +03:00
Kaktus200020
0286c53706 ZombieFinish 2024-08-20 15:46:38 +03:00
SergoDobro
647b6ad941
Merge branch 'DevelopmentX' into PlayerAttack 2024-08-20 14:37:19 +03:00
SergoDobro
3f5938a124 hotfixes 2024-08-20 14:31:14 +03:00
dvaer
22bf643d0a Inventory 2024-08-20 14:08:37 +03:00
rawer470
12c006fe0d exit zone 2024-08-20 13:24:17 +03:00
Kaktus200020
b62fcb760f addMusic 2024-08-20 13:16:51 +03:00
SergoDobro
6d5f9e49ca
Merge branch 'DevelopmentX' into MinorOverallAndParticles 2024-08-20 10:44:16 +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
Kaktus200020
79d26896c7 addSounds 2024-08-20 04:01:37 +03:00
Lev
6b55b595c5 commit for merge fich for create StartCycledAnimation at AnimatedGraficsComponent 2024-08-20 03:57:05 +03:00
SergoDobro
06ce01e3a3
Merge pull request #80 from progtime-net/GUInew
Gu inew
2024-08-19 12:41:45 +03:00
dvaer
7590907b20 base 2024-08-19 01:10:57 +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
Kaktus200020
ba4fce8c24 updateAnimations 2024-08-18 19:27:38 +03:00
Kaktus200020
122dada6ea finis pls 2024-08-18 18:11:05 +03:00
Kaktus200020
e848bd77be addAnimationsZombie 2024-08-18 17:55:36 +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
SergoDobro
0336c3095b Player List Added + animations 2024-08-18 15:15:14 +03:00
polten0
0d34a8e8cd fixeeeees 2024-08-18 14:44:38 +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
SergoDobro
18b507047a fixing Content! 2024-08-18 14:24:30 +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
rawer470
8581fef566 FixErrorMgcbAnimation 2024-08-18 12:13:37 +03:00
SergoDobro
e2ac9286e5 Collisions ara Working!!!! Next Is Trigger! it is 2:40... help me.... 2024-08-18 02:41:09 +03:00
polten0
3e9f6d6c7f fixes 2024-08-18 01:15:18 +03:00
89978f0fc3 fix: content and usings 2024-08-17 19:13:46 +03:00
Kaktus200020
114f546c31 FinalFix 2024-08-17 11:52:54 +03:00
SergoDobro
d710866da5 Merge branch 'Development' of github.com:progtime-net/ZoFo into Development 2024-08-17 10:07:32 +03:00
SergoDobro
aed8016bfd First animations, prepared for addition of new animations 2024-08-17 10:07:21 +03:00
polten0
bd9842cc8e
Merge branch 'Development' into hot_fix2 2024-08-17 03:09:04 +03:00
polten0
b4154bdb16 fix 2, removed blue lines, but still glitching tiles 2024-08-17 03:06:43 +03:00
gravitymm
2bca370fe1
Merge branch 'Development' into GUI 2024-08-17 00:11:37 +03:00
dvaer
8f17932f0b GUI 2024-08-17 00:02:36 +03:00