-
-
Notifications
You must be signed in to change notification settings - Fork 105
[TM] FIX: Молоты не должны бить клиентов #2272
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.
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
base: beta-dev
Are you sure you want to change the base?
Conversation
Нужен ТМ |
This comment was marked as resolved.
This comment was marked as resolved.
ПОЧИНИ МЕРЖ КОНФЛИКТ |
Signed-off-by: MrCat15352 <125268716+MrCat15352@users.noreply.github.com>
Test merge deployment history:Test Merge Deployed @ 09/22/2025 20:35:06 +00:00:Server InstanceShiptest_Alpha Merged ByDe-Grand RevisionOrigin: 8cd3f55 Test Merge Updated @ 09/23/2025 02:02:00 +00:00:Server InstanceShiptest_Alpha Merged ByDe-Grand RevisionOrigin: 8cd3f55 Test Merge Updated @ 09/23/2025 17:05:02 +00:00:Server InstanceShiptest_Alpha Merged ByDe-Grand RevisionOrigin: 8cd3f55 Test Merge Updated @ 09/23/2025 17:27:43 +00:00:Server InstanceShiptest_Alpha Merged ByDe-Grand RevisionOrigin: 8cd3f55 Test Merge Updated @ 09/23/2025 18:05:10 +00:00:Server InstanceShiptest_Alpha Merged ByDe-Grand RevisionOrigin: 8cd3f55 Test Merge Updated @ 09/24/2025 09:54:10 +00:00:Server InstanceShiptest_Alpha Merged ByDe-Grand RevisionOrigin: 8cd3f55 Test Merge Updated @ 09/24/2025 14:45:48 +00:00:Server InstanceShiptest_Alpha Merged ByDe-Grand RevisionOrigin: 8cd3f55 Test Merge Updated @ 09/24/2025 15:03:00 +00:00:Server InstanceShiptest_Alpha Merged ByDe-Grand RevisionOrigin: 8cd3f55 Test Merge Updated @ 09/27/2025 08:25:43 +00:00:Server InstanceShiptest_Alpha Merged ByDe-Grand RevisionOrigin: 8cd3f55 Test Merge Updated @ 09/27/2025 18:20:04 +00:00:Server InstanceShiptest_Alpha Merged ByDe-Grand RevisionOrigin: 8cd3f55 Test Merge Updated @ 10/01/2025 19:07:00 +00:00:Server InstanceShiptest_Alpha Merged ByDe-Grand RevisionOrigin: 8cd3f55 Test Merge Removed @ 10/04/2025 15:00:28 +00:00:Server InstanceShiptest_Alpha |
Все ровно есть вылеты, но от топора. |
Тогда я даже не знаю |
Pull Request содержит конфликты. Устраните их, чтобы мы смогли оценить и принять запрос. |
Signed-off-by: MrCat15352 <125268716+MrCat15352@users.noreply.github.com>
Описание / Что этот PR делает
Пытаемся починить баг с молотами
Чиним броски молотов и топоров в мобов, вызывали рантайми
Причина создания ПР / Почему это хорошо для игры
Closed #2269
Список изменений