Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[TEST FIX] Фикс дебаг-теста #1125

Merged
merged 11 commits into from
Feb 22, 2025
Merged

[TEST FIX] Фикс дебаг-теста #1125

Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
ba3cd25
fix(proto): Тестовый фикс дебаг-теста
Schrodinger71 Feb 20, 2025
761b794
Merge branch 'master' into fix_debug_test
Schrodinger71 Feb 20, 2025
3054f8c
Revert "fix(proto): Тестовый фикс дебаг-теста"
Schrodinger71 Feb 20, 2025
dac311d
Merge branch 'fix_debug_test' of https://github.com/AdventureTimeSS14…
Schrodinger71 Feb 20, 2025
573f6d9
fix(map): delete shield on packed map
Schrodinger71 Feb 20, 2025
bb5dad4
fix(map): Fix, закомменчен компонент
Schrodinger71 Feb 20, 2025
fc0be93
fix(map): Commented - type: Blocking
Schrodinger71 Feb 20, 2025
2c3f958
Merge branch 'master' into fix_debug_test
Schrodinger71 Feb 21, 2025
f9e3c56
Merge branch 'master' into fix_debug_test
Schrodinger71 Feb 21, 2025
f22c3db
fix(map): Fix, раскоменчиваем
Schrodinger71 Feb 22, 2025
b018a4a
Merge branch 'fix_debug_test' of https://github.com/AdventureTimeSS14…
Schrodinger71 Feb 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 18 additions & 18 deletions Resources/Maps/packed.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76918,8 +76918,8 @@ entities:
- type: Transform
pos: 40.60262,28.679474
parent: 2
- type: Blocking
blockingToggleActionEntity: 2409
# - type: Blocking
# blockingToggleActionEntity: 2409
- type: ActionsContainer
- type: ContainerContainer
containers:
Expand All @@ -76931,8 +76931,8 @@ entities:
- type: Transform
pos: 40.594807,28.656036
parent: 2
- type: Blocking
blockingToggleActionEntity: 7822
# - type: Blocking
# blockingToggleActionEntity: 7822
- type: ActionsContainer
- type: ContainerContainer
containers:
Expand All @@ -76944,8 +76944,8 @@ entities:
- type: Transform
pos: 40.57918,28.913849
parent: 2
- type: Blocking
blockingToggleActionEntity: 8413
# - type: Blocking
# blockingToggleActionEntity: 8413
- type: ActionsContainer
- type: ContainerContainer
containers:
Expand All @@ -76959,8 +76959,8 @@ entities:
- type: Transform
pos: 40.04793,28.648224
parent: 2
- type: Blocking
blockingToggleActionEntity: 7583
# - type: Blocking
# blockingToggleActionEntity: 7583
- type: ActionsContainer
- type: ContainerContainer
containers:
Expand All @@ -76972,8 +76972,8 @@ entities:
- type: Transform
pos: 40.04012,28.835724
parent: 2
- type: Blocking
blockingToggleActionEntity: 8420
# - type: Blocking
# blockingToggleActionEntity: 8420
- type: ActionsContainer
- type: ContainerContainer
containers:
Expand All @@ -76985,8 +76985,8 @@ entities:
- type: Transform
pos: 40.063557,28.726349
parent: 2
- type: Blocking
blockingToggleActionEntity: 8423
# - type: Blocking
# blockingToggleActionEntity: 8423
- type: ActionsContainer
- type: ContainerContainer
containers:
Expand All @@ -77000,8 +77000,8 @@ entities:
- type: Transform
pos: 40.368244,28.741974
parent: 2
- type: Blocking
blockingToggleActionEntity: 8350
# - type: Blocking
# blockingToggleActionEntity: 8350
- type: ActionsContainer
- type: ContainerContainer
containers:
Expand All @@ -77013,8 +77013,8 @@ entities:
- type: Transform
pos: 40.368244,28.609161
parent: 2
- type: Blocking
blockingToggleActionEntity: 8418
# - type: Blocking
# blockingToggleActionEntity: 8418
- type: ActionsContainer
- type: ContainerContainer
containers:
Expand All @@ -77026,8 +77026,8 @@ entities:
- type: Transform
pos: 40.336994,28.882599
parent: 2
- type: Blocking
blockingToggleActionEntity: 15461
# - type: Blocking
# blockingToggleActionEntity: 15461
- type: ActionsContainer
- type: ContainerContainer
containers:
Expand Down
Loading