SergoDobro
|
10052927ae
|
Merge branch 'ServerBranch' into Development
|
2024-08-16 15:12:39 +03:00 |
|
SergoDobro
|
32a4ff624f
|
Merge pull request #22 from progtime-net/GUI
servergui
|
2024-08-16 15:10:07 +03:00 |
|
dvaer
|
bad96b4dfc
|
servergui
|
2024-08-16 13:24:05 +03:00 |
|
SergoDobro
|
4723efb3dc
|
Merge pull request #21 from progtime-net/UpgradeInputManager
upgrade InputManager
|
2024-08-16 13:08:44 +03:00 |
|
SergoDobro
|
cf16b68b21
|
Merge branch 'Development' into UpgradeInputManager
|
2024-08-16 13:08:30 +03:00 |
|
SergoDobro
|
6b5f11c8da
|
Merge branch 'Development' of github.com:progtime-net/ZoFo into Development
|
2024-08-16 13:07:32 +03:00 |
|
SergoDobro
|
866f87c0d0
|
GameObject Almost Finished
|
2024-08-16 13:07:27 +03:00 |
|
Lev
|
ba757265f2
|
upgrade InputManager
|
2024-08-16 13:05:49 +03:00 |
|
rawer470
|
0ad40ac2d3
|
UpdateComments2
|
2024-08-16 13:04:54 +03:00 |
|
rawer470
|
9d9709441c
|
ReadyCreateServerGame
|
2024-08-16 12:35:02 +03:00 |
|
MARKPRO44
|
0363086277
|
merge
|
2024-08-16 12:29:47 +03:00 |
|
MARKPRO44
|
02ec3acb56
|
Comment
|
2024-08-16 12:29:04 +03:00 |
|
SergoDobro
|
b2041c07f5
|
Merge pull request #20 from progtime-net/Development
Merge pull request #19 from progtime-net/ServerBranch
|
2024-08-16 12:28:13 +03:00 |
|
SergoDobro
|
2187bc4466
|
Merge pull request #19 from progtime-net/ServerBranch
Server branch
|
2024-08-16 12:27:40 +03:00 |
|
SergoDobro
|
9d49e56764
|
Merge branch 'Development' into ServerBranch
|
2024-08-16 12:27:21 +03:00 |
|
rawer470
|
343f063422
|
AddComments
|
2024-08-16 12:19:54 +03:00 |
|
SergoDobro
|
f840ea9e78
|
Merge pull request #18 from progtime-net/GUI
optionsDone
|
2024-08-16 12:14:46 +03:00 |
|
dvaer
|
03fa614aed
|
optionsDone
|
2024-08-16 12:09:04 +03:00 |
|
SergoDobro
|
843f521a53
|
Merge pull request #17 from progtime-net/GUI
optionsDone
|
2024-08-16 11:51:02 +03:00 |
|
rawer470
|
2e5aeede16
|
ConnectSinglePlayer2
|
2024-08-16 11:47:00 +03:00 |
|
dvaer
|
b38a099108
|
optionsDone
|
2024-08-16 11:44:56 +03:00 |
|
rawer470
|
553677b074
|
ConnectSinglePlayer
|
2024-08-16 11:44:50 +03:00 |
|
MARKPRO44
|
973584a06e
|
merge
|
2024-08-16 11:44:37 +03:00 |
|
MARKPRO44
|
78a2f9a012
|
player0.1
|
2024-08-16 11:43:06 +03:00 |
|
|
|
1683fb7564
|
Merge pull request #15 from progtime-net/AnimationFileCreator
Add cross-platform support
|
2024-08-16 11:28:44 +03:00 |
|
|
|
3c88b5a245
|
Merge pull request #16 from progtime-net/Settings&Sound
Settings&sound
|
2024-08-16 11:28:28 +03:00 |
|
|
|
c2f3c84048
|
Add cross-platform support
|
2024-08-16 11:25:12 +03:00 |
|
Kaktus200020
|
cdcebdbfc8
|
MajorUpdate
|
2024-08-16 11:17:08 +03:00 |
|
MARKPRO44
|
2e9fccd99a
|
ClientJoin
|
2024-08-16 11:06:51 +03:00 |
|
Kaktus200020
|
96179a6708
|
AddSettingsManager
|
2024-08-16 11:05:52 +03:00 |
|
rawer470
|
6ee0b4fc73
|
ServerConflictUpdate
|
2024-08-16 10:41:25 +03:00 |
|
rawer470
|
e5a20a508a
|
FixConflictServer
|
2024-08-16 10:38:46 +03:00 |
|
rawer470
|
828525a912
|
CommentServer
|
2024-08-16 10:32:42 +03:00 |
|
SergoDobro
|
a8492abe60
|
Fixed gameObjects properties
Great Merge Done!
|
2024-08-16 09:44:31 +03:00 |
|
SergoDobro
|
15e453116e
|
Merge pull request #13 from progtime-net/SoundManager
SoundManagerButNotWork
|
2024-08-16 09:34:07 +03:00 |
|
SergoDobro
|
1db4c4dedd
|
Merge pull request #12 from progtime-net/GUI_gr
options
|
2024-08-16 09:33:16 +03:00 |
|
SergoDobro
|
01004096dd
|
Merge branch 'Development' into GUI_gr
|
2024-08-16 09:33:06 +03:00 |
|
dvaer
|
a9e5cc9a2e
|
options
|
2024-08-16 09:30:27 +03:00 |
|
Kaktus200020
|
39fff12602
|
SoundManagerButNotWork
|
2024-08-16 09:25:16 +03:00 |
|
SergoDobro
|
c84ecc3c9f
|
Great Merge Completed (TODO: GUI recheck)
Code Refactoring (moving gameobjects between folders)
|
2024-08-16 01:35:21 +03:00 |
|
SergoDobro
|
1718de9412
|
Merge pull request #11 from progtime-net/ClientServerManager
Client server manager
|
2024-08-16 01:29:22 +03:00 |
|
SergoDobro
|
7e2e042194
|
Merge branch 'Development' into ClientServerManager
|
2024-08-16 01:29:01 +03:00 |
|
SergoDobro
|
2c8af8b868
|
Merge pull request #10 from progtime-net/MapLoader
Map loader
|
2024-08-16 01:09:21 +03:00 |
|
polten0
|
e9cdcb42a6
|
Первая итерация парсинга тайлов
|
2024-08-16 01:00:21 +03:00 |
|
SergoDobro
|
5913e988f4
|
Merge branch 'gameObjects' into Development
|
2024-08-16 00:57:53 +03:00 |
|
SergoDobro
|
80b7d88099
|
Merge pull request #8 from progtime-net/Collision
Collision merged 1 merge conflict fix
|
2024-08-16 00:36:28 +03:00 |
|
SergoDobro
|
9e4a14a92e
|
Merge branch 'Development' into Collision
|
2024-08-16 00:36:01 +03:00 |
|
PetrKu09
|
d29b8c39cc
|
UpdateComponentCollision
|
2024-08-16 00:33:26 +03:00 |
|
MARKPRO44
|
e3330470fd
|
ClientNetworkManager
|
2024-08-15 22:12:05 +03:00 |
|
MARKPRO44
|
f4d2bae54d
|
ClientNetworkManager
|
2024-08-15 21:56:40 +03:00 |
|
