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

Jump to bottom

ъуъ #849

Open
wants to merge 9 commits into
base: master
Choose a base branch
from
Open

ъуъ #849

wants to merge 9 commits into from

Conversation

Inconnu1337
Copy link
Contributor

Описание PR

Почему / Баланс

Ссылка на публикацию в Discord

Техническая информация

Медиа

Требования

  • Я прочитал(а) и следую Руководство по созданию пулл реквестов. Я понимаю, что в противном случае мой ПР может быть закрыт по усмотрению мейнтейнера.
  • Я добавил скриншоты/видео к этому пулл реквесту, демонстрирующие его изменения в игре, или этот пулл реквест не требует демонстрации в игре

Критические изменения

Чейнджлог

@github-actions github-actions bot added Changes: UI Изменение интерфейса Changes: Sprites Изменение спрайтов labels Nov 27, 2024
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Nov 27, 2024 •
edited
Loading

RSI Diff Bot; head commit 779054c merging into 40540b3
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/ADT/ADTGlobalEvents/WW1/Mortars/mortar.rsi

State Old New Status
mortar_ammo_cas Added
mortar_ammo_custom Added
mortar_ammo_custom_locked Added
mortar_ammo_custom_no_fuel Added
mortar_ammo_custom_unlocked Added
mortar_ammo_flr Added
mortar_ammo_frag Added
mortar_ammo_fsh Added
mortar_ammo_he Added
mortar_ammo_inc Added
mortar_ammo_smk Added
mortar_m402 Added
mortar_m402_carry Added
mortar_m402_fire Added
mortar_m402_w Added
mortar_m402_w_carry Added
mortar_m402_w_fire Added

Resources/Textures/ADT/ADTGlobalEvents/WW1/Mortars/smoke.rsi

State Old New Status
smoke Added
smoke2 Added

Edit: diff updated after 779054c

Mirokko
Mirokko requested changes Nov 27, 2024
View reviewed changes
Copy link
Contributor

@Mirokko Mirokko left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Серьезных проблем я не нашел. Я не тестил это локально, если что.

Content.Server/ADT/WW1/AirStrikeSystem.cs Outdated Show resolved Hide resolved
@Darkiich
Copy link
Contributor

А нахуй нам мортира?

@Inconnu1337 Inconnu1337 marked this pull request as draft November 27, 2024 21:07
@github-actions github-actions bot added the Changes: Localization Изменение локализации label Nov 29, 2024
@Inconnu1337 Inconnu1337 marked this pull request as ready for review November 29, 2024 15:00
@Mirokko
Copy link
Contributor

Mirokko commented Nov 29, 2024

Аналогично. Выглядит норм, но я не имею возможности затестить локально. Хорошо бы кто-то затестил

@Mirokko
Copy link
Contributor

Mirokko commented Nov 29, 2024 •
edited
Loading

А нахуй нам мортира?

А почему нет? ГМы придумают зачем надо.

@Inconnu1337 Inconnu1337 added the Не Мерджить Не МЕРДЖИТЬ НИ В КОЕМ СЛУЧАЕ label Nov 29, 2024
jungarikjan
jungarikjan reviewed Nov 30, 2024
View reviewed changes
Copy link
Contributor

@jungarikjan jungarikjan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Локаль проверил, всё исправил

@Schrodinger71 Schrodinger71 marked this pull request as draft January 13, 2025 17:49
@Inconnu1337
Copy link
Contributor Author

alo blyat its DRAFT
dont trogat naxyi

@github-actions GitHub Actions
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

Schrodinger71
Schrodinger71 requested changes Jan 30, 2025
View reviewed changes
Copy link
Collaborator

@Schrodinger71 Schrodinger71 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

тесты, конфликттыыы

@Schrodinger71 Schrodinger71 marked this pull request as ready for review January 30, 2025 21:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jungarikjan jungarikjan jungarikjan left review comments

@Schrodinger71 Schrodinger71 Schrodinger71 requested changes

@Mirokko Mirokko Mirokko approved these changes

Requested changes must be addressed to merge this pull request.

Assignees
No one assigned
Labels
Changes: Localization Изменение локализации Changes: Sprites Изменение спрайтов Changes: UI Изменение интерфейса S: Merge Conflict size/L Не Мерджить Не МЕРДЖИТЬ НИ В КОЕМ СЛУЧАЕ
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@Inconnu1337 @Darkiich @Mirokko @Schrodinger71 @jungarikjan