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.

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

FixAmmoSprite #1686

Merged
merged 5 commits into from
Aug 29, 2024
Merged

FixAmmoSprite #1686

merged 5 commits into from
Aug 29, 2024

Conversation

yulilok
Copy link

@yulilok yulilok commented Aug 29, 2024

Описание PR

Была исправлена ошибка в отображении патронов в коробке/ящике/магазине, также было добавлено отображение патронов в пустых магазинах.
fixes: #1179

Медиа
https://github.com/user-attachments/assets/78c3cb3a-91c9-4915-924c-440eff588086

Проверки

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

Изменения
🆑 yulilok

  • add: Добавлено отображение патронов в пустых магазинах.
  • fix: Исправлена ошибка в отображении патронов в коробке/ящике/магазине.

@github-actions github-actions bot added Changes: Sprites Изменение затронуло файлы ".rsu / .png" Changes: Prototypes Изменение затронуло файлы ".yml" кроме неймспейса "maps" labels Aug 29, 2024
Copy link

github-actions bot commented Aug 29, 2024

RSI Diff Bot; head commit 635eedd merging into 1677950
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/anti_materiel.rsi

State Old New Status
mag-2 Added
magb-2 Added

Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi

State Old New Status
mag-2 Added
mag10-2 Added
magb-2 Added

Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi

State Old New Status
mag-2 Added
magb-2 Added

Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi

State Old New Status
mag-2 Added

Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi

State Old New Status
mag-2 Added

Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi

State Old New Status
mag-2 Added
magb-2 Added

Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi

State Old New Status
mag-2 Added

Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag_short.rsi

State Old New Status
mag-2 Added

Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi

State Old New Status
mag-2 Added

Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/maxim.rsi

State Old New Status
mag-2 Added

Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi

State Old New Status
mag-2 Added

Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi

State Old New Status
mag-2 Added

Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Shotgun/m12.rsi

State Old New Status
mag-2 Added

Resources/Textures/SS220/Objects/Weapons/Guns/Ammunition/Magazine/MagazineUssp_RPK.rsi

State Old New Status
mag-2 Added

Resources/Textures/SS220/Objects/Weapons/Guns/Ammunition/Magazine/ussp_magppsh.rsi

State Old New Status
mag-2 Added

Edit: diff updated after 635eedd

@Ady4ik
Copy link

Ady4ik commented Aug 29, 2024

@EstKemran жду аппрув

@EstKemran
Copy link

@yulilok На все изменения вне нашей репы нужно поставить пометки

Comment on lines 54 to 60
- state: base-6 #ss-220 sprite fix
map: [ "enum.GunVisualLayers.Mag" ]
- type: MagazineVisuals
magState: base #ss-220 sprite fix
steps: 7
zeroVisible: false
- type: Appearance

Choose a reason for hiding this comment

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

Тут добавляется не одна строка, поэтому нужно будет сделать пометки через begin-end. Например:
#SS220-FixAmmoSprite-Begin
Новые строки
#SS220-FisAmmoSprite-End

Пометка типаsprite fix не подойдёт. Пометка должна указывать на твой PR или commit, чтобы понять, что за изменения, откуда оно и т.д.

Copy link

@DexlerXD DexlerXD left a comment

Choose a reason for hiding this comment

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

как подметил Кемран, добавить пометки на все измеения вне папок 220

Copy link

@DexlerXD DexlerXD left a comment

Choose a reason for hiding this comment

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

написать пометки на всех изменениях вне наших папок

Choose a reason for hiding this comment

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

пометка кемрана?

@DexlerXD DexlerXD merged commit 768d662 into SerbiaStrong-220:master Aug 29, 2024
17 checks passed
@yulilok yulilok deleted the FixAmmoSprite branch August 31, 2024 15:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: Prototypes Изменение затронуло файлы ".yml" кроме неймспейса "maps" Changes: Sprites Изменение затронуло файлы ".rsu / .png"
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Патроны
4 participants