Commit graph

36 commits

Author SHA1 Message Date
Monti
b8398669ec Merge branch 'Development' of github.com:progtime-net/ZoFo into Development 2024-08-18 10:26:45 +03:00
Monti
7c9e13a490 animationBronya 2024-08-18 10:26:14 +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
f9aaacd3d0
Merge pull request #46 from progtime-net/map_load_collisions
Закончил загрузку коллизий
2024-08-17 18:16:37 +03:00
polten0
9078c650d4 finish collision processing 2024-08-17 18:06:29 +03:00
3784e24497
Merge pull request #44 from progtime-net/FixSound
FinalFix
2024-08-17 12:08:49 +03:00
Kaktus200020
114f546c31 FinalFix 2024-08-17 11:52:54 +03:00
SergoDobro
0a19331a38 Merge branch 'Development' of github.com:progtime-net/ZoFo into Development 2024-08-17 11:52:00 +03:00
SergoDobro
20a25d5c8b minor changes + examples of animations 2024-08-17 11:51:54 +03:00
polten0
9f7c69fa4f
Merge branch 'Development' into fix1 2024-08-17 10:53:26 +03:00
polten0
557c371222 fix1 2024-08-17 10:50:20 +03:00
dbabd56119
Merge pull request #39 from progtime-net/hot_fix2
hot fix with build
2024-08-17 10:43:12 +03:00
polten0
495381d7ca hot fix with build 2024-08-17 10:37:30 +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
polten0
5a73ca2e31
Merge pull request #36 from progtime-net/hot_fix2
fixed loadMap
2024-08-17 01:21:37 +03:00
polten0
539f8f3021 fixed loadMap 2024-08-17 01:11:07 +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
SergoDobro
e9698a8669 Added basic drawing, temporary removed data sending in SendData 2024-08-16 22:01:41 +03:00
SergoDobro
8bf1bff778 COnnected maploader and objects creation + mapobject fix + graphicsDeviceFix 2024-08-16 18:21:50 +03:00
Kaktus200020
bafd19b78e
Merge branch 'Development' into UpdateSettings 2024-08-16 16:46:08 +03:00
Kaktus200020
cd9da3fb61 FinalUpdate 2024-08-16 16:41:48 +03:00
polten0
2ec1b3b268
Merge pull request #26 from progtime-net/maploader
Maploader
2024-08-16 15:35:36 +03:00
polten0
621e367034 попытка 3 2024-08-16 15:32:10 +03:00
dvaer
bad96b4dfc servergui 2024-08-16 13:24:05 +03:00
dvaer
b38a099108 optionsDone 2024-08-16 11:44:56 +03:00
dvaer
a9e5cc9a2e options 2024-08-16 09:30:27 +03:00
dvaer
4207258d15 mainMenu 2024-08-15 16:21:40 +03:00
dvaer
fb2b685136 addDebugHUD 2024-08-15 11:36:04 +03:00
dvaer
10c651b042 content 2024-08-15 10:32:56 +03:00
04d085847a
Initial 2024-08-15 00:03:53 +03:00