SergoDobro
|
13a6f05475
|
merge fixes, minor monster fixes, physics to be remade very soon
|
2023-08-16 13:09:35 +03:00 |
|
SergoDobro
|
18d8ff814d
|
Merge remote-tracking branch 'origin/livingEntitiesVlad'
|
2023-08-16 12:21:18 +03:00 |
|
SergoDobro
|
e944a972d6
|
Merge remote-tracking branch 'origin/livingEntities'
# Conflicts:
# DangerousD/GameCore/GameObjects/Entity.cs
|
2023-08-16 09:58:18 +03:00 |
|
bmvolf
|
15f0571790
|
fixed errors zombie
|
2023-08-16 09:54:15 +03:00 |
|
SergoDobro
|
7bdde33394
|
added PhysicsManager to gamemanager
|
2023-08-16 00:42:57 +03:00 |
|
Lev
|
fc4ce31703
|
Merge branch 'main' of https://github.com/progtime-net/DangerousD
|
2023-08-15 19:32:58 +03:00 |
|
Lev
|
39d7549255
|
Merge branch 'physics'
|
2023-08-15 19:32:22 +03:00 |
|
Lev
|
4a09635ff7
|
недоделанный RayCast с 1 перегрузкой
|
2023-08-15 19:27:32 +03:00 |
|
N4K
|
4d8adebf69
|
wip
|
2023-08-15 18:49:05 +03:00 |
|
bmvolf
|
ac1b3b6373
|
ended work on zombie
|
2023-08-15 18:44:41 +03:00 |
|
MARKPRO44
|
52fc0b31fa
|
OptionsGUI_2
|
2023-08-15 18:39:00 +03:00 |
|
bmvolf
|
d65320f21b
|
added zombie walk and attack animation
|
2023-08-15 18:17:26 +03:00 |
|
MARKPRO44
|
540f75734e
|
OptionsGUI
|
2023-08-15 18:15:37 +03:00 |
|
gravity
|
01e60f9da4
|
Merge branch 'ui' of https://github.com/progtime-net/DangerousD into ui
|
2023-08-15 17:47:46 +03:00 |
|
gravity
|
bb24f6d7e6
|
ui
|
2023-08-15 17:47:33 +03:00 |
|
gravitymm
|
980a377be3
|
Merge pull request #3 from progtime-net/Lobby
CreateLoginGUI
|
2023-08-15 17:46:05 +03:00 |
|
polten0
|
81c5cf281b
|
CreateLoginGUI
|
2023-08-15 17:37:32 +03:00 |
|
gravity
|
14a5b445a1
|
ui
|
2023-08-15 17:31:55 +03:00 |
|
AnloGames
|
fb30b8628e
|
JsonTaskInit
|
2023-08-15 17:22:37 +03:00 |
|
bmvolf
|
03e6f7b75d
|
WIP
|
2023-08-15 17:21:03 +03:00 |
|
bmvolf
|
f2a6cdbd8d
|
wip
|
2023-08-15 17:20:14 +03:00 |
|
Timofey06
|
cb9b3664a4
|
TestWorkingVersionOfAnimator
|
2023-08-15 17:15:14 +03:00 |
|
Timofey06
|
2d33e13283
|
LastOldWorkVersionOfAnimator
|
2023-08-15 16:46:41 +03:00 |
|
Timofey06
|
5f6be8e23c
|
FixScaling
|
2023-08-15 16:15:37 +03:00 |
|
Kaktus200020
|
246e90c933
|
Methdos Add CheckCollision And OnCollision
|
2023-08-15 15:54:29 +03:00 |
|
gravity
|
463db1b00a
|
Merge branch 'ui'
|
2023-08-15 15:09:32 +03:00 |
|
gravity
|
6938507926
|
ui
|
2023-08-15 14:45:49 +03:00 |
|
gravitymm
|
ce23fb4793
|
Merge pull request #2 from progtime-net/ui2
Ui2 merge. Сделал LoginGUI
|
2023-08-15 14:38:14 +03:00 |
|
SergoDobro
|
b423ac2b49
|
prepared for origin but no refactoring
|
2023-08-15 14:38:01 +03:00 |
|
gravitymm
|
f7cbebc457
|
Merge branch 'ui' into ui2
|
2023-08-15 14:37:55 +03:00 |
|
gravity
|
e9547d04e0
|
ui
|
2023-08-15 14:30:46 +03:00 |
|
polten0
|
0ca55875c7
|
finishedFirstIterationOfLoginGUI
|
2023-08-15 14:23:44 +03:00 |
|
SergoDobro
|
3e5e5192b8
|
day commit refactoring
|
2023-08-15 13:40:45 +03:00 |
|
polten0
|
8b8ba7cacc
|
AddLoginGUI2
|
2023-08-15 12:13:48 +03:00 |
|
polten0
|
e642e53f06
|
AddLoginGUI
|
2023-08-15 12:12:15 +03:00 |
|
gravity
|
8477a3a274
|
ui
|
2023-08-15 11:39:02 +03:00 |
|
gravity
|
ad73fb265d
|
ui
|
2023-08-15 11:38:25 +03:00 |
|
Ivan Filipenkov
|
a70367eb27
|
global Content, automatic LoadContent for GameObject
|
2023-08-15 11:23:51 +03:00 |
|
SergoDobro
|
f298d83793
|
night commit NumMber One!
|
2023-08-15 02:21:25 +03:00 |
|
SergoDobro
|
4b855c2036
|
Merge branch 'main' of https://github.com/progtime-net/DangerousD
|
2023-08-15 01:28:23 +03:00 |
|
Timofey06
|
9d28f9ac4d
|
TestConstractorToStableObjects
|
2023-08-15 01:26:37 +03:00 |
|
SergoDobro
|
e45b34ac06
|
small refactoring and minor changes
|
2023-08-15 01:20:41 +03:00 |
|
Timofey06
|
d7921124e1
|
Merge branch 'soundManager'
|
2023-08-15 01:02:11 +03:00 |
|
linuxfight
|
06d54653c3
|
Added manager
|
2023-08-15 00:46:15 +03:00 |
|
Timofey06
|
27757bdfc2
|
revorkAnimator3
|
2023-08-14 20:15:32 +03:00 |
|
Timofey06
|
9eb6ae7113
|
revorkAnimotor2
|
2023-08-14 20:10:30 +03:00 |
|
Timofey06
|
95e466fe74
|
Merge branch 'main' of https://github.com/progtime-net/DangerousD
|
2023-08-14 20:07:47 +03:00 |
|
Timofey06
|
0bf49c55e9
|
ReworkingAnimator
|
2023-08-14 20:01:50 +03:00 |
|
Ivan Filipenkov
|
d0bf698c5d
|
GameObject structure
|
2023-08-14 19:48:11 +03:00 |
|
AnloGames
|
67a450527c
|
SomeErrorFixes
|
2023-08-14 19:31:12 +03:00 |
|