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

add: basic ridable element and components & fireman carry #5705

Merged
merged 22 commits into from
Oct 13, 2024
Merged

add: basic ridable element and components & fireman carry #5705

merged 22 commits into from
Oct 13, 2024

Conversation

NightDawnFox
Copy link
Contributor

Описание

Перенос элементов и компонентов езды на наш билд. При этом они не используются, весь транспорт работает по старым правилам (мне было лень делать это сейчас)
Добавление хвата пожарного. Позволяет таскать людей. Всё прямиком с ТГ!

Ссылка на предложение/Причина создания ПР

Пока ничего нет, чуть позже может быть

Демонстрация изменений

2024-08-12.16-50-38.-.Trim.mp4

tenor

@NightDawnFox NightDawnFox added the Do Not Merge Либо не прошла предложка, либо кто-то не доволен. label Aug 12, 2024
@NightDawnFox
Copy link
Contributor Author

открыто для ревью, не для мерджа

@NightDawnFox NightDawnFox requested a review from Gottfrei August 12, 2024 12:08
@Gottfrei
Copy link
Contributor

сперва сделай транспорт на компоненте, отдельно, а затем уже приступай к остальному.

@NightDawnFox NightDawnFox marked this pull request as draft August 13, 2024 03:32
@github-actions github-actions bot added the Merge Conflict This doesn't seem right label Aug 24, 2024
@github-actions github-actions bot removed the Merge Conflict This doesn't seem right label Aug 25, 2024
@NightDawnFox
багфиксы пожарного хвата
62b8444
@NightDawnFox
v0.6
bda591c 
TODO:
Перевести остальной транспорт под компонент, а именно:
-ambulance
-janicart
-motorcycle
-secway
-snowmobile
-speedbike
-sportscar
- lava & dragonboats
@github-actions github-actions bot added MAP Affects map DMI Affects DMI files Merge Conflict This doesn't seem right labels Aug 25, 2024
@github-actions github-actions bot removed the Merge Conflict This doesn't seem right label Aug 30, 2024
@NightDawnFox NightDawnFox marked this pull request as ready for review September 19, 2024 07:13
@NightDawnFox NightDawnFox requested a review from a team as a code owner September 19, 2024 07:13
@NightDawnFox
Copy link
Contributor Author

Весь текущий транспорт в игре переделан под компонент, включая щитспавновый. Добавлять что-то новое пока глупо

@NightDawnFox NightDawnFox removed the Do Not Merge Либо не прошла предложка, либо кто-то не доволен. label Sep 19, 2024
@github-actions github-actions bot added the Merge Conflict This doesn't seem right label Sep 22, 2024
@ROdenFL
Copy link
Contributor

ROdenFL commented Sep 24, 2024

Добавь клоун кар

@github-actions github-actions bot removed the Merge Conflict This doesn't seem right label Sep 27, 2024
Bizzonium added a commit that referenced this pull request Oct 6, 2024
@Bizzonium
add: basic ridable element and components & fireman carry (#5705) [te…
aa9dc12 
…smerge][1c08795]

commit 1c08795
Author: NightDawnFox <[email protected]>
Date:   Sun Oct 6 09:16:35 2024 +0500

    Обновление пожарного граба

commit 1f32b4e
Author: NightDawnFox <[email protected]>
Date:   Sat Oct 5 23:24:05 2024 +0500

    Первый багфикс

commit a04320f
Merge: fe991ee 2a35223
Author: NightDawnFox <[email protected]>
Date:   Sat Oct 5 18:25:26 2024 +0500

    Merge remote-tracking branch 'upstream/master220' into riding

commit fe991ee
Merge: 6a6a552 b95f436
Author: NightDawnFox <[email protected]>
Date:   Sat Oct 5 17:56:48 2024 +0500

    Merge remote-tracking branch 'upstream/master220' into riding

commit 6a6a552
Merge: 20651c5 683d5f4
Author: NightDawnFox <[email protected]>
Date:   Sun Sep 29 21:00:53 2024 +0500

    Merge remote-tracking branch 'upstream/master220' into riding

commit 20651c5
Merge: f8cc55b a93879c
Author: NightDawnFox <[email protected]>
Date:   Sat Sep 28 20:09:08 2024 +0500

    Merge remote-tracking branch 'upstream/master220' into riding

commit f8cc55b
Author: NightDawnFox <[email protected]>
Date:   Fri Sep 27 10:52:52 2024 +0500

    совместимость с новой

commit d0a5b1b
Merge: 2302c03 01b7b5d
Author: NightDawnFox <[email protected]>
Date:   Fri Sep 27 10:49:42 2024 +0500

    Merge remote-tracking branch 'upstream/master220' into riding

commit 2302c03
Author: NightDawnFox <[email protected]>
Date:   Thu Sep 19 12:12:28 2024 +0500

    готово

commit dcdaf4c
Author: NightDawnFox <[email protected]>
Date:   Tue Sep 10 12:12:26 2024 +0500

    еще 4 строчки кода, юхуу!

commit 649cfb5
Merge: ad22d24 0d07c48
Author: NightDawnFox <[email protected]>
Date:   Tue Sep 10 11:23:23 2024 +0500

    Merge remote-tracking branch 'upstream/master220' into riding

commit ad22d24
Author: NightDawnFox <[email protected]>
Date:   Mon Sep 2 12:11:40 2024 +0500

    janicart

commit 6d47f1a
Author: NightDawnFox <[email protected]>
Date:   Mon Sep 2 10:29:15 2024 +0500

    ambulance done

commit d42c79d
Merge: 4c9ed16 7898f0b
Author: NightDawnFox <[email protected]>
Date:   Mon Sep 2 08:52:32 2024 +0500

    Merge remote-tracking branch 'upstream/master220' into riding

commit 4c9ed16
Merge: bda591c ef8e620
Author: NightDawnFox <[email protected]>
Date:   Fri Aug 30 12:01:53 2024 +0500

    Merge remote-tracking branch 'upstream/master220' into riding

commit bda591c
Author: NightDawnFox <[email protected]>
Date:   Sun Aug 25 14:39:15 2024 +0500

    v0.6

    TODO:
    Перевести остальной транспорт под компонент, а именно:
    -ambulance
    -janicart
    -motorcycle
    -secway
    -snowmobile
    -speedbike
    -sportscar
    - lava & dragonboats

commit 62b8444
Author: NightDawnFox <[email protected]>
Date:   Sun Aug 25 13:16:36 2024 +0500

    багфиксы пожарного хвата

commit af34dbd
Merge: 8f49443 59b2a65
Author: NightDawnFox <[email protected]>
Date:   Sun Aug 25 12:30:30 2024 +0500

    Merge remote-tracking branch 'upstream/master220' into riding

commit 8f49443
Author: NightDawnFox <[email protected]>
Date:   Mon Aug 12 16:52:24 2024 +0500

    v0.5
Bizzonium added a commit that referenced this pull request Oct 6, 2024
@Bizzonium
add: basic ridable element and components & fireman carry (#5705) [te…
ca10d02 
…smerge][1c08795]

commit 1c08795
Author: NightDawnFox <[email protected]>
Date:   Sun Oct 6 09:16:35 2024 +0500

    Обновление пожарного граба

commit 1f32b4e
Author: NightDawnFox <[email protected]>
Date:   Sat Oct 5 23:24:05 2024 +0500

    Первый багфикс

commit a04320f
Merge: fe991ee 2a35223
Author: NightDawnFox <[email protected]>
Date:   Sat Oct 5 18:25:26 2024 +0500

    Merge remote-tracking branch 'upstream/master220' into riding

commit fe991ee
Merge: 6a6a552 b95f436
Author: NightDawnFox <[email protected]>
Date:   Sat Oct 5 17:56:48 2024 +0500

    Merge remote-tracking branch 'upstream/master220' into riding

commit 6a6a552
Merge: 20651c5 683d5f4
Author: NightDawnFox <[email protected]>
Date:   Sun Sep 29 21:00:53 2024 +0500

    Merge remote-tracking branch 'upstream/master220' into riding

commit 20651c5
Merge: f8cc55b a93879c
Author: NightDawnFox <[email protected]>
Date:   Sat Sep 28 20:09:08 2024 +0500

    Merge remote-tracking branch 'upstream/master220' into riding

commit f8cc55b
Author: NightDawnFox <[email protected]>
Date:   Fri Sep 27 10:52:52 2024 +0500

    совместимость с новой

commit d0a5b1b
Merge: 2302c03 01b7b5d
Author: NightDawnFox <[email protected]>
Date:   Fri Sep 27 10:49:42 2024 +0500

    Merge remote-tracking branch 'upstream/master220' into riding

commit 2302c03
Author: NightDawnFox <[email protected]>
Date:   Thu Sep 19 12:12:28 2024 +0500

    готово

commit dcdaf4c
Author: NightDawnFox <[email protected]>
Date:   Tue Sep 10 12:12:26 2024 +0500

    еще 4 строчки кода, юхуу!

commit 649cfb5
Merge: ad22d24 0d07c48
Author: NightDawnFox <[email protected]>
Date:   Tue Sep 10 11:23:23 2024 +0500

    Merge remote-tracking branch 'upstream/master220' into riding

commit ad22d24
Author: NightDawnFox <[email protected]>
Date:   Mon Sep 2 12:11:40 2024 +0500

    janicart

commit 6d47f1a
Author: NightDawnFox <[email protected]>
Date:   Mon Sep 2 10:29:15 2024 +0500

    ambulance done

commit d42c79d
Merge: 4c9ed16 7898f0b
Author: NightDawnFox <[email protected]>
Date:   Mon Sep 2 08:52:32 2024 +0500

    Merge remote-tracking branch 'upstream/master220' into riding

commit 4c9ed16
Merge: bda591c ef8e620
Author: NightDawnFox <[email protected]>
Date:   Fri Aug 30 12:01:53 2024 +0500

    Merge remote-tracking branch 'upstream/master220' into riding

commit bda591c
Author: NightDawnFox <[email protected]>
Date:   Sun Aug 25 14:39:15 2024 +0500

    v0.6

    TODO:
    Перевести остальной транспорт под компонент, а именно:
    -ambulance
    -janicart
    -motorcycle
    -secway
    -snowmobile
    -speedbike
    -sportscar
    - lava & dragonboats

commit 62b8444
Author: NightDawnFox <[email protected]>
Date:   Sun Aug 25 13:16:36 2024 +0500

    багфиксы пожарного хвата

commit af34dbd
Merge: 8f49443 59b2a65
Author: NightDawnFox <[email protected]>
Date:   Sun Aug 25 12:30:30 2024 +0500

    Merge remote-tracking branch 'upstream/master220' into riding

commit 8f49443
Author: NightDawnFox <[email protected]>
Date:   Mon Aug 12 16:52:24 2024 +0500

    v0.5
Bizzonium added a commit that referenced this pull request Oct 6, 2024
@Bizzonium
add: basic ridable element and components & fireman carry (#5705) [te…
5d81376 
…smerge][1c08795]

commit 1c08795
Author: NightDawnFox <[email protected]>
Date:   Sun Oct 6 09:16:35 2024 +0500

    Обновление пожарного граба

commit 1f32b4e
Author: NightDawnFox <[email protected]>
Date:   Sat Oct 5 23:24:05 2024 +0500

    Первый багфикс

commit a04320f
Merge: fe991ee 2a35223
Author: NightDawnFox <[email protected]>
Date:   Sat Oct 5 18:25:26 2024 +0500

    Merge remote-tracking branch 'upstream/master220' into riding

commit fe991ee
Merge: 6a6a552 b95f436
Author: NightDawnFox <[email protected]>
Date:   Sat Oct 5 17:56:48 2024 +0500

    Merge remote-tracking branch 'upstream/master220' into riding

commit 6a6a552
Merge: 20651c5 683d5f4
Author: NightDawnFox <[email protected]>
Date:   Sun Sep 29 21:00:53 2024 +0500

    Merge remote-tracking branch 'upstream/master220' into riding

commit 20651c5
Merge: f8cc55b a93879c
Author: NightDawnFox <[email protected]>
Date:   Sat Sep 28 20:09:08 2024 +0500

    Merge remote-tracking branch 'upstream/master220' into riding

commit f8cc55b
Author: NightDawnFox <[email protected]>
Date:   Fri Sep 27 10:52:52 2024 +0500

    совместимость с новой

commit d0a5b1b
Merge: 2302c03 01b7b5d
Author: NightDawnFox <[email protected]>
Date:   Fri Sep 27 10:49:42 2024 +0500

    Merge remote-tracking branch 'upstream/master220' into riding

commit 2302c03
Author: NightDawnFox <[email protected]>
Date:   Thu Sep 19 12:12:28 2024 +0500

    готово

commit dcdaf4c
Author: NightDawnFox <[email protected]>
Date:   Tue Sep 10 12:12:26 2024 +0500

    еще 4 строчки кода, юхуу!

commit 649cfb5
Merge: ad22d24 0d07c48
Author: NightDawnFox <[email protected]>
Date:   Tue Sep 10 11:23:23 2024 +0500

    Merge remote-tracking branch 'upstream/master220' into riding

commit ad22d24
Author: NightDawnFox <[email protected]>
Date:   Mon Sep 2 12:11:40 2024 +0500

    janicart

commit 6d47f1a
Author: NightDawnFox <[email protected]>
Date:   Mon Sep 2 10:29:15 2024 +0500

    ambulance done

commit d42c79d
Merge: 4c9ed16 7898f0b
Author: NightDawnFox <[email protected]>
Date:   Mon Sep 2 08:52:32 2024 +0500

    Merge remote-tracking branch 'upstream/master220' into riding

commit 4c9ed16
Merge: bda591c ef8e620
Author: NightDawnFox <[email protected]>
Date:   Fri Aug 30 12:01:53 2024 +0500

    Merge remote-tracking branch 'upstream/master220' into riding

commit bda591c
Author: NightDawnFox <[email protected]>
Date:   Sun Aug 25 14:39:15 2024 +0500

    v0.6

    TODO:
    Перевести остальной транспорт под компонент, а именно:
    -ambulance
    -janicart
    -motorcycle
    -secway
    -snowmobile
    -speedbike
    -sportscar
    - lava & dragonboats

commit 62b8444
Author: NightDawnFox <[email protected]>
Date:   Sun Aug 25 13:16:36 2024 +0500

    багфиксы пожарного хвата

commit af34dbd
Merge: 8f49443 59b2a65
Author: NightDawnFox <[email protected]>
Date:   Sun Aug 25 12:30:30 2024 +0500

    Merge remote-tracking branch 'upstream/master220' into riding

commit 8f49443
Author: NightDawnFox <[email protected]>
Date:   Mon Aug 12 16:52:24 2024 +0500

    v0.5
github-actions bot pushed a commit that referenced this pull request Oct 6, 2024
@actions-user
add: basic ridable element and components & fireman carry (#5705) [te…
6a8a11e 
…stmerge][1c08795]
github-actions bot pushed a commit that referenced this pull request Oct 6, 2024
@actions-user
add: basic ridable element and components & fireman carry (#5705) [te…
e605b5a 
…stmerge][1c08795]
github-actions bot pushed a commit that referenced this pull request Oct 6, 2024
@actions-user
add: basic ridable element and components & fireman carry (#5705) [te…
bf6c946 
…stmerge][1c08795]
github-actions bot pushed a commit that referenced this pull request Oct 6, 2024
@actions-user
add: basic ridable element and components & fireman carry (#5705) [te…
9ae8115 
…stmerge][1c08795]
github-actions bot pushed a commit that referenced this pull request Oct 6, 2024
@actions-user
add: basic ridable element and components & fireman carry (#5705) [te…
ac756ef 
…stmerge][1c08795]
github-actions bot pushed a commit that referenced this pull request Oct 6, 2024
@actions-user
add: basic ridable element and components & fireman carry (#5705) [te…
9fe613b 
…stmerge][1c08795]
github-actions bot pushed a commit that referenced this pull request Oct 6, 2024
@actions-user
add: basic ridable element and components & fireman carry (#5705) [te…
37a3dfc 
…stmerge][1c08795]
github-actions bot pushed a commit that referenced this pull request Oct 6, 2024
@actions-user
add: basic ridable element and components & fireman carry (#5705) [te…
24678a9 
…stmerge][1c08795]
github-actions bot pushed a commit that referenced this pull request Oct 6, 2024
@actions-user
add: basic ridable element and components & fireman carry (#5705) [te…
e82d35b 
…stmerge][1c08795]
github-actions bot pushed a commit that referenced this pull request Oct 6, 2024
@actions-user
add: basic ridable element and components & fireman carry (#5705) [te…
01439c7 
…stmerge][1c08795]
github-actions bot pushed a commit that referenced this pull request Oct 6, 2024
@actions-user
add: basic ridable element and components & fireman carry (#5705) [te…
733130e 
…stmerge][1c08795]
github-actions bot pushed a commit that referenced this pull request Oct 6, 2024
@actions-user
add: basic ridable element and components & fireman carry (#5705) [te…
031b631 
…stmerge][1c08795]
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Oct 6, 2024

Данный PR был добавлен в ветку "testmerge" для тестов. Он попадёт на сервер после деплоя.

github-actions bot pushed a commit that referenced this pull request Oct 6, 2024
@actions-user
add: basic ridable element and components & fireman carry (#5705) [te…
be0f5e6 
…stmerge][1c08795]
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Oct 7, 2024

Данный PR был добавлен в ветку "testmerge" для тестов. Он попадёт на сервер после деплоя.

github-actions bot pushed a commit that referenced this pull request Oct 7, 2024
@actions-user
add: basic ridable element and components & fireman carry (#5705) [te…
f7f7d7a 
…stmerge][ea75a0f]
Bizzonium pushed a commit that referenced this pull request Oct 7, 2024
@actions-user @Bizzonium
add: basic ridable element and components & fireman carry (#5705) [te…
21557dc 
…stmerge][ea75a0f]
github-actions bot pushed a commit that referenced this pull request Oct 9, 2024
@actions-user
add: basic ridable element and components & fireman carry (#5705) [te…
90d187a 
…stmerge][ea75a0f]
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Oct 9, 2024

Данный PR был добавлен в ветку "testmerge" для тестов. Он попадёт на сервер после деплоя.

github-actions bot pushed a commit that referenced this pull request Oct 9, 2024
@actions-user
add: basic ridable element and components & fireman carry (#5705) [te…
f549c26 
…stmerge][ea75a0f]
@Bizzonium Bizzonium merged commit b8b185c into ss220-space:master220 Oct 13, 2024
12 checks passed
@Bizzonium Bizzonium removed the testmerge This PR is being tested right now on live test servers. label Oct 13, 2024
@Rafnik02
Copy link
Contributor

Rafnik02 commented Oct 15, 2024 •
edited
Loading

Пришло время строчить клоун машин

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Gottfrei Gottfrei Awaiting requested review from Gottfrei

Assignees
No one assigned
Labels
DMI Affects DMI files MAP Affects map
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@NightDawnFox @Gottfrei @ROdenFL @Daeberdir @Rafnik02 @Bizzonium