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

Перенос всех постеров #304

Merged
merged 7 commits into from
Aug 21, 2024

Conversation

Lonkuk
Copy link
Contributor

@Lonkuk Lonkuk commented Aug 18, 2024

Описание PR

Проверки

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

no cl
Перенесли постеры со старого репозитория

@github-actions github-actions bot added Changes: Sprites Изменение спрайтов No C# Changes: Localization Изменение локализации labels Aug 18, 2024
Copy link
Contributor

github-actions bot commented Aug 18, 2024

RSI Diff Bot; head commit 7c4d094 merging into 58a7b89
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/ADT/Structures/Wallmounts/128x128posters.rsi

State Old New Status
roza Added

Resources/Textures/ADT/Structures/Wallmounts/dontsitdown.rsi

State Old New Status
dontsitdown Added

Resources/Textures/ADT/Structures/Wallmounts/donttalktoarty.rsi

State Old New Status
donttalktoarty Added

Resources/Textures/ADT/Structures/Wallmounts/lustymoth.rsi

State Old New Status
lustymoth Added

Resources/Textures/ADT/Structures/Wallmounts/paintings.rsi

State Old New Status
painting_gagarin Added

Resources/Textures/ADT/Structures/Wallmounts/panem.rsi

State Old New Status
panem Added

Resources/Textures/ADT/Structures/Wallmounts/papersplease.rsi

State Old New Status
papersplease Added

Resources/Textures/ADT/Structures/Wallmounts/passthebanana.rsi

State Old New Status
passthebanana Added

Resources/Textures/ADT/Structures/Wallmounts/pizzatime.rsi

State Old New Status
pizzatime Added

Resources/Textures/ADT/Structures/Wallmounts/plasmaman.rsi

State Old New Status
plasmaman Added

Resources/Textures/ADT/Structures/Wallmounts/poster_helloween.rsi

State Old New Status
happyhalloween Added
spider Added
spiderweb1 Added
spiderweb2 Added
spooky Added
tayarhalloween Added
yummy Added

Resources/Textures/ADT/Structures/Wallmounts/poster_new_year.rsi

State Old New Status
new_year Added
new_year2 Added
new_year3 Added

Resources/Textures/ADT/Structures/Wallmounts/poster_oneyearbirthday.rsi

State Old New Status
poster1 Added
poster2 Added
poster3 Added
poster4 Added

Resources/Textures/ADT/Structures/Wallmounts/poster_syndicate.rsi

State Old New Status
error Added
gasattack Added
nobad Added
nogood Added

Resources/Textures/ADT/Structures/Wallmounts/poster_ussp.rsi

State Old New Status
bkf Added
kdv Added
kdv2 Added
ks Added
ks2 Added
rhbz Added
ussp Added
ussp2 Added

Resources/Textures/ADT/Structures/Wallmounts/posters.rsi

State Old New Status
poster_adtfearthem_contraband Added
poster_adtgreatfood_legit Added
poster_adtlustardeco_contraband Added
poster_adtlusttayaran_contraband Added
poster_adtlustuma_contraband Added
poster_adtoktoberfest2_legit Added
poster_adtoktoberfest_legit Added
poster_adtsilence_contraband Added
poster_adtturnonsensors_legit Added
poster_efficiencydiagram_legit Added
quadro_electronics Added

Resources/Textures/ADT/Structures/Wallmounts/triangles_birthday.rsi

State Old New Status
pbcenter Added
pbleft Added
pbright Added
rycenter Added
ryleft Added
ryright Added

Resources/Textures/ADT/Structures/Wallmounts/triangles_halloween.rsi

State Old New Status
HPHW1 Added
HPHW2 Added
HPHW3 Added
HPHW4 Added
blackorange1 Added
blackorange2 Added
blackorange3 Added
blackwhite1 Added
blackwhite2 Added
blackwhite3 Added
orangeyellow1 Added
orangeyellow2 Added
orangeyellow3 Added

Resources/Textures/ADT/Structures/Wallmounts/watchoutchem.rsi

State Old New Status
chem Added

Resources/Textures/ADT/Structures/Wallmounts/workunderway.rsi

State Old New Status
workunderway Added

Edit: diff updated after 7c4d094

@Lonkuk Lonkuk linked an issue Aug 18, 2024 that may be closed by this pull request
Copy link
Contributor

@Bolper Bolper left a comment

Choose a reason for hiding this comment

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

И очень объёмно
Всё постеры и картинки из Resources/Textures/ADT/Objects/Decoration/
Раскидать по Resources/Textures/ADT/Structures/Wallmounts/
Фуух. Вроде всё.

@Bolper
Copy link
Contributor

Bolper commented Aug 19, 2024

Но прежде чем менять, пусть Стёпка за мной перепроверит. @1Stepka1

@Bolper
Copy link
Contributor

Bolper commented Aug 19, 2024

И ещё вот
Screenshot_2024-08-19-10-29-53-025_com.discord.png

@Bolper Bolper added the Status: Awaiting Changes Ожидание изменений label Aug 19, 2024
@Lonkuk Lonkuk removed the Status: Awaiting Changes Ожидание изменений label Aug 20, 2024
Copy link
Contributor

@Bolper Bolper left a comment

Choose a reason for hiding this comment

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

Все ок

@PyotrIgn PyotrIgn added this pull request to the merge queue Aug 21, 2024
Merged via the queue into AdventureTimeSS14:master with commit 74e70b7 Aug 21, 2024
15 checks passed
@Lonkuk Lonkuk deleted the posters branch August 22, 2024 12:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: Localization Изменение локализации Changes: Sprites Изменение спрайтов No C#
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Плакаты(7-ой пулл-реквест)
4 participants