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

imageadd: Tajaran body resprite. && add: New tajaran haircuts. #5676

Merged
merged 10 commits into from
Oct 1, 2024
Merged

imageadd: Tajaran body resprite. && add: New tajaran haircuts. #5676

merged 10 commits into from
Oct 1, 2024

Conversation

Daeberdir
Copy link
Member

@Daeberdir Daeberdir commented Aug 7, 2024 •
edited
Loading

Описание

  • Респрайтнутые таяры, все их уже видели. Автор: @PiotrTheTchaikowsky | Дохвостоделыватели: @Hawwar @PiroMage
  • Маркинги/аксессуары/причёски/бельё было актуализировано под новый спрайт (хотя вероятно, что упущено некоторые).
  • Полосатый хвост более неактуален и, в следствии, убран.
  • Добавлено некоторое количество причёсок с нашего Сыра (включая респрайты уже имеющихся причёсок и добавление версий "с ушами").
  • Из-за сильного различия женского и мужского спрайта тела, пришлось делать спрайты некоторых боди маркингов для обоих типов тела. А значит и добавить различаемость пола для боди маркингов.
  • Переменная gender у аксессуаров тела заменена на unsuitable_gender. Причина ниже.
    изображение

Ссылка на предложение

Новые причёски.
Респрайт тела таяр.

@github-actions github-actions bot added the DMI Affects DMI files label Aug 7, 2024
@PiotrTheTchaikowsky
Copy link
Contributor

good-morning-in-case-i-dont-see-ya

@userbaza
Copy link
Contributor

userbaza commented Aug 9, 2024

Я думаю некоторым причёскам, например 'Tajara Overeye' не хватает
glasses_over = FALSE
Ещё при выборе в Tail Markings варианта с полосами на хвост анимация работает слегка некорректно и выглядит дёрганно.
2024-08-0917-55-59-ezgif com-video-to-gif-converter
В меню выбора Body Accessory два варианта None, а ещё доступен Stripped Tail который представляет собой старый хвост с белыми полосами, его так и запланировано оставлять?

@Daeberdir
Copy link
Member Author

Daeberdir commented Aug 9, 2024 •
edited
Loading

glasses_over = FALSE - в геймплейном плане мне не особо нравится скрытие очков волосами. Да, намеренно не прописал, чтобы игроки отдельно подописывали, где и как они это хотят.
Дёрганную анимацию поправлю, недопроверил.
Выбор аксессуаров тела я не задевал по сути никак. Два пустых варианта там, должно быть, ещё со времени введения ТГУИ инпут-списков.
Ненужный полосатый хвост тоже специально оставлен, так как я пока не уверен, что его убирание не сломает ДБ.
@userbaza

@Daeberdir
Copy link
Member Author

Пару коррекций ещё в очереди.

@userbaza
Copy link
Contributor

Ещё немного прочекал, ухо тоже бы починить у tajaran patches head, а то всё ещё съехавшее на один пиксель вправо в таком положении.

image

@github-actions github-actions bot added the Merge Conflict This doesn't seem right label Aug 17, 2024
@github-actions github-actions bot removed the Merge Conflict This doesn't seem right label Sep 11, 2024
@PiotrTheTchaikowsky
Copy link
Contributor

Геймдизайн-2

@Bizzonium Bizzonium added the testmerge This PR is being tested right now on live test servers. label Sep 17, 2024
Bizzonium added a commit that referenced this pull request Sep 17, 2024
@Bizzonium
imageadd: Tajaran body resprite. && add: New tajaran haircuts. (#5676)…
f1d3f32 
… [testmerge][384dc36]

commit 384dc36
Merge: d3286a7 f26faef
Author: Aziz Chynaliev <[email protected]>
Date:   Tue Sep 17 22:11:54 2024 +0600

    Merge branch 'master220' into hot-tajaran-sex-under-the-shower

commit d3286a7
Author: Daeberdir <[email protected]>
Date:   Thu Sep 12 03:46:32 2024 +0300

    Final corrections. I hope.

commit d2de70f
Author: Daeberdir <[email protected]>
Date:   Wed Sep 11 20:11:17 2024 +0300

    Update body_accessory.dmi

commit 1f281e6
Merge: dd92838 c9ee220
Author: Daeberdir <[email protected]>
Date:   Wed Sep 11 20:11:08 2024 +0300

    Merge remote-tracking branch 'upstream/master220' into hot-tajaran-sex-under-the-shower

commit dd92838
Author: Daeberdir <[email protected]>
Date:   Wed Sep 11 19:55:29 2024 +0300

    And new tail done.

commit 5cdd09c
Author: Daeberdir <[email protected]>
Date:   Fri Aug 9 21:49:59 2024 +0300

    Tail and stripes fixes.

commit 4c35287
Merge: 707722a d28caea
Author: Daeberdir <[email protected]>
Date:   Fri Aug 9 21:45:57 2024 +0300

    Merge remote-tracking branch 'upstream/master220' into hot-tajaran-sex-under-the-shower

commit 707722a
Merge: fa0a4d0 fbcc934
Author: Daeberdir <[email protected]>
Date:   Thu Aug 8 02:02:48 2024 +0300

    Merge remote-tracking branch 'upstream/master220' into hot-tajaran-sex-under-the-shower

commit fa0a4d0
Author: Daeberdir <[email protected]>
Date:   Thu Aug 8 02:02:26 2024 +0300

    2/2

commit 6d08674
Author: Daeberdir <[email protected]>
Date:   Wed Jul 31 07:30:47 2024 +0300

    1/2
Bizzonium added a commit that referenced this pull request Sep 22, 2024
@Bizzonium
imageadd: Tajaran body resprite. && add: New tajaran haircuts. (#5676)…
1a00c1a 
… [testmerge][384dc36]

commit 384dc36
Merge: d3286a7 f26faef
Author: Aziz Chynaliev <[email protected]>
Date:   Tue Sep 17 22:11:54 2024 +0600

    Merge branch 'master220' into hot-tajaran-sex-under-the-shower

commit d3286a7
Author: Daeberdir <[email protected]>
Date:   Thu Sep 12 03:46:32 2024 +0300

    Final corrections. I hope.

commit d2de70f
Author: Daeberdir <[email protected]>
Date:   Wed Sep 11 20:11:17 2024 +0300

    Update body_accessory.dmi

commit 1f281e6
Merge: dd92838 c9ee220
Author: Daeberdir <[email protected]>
Date:   Wed Sep 11 20:11:08 2024 +0300

    Merge remote-tracking branch 'upstream/master220' into hot-tajaran-sex-under-the-shower

commit dd92838
Author: Daeberdir <[email protected]>
Date:   Wed Sep 11 19:55:29 2024 +0300

    And new tail done.

commit 5cdd09c
Author: Daeberdir <[email protected]>
Date:   Fri Aug 9 21:49:59 2024 +0300

    Tail and stripes fixes.

commit 4c35287
Merge: 707722a d28caea
Author: Daeberdir <[email protected]>
Date:   Fri Aug 9 21:45:57 2024 +0300

    Merge remote-tracking branch 'upstream/master220' into hot-tajaran-sex-under-the-shower

commit 707722a
Merge: fa0a4d0 fbcc934
Author: Daeberdir <[email protected]>
Date:   Thu Aug 8 02:02:48 2024 +0300

    Merge remote-tracking branch 'upstream/master220' into hot-tajaran-sex-under-the-shower

commit fa0a4d0
Author: Daeberdir <[email protected]>
Date:   Thu Aug 8 02:02:26 2024 +0300

    2/2

commit 6d08674
Author: Daeberdir <[email protected]>
Date:   Wed Jul 31 07:30:47 2024 +0300

    1/2
Bizzonium added a commit that referenced this pull request Sep 23, 2024
@Bizzonium
imageadd: Tajaran body resprite. && add: New tajaran haircuts. (#5676)…
4d905d9 
… [testmerge][384dc36]

commit 384dc36
Merge: d3286a7 f26faef
Author: Aziz Chynaliev <[email protected]>
Date:   Tue Sep 17 22:11:54 2024 +0600

    Merge branch 'master220' into hot-tajaran-sex-under-the-shower

commit d3286a7
Author: Daeberdir <[email protected]>
Date:   Thu Sep 12 03:46:32 2024 +0300

    Final corrections. I hope.

commit d2de70f
Author: Daeberdir <[email protected]>
Date:   Wed Sep 11 20:11:17 2024 +0300

    Update body_accessory.dmi

commit 1f281e6
Merge: dd92838 c9ee220
Author: Daeberdir <[email protected]>
Date:   Wed Sep 11 20:11:08 2024 +0300

    Merge remote-tracking branch 'upstream/master220' into hot-tajaran-sex-under-the-shower

commit dd92838
Author: Daeberdir <[email protected]>
Date:   Wed Sep 11 19:55:29 2024 +0300

    And new tail done.

commit 5cdd09c
Author: Daeberdir <[email protected]>
Date:   Fri Aug 9 21:49:59 2024 +0300

    Tail and stripes fixes.

commit 4c35287
Merge: 707722a d28caea
Author: Daeberdir <[email protected]>
Date:   Fri Aug 9 21:45:57 2024 +0300

    Merge remote-tracking branch 'upstream/master220' into hot-tajaran-sex-under-the-shower

commit 707722a
Merge: fa0a4d0 fbcc934
Author: Daeberdir <[email protected]>
Date:   Thu Aug 8 02:02:48 2024 +0300

    Merge remote-tracking branch 'upstream/master220' into hot-tajaran-sex-under-the-shower

commit fa0a4d0
Author: Daeberdir <[email protected]>
Date:   Thu Aug 8 02:02:26 2024 +0300

    2/2

commit 6d08674
Author: Daeberdir <[email protected]>
Date:   Wed Jul 31 07:30:47 2024 +0300

    1/2
Bizzonium added a commit that referenced this pull request Sep 25, 2024
@Bizzonium
imageadd: Tajaran body resprite. && add: New tajaran haircuts. (#5676)…
c4d9594 
… [testmerge][384dc36]

commit 384dc36
Merge: d3286a7 f26faef
Author: Aziz Chynaliev <[email protected]>
Date:   Tue Sep 17 22:11:54 2024 +0600

    Merge branch 'master220' into hot-tajaran-sex-under-the-shower

commit d3286a7
Author: Daeberdir <[email protected]>
Date:   Thu Sep 12 03:46:32 2024 +0300

    Final corrections. I hope.

commit d2de70f
Author: Daeberdir <[email protected]>
Date:   Wed Sep 11 20:11:17 2024 +0300

    Update body_accessory.dmi

commit 1f281e6
Merge: dd92838 c9ee220
Author: Daeberdir <[email protected]>
Date:   Wed Sep 11 20:11:08 2024 +0300

    Merge remote-tracking branch 'upstream/master220' into hot-tajaran-sex-under-the-shower

commit dd92838
Author: Daeberdir <[email protected]>
Date:   Wed Sep 11 19:55:29 2024 +0300

    And new tail done.

commit 5cdd09c
Author: Daeberdir <[email protected]>
Date:   Fri Aug 9 21:49:59 2024 +0300

    Tail and stripes fixes.

commit 4c35287
Merge: 707722a d28caea
Author: Daeberdir <[email protected]>
Date:   Fri Aug 9 21:45:57 2024 +0300

    Merge remote-tracking branch 'upstream/master220' into hot-tajaran-sex-under-the-shower

commit 707722a
Merge: fa0a4d0 fbcc934
Author: Daeberdir <[email protected]>
Date:   Thu Aug 8 02:02:48 2024 +0300

    Merge remote-tracking branch 'upstream/master220' into hot-tajaran-sex-under-the-shower

commit fa0a4d0
Author: Daeberdir <[email protected]>
Date:   Thu Aug 8 02:02:26 2024 +0300

    2/2

commit 6d08674
Author: Daeberdir <[email protected]>
Date:   Wed Jul 31 07:30:47 2024 +0300

    1/2
Bizzonium added a commit that referenced this pull request Sep 28, 2024
@Bizzonium
imageadd: Tajaran body resprite. && add: New tajaran haircuts. (#5676)…
c659532 
… [testmerge][384dc36]

commit 384dc36
Merge: d3286a7 f26faef
Author: Aziz Chynaliev <[email protected]>
Date:   Tue Sep 17 22:11:54 2024 +0600

    Merge branch 'master220' into hot-tajaran-sex-under-the-shower

commit d3286a7
Author: Daeberdir <[email protected]>
Date:   Thu Sep 12 03:46:32 2024 +0300

    Final corrections. I hope.

commit d2de70f
Author: Daeberdir <[email protected]>
Date:   Wed Sep 11 20:11:17 2024 +0300

    Update body_accessory.dmi

commit 1f281e6
Merge: dd92838 c9ee220
Author: Daeberdir <[email protected]>
Date:   Wed Sep 11 20:11:08 2024 +0300

    Merge remote-tracking branch 'upstream/master220' into hot-tajaran-sex-under-the-shower

commit dd92838
Author: Daeberdir <[email protected]>
Date:   Wed Sep 11 19:55:29 2024 +0300

    And new tail done.

commit 5cdd09c
Author: Daeberdir <[email protected]>
Date:   Fri Aug 9 21:49:59 2024 +0300

    Tail and stripes fixes.

commit 4c35287
Merge: 707722a d28caea
Author: Daeberdir <[email protected]>
Date:   Fri Aug 9 21:45:57 2024 +0300

    Merge remote-tracking branch 'upstream/master220' into hot-tajaran-sex-under-the-shower

commit 707722a
Merge: fa0a4d0 fbcc934
Author: Daeberdir <[email protected]>
Date:   Thu Aug 8 02:02:48 2024 +0300

    Merge remote-tracking branch 'upstream/master220' into hot-tajaran-sex-under-the-shower

commit fa0a4d0
Author: Daeberdir <[email protected]>
Date:   Thu Aug 8 02:02:26 2024 +0300

    2/2

commit 6d08674
Author: Daeberdir <[email protected]>
Date:   Wed Jul 31 07:30:47 2024 +0300

    1/2
Bizzonium added a commit that referenced this pull request Sep 29, 2024
@Bizzonium
imageadd: Tajaran body resprite. && add: New tajaran haircuts. (#5676)…
368679c 
… [testmerge][384dc36]

commit 384dc36
Merge: d3286a7 f26faef
Author: Aziz Chynaliev <[email protected]>
Date:   Tue Sep 17 22:11:54 2024 +0600

    Merge branch 'master220' into hot-tajaran-sex-under-the-shower

commit d3286a7
Author: Daeberdir <[email protected]>
Date:   Thu Sep 12 03:46:32 2024 +0300

    Final corrections. I hope.

commit d2de70f
Author: Daeberdir <[email protected]>
Date:   Wed Sep 11 20:11:17 2024 +0300

    Update body_accessory.dmi

commit 1f281e6
Merge: dd92838 c9ee220
Author: Daeberdir <[email protected]>
Date:   Wed Sep 11 20:11:08 2024 +0300

    Merge remote-tracking branch 'upstream/master220' into hot-tajaran-sex-under-the-shower

commit dd92838
Author: Daeberdir <[email protected]>
Date:   Wed Sep 11 19:55:29 2024 +0300

    And new tail done.

commit 5cdd09c
Author: Daeberdir <[email protected]>
Date:   Fri Aug 9 21:49:59 2024 +0300

    Tail and stripes fixes.

commit 4c35287
Merge: 707722a d28caea
Author: Daeberdir <[email protected]>
Date:   Fri Aug 9 21:45:57 2024 +0300

    Merge remote-tracking branch 'upstream/master220' into hot-tajaran-sex-under-the-shower

commit 707722a
Merge: fa0a4d0 fbcc934
Author: Daeberdir <[email protected]>
Date:   Thu Aug 8 02:02:48 2024 +0300

    Merge remote-tracking branch 'upstream/master220' into hot-tajaran-sex-under-the-shower

commit fa0a4d0
Author: Daeberdir <[email protected]>
Date:   Thu Aug 8 02:02:26 2024 +0300

    2/2

commit 6d08674
Author: Daeberdir <[email protected]>
Date:   Wed Jul 31 07:30:47 2024 +0300

    1/2
Bizzonium added a commit that referenced this pull request Sep 29, 2024
@Bizzonium
imageadd: Tajaran body resprite. && add: New tajaran haircuts. (#5676)…
28f07db 
… [testmerge][384dc36]

commit 384dc36
Merge: d3286a7 f26faef
Author: Aziz Chynaliev <[email protected]>
Date:   Tue Sep 17 22:11:54 2024 +0600

    Merge branch 'master220' into hot-tajaran-sex-under-the-shower

commit d3286a7
Author: Daeberdir <[email protected]>
Date:   Thu Sep 12 03:46:32 2024 +0300

    Final corrections. I hope.

commit d2de70f
Author: Daeberdir <[email protected]>
Date:   Wed Sep 11 20:11:17 2024 +0300

    Update body_accessory.dmi

commit 1f281e6
Merge: dd92838 c9ee220
Author: Daeberdir <[email protected]>
Date:   Wed Sep 11 20:11:08 2024 +0300

    Merge remote-tracking branch 'upstream/master220' into hot-tajaran-sex-under-the-shower

commit dd92838
Author: Daeberdir <[email protected]>
Date:   Wed Sep 11 19:55:29 2024 +0300

    And new tail done.

commit 5cdd09c
Author: Daeberdir <[email protected]>
Date:   Fri Aug 9 21:49:59 2024 +0300

    Tail and stripes fixes.

commit 4c35287
Merge: 707722a d28caea
Author: Daeberdir <[email protected]>
Date:   Fri Aug 9 21:45:57 2024 +0300

    Merge remote-tracking branch 'upstream/master220' into hot-tajaran-sex-under-the-shower

commit 707722a
Merge: fa0a4d0 fbcc934
Author: Daeberdir <[email protected]>
Date:   Thu Aug 8 02:02:48 2024 +0300

    Merge remote-tracking branch 'upstream/master220' into hot-tajaran-sex-under-the-shower

commit fa0a4d0
Author: Daeberdir <[email protected]>
Date:   Thu Aug 8 02:02:26 2024 +0300

    2/2

commit 6d08674
Author: Daeberdir <[email protected]>
Date:   Wed Jul 31 07:30:47 2024 +0300

    1/2
@Bizzonium Bizzonium merged commit bec0fa4 into ss220-space:master220 Oct 1, 2024
11 checks passed
@Daeberdir Daeberdir deleted the hot-tajaran-sex-under-the-shower branch October 1, 2024 20:10
@Bizzonium Bizzonium removed the testmerge This PR is being tested right now on live test servers. label Oct 5, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
DMI Affects DMI files
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@Daeberdir @PiotrTheTchaikowsky @userbaza @Bizzonium