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

Add: new NAS Trurl #811

Merged
merged 63 commits into from
Jan 19, 2025
Merged
Changes from 1 commit
Commits
Show all changes
63 commits
Select commit Hold shift + click to select a range
40bbf84
trurl
konushi Nov 26, 2024
61f21d4
карго, мед, досрал в обр
konushi Nov 27, 2024
b73cbeb
Merge branch 'master' into trurl
konushi Dec 6, 2024
f5be6da
офисы и сад левый борт
konushi Dec 6, 2024
85ad6c4
Update Trurl.dmm
konushi Dec 6, 2024
d69ed8b
движки, СРТ
konushi Dec 8, 2024
769cfce
Merge remote-tracking branch 'upstream/master' into trurl
konushi Dec 8, 2024
1e498e9
ы
konushi Dec 8, 2024
143eb85
мостик
konushi Dec 19, 2024
07df9d9
суд, конференц-зал, аргос, парочка наших статуй
konushi Dec 25, 2024
160fa78
Merge remote-tracking branch 'upstream/master' into trurl
konushi Dec 25, 2024
1706a46
fix
konushi Dec 25, 2024
6c5b408
конференц зал
konushi Dec 25, 2024
15ae6d2
аргос, правки и зоны
konushi Dec 28, 2024
236a413
Merge remote-tracking branch 'upstream' into trurl
konushi Dec 28, 2024
c91c135
обр шаттл, расширение портов
konushi Jan 4, 2025
798d280
фиксы
konushi Jan 4, 2025
c5773d2
фиксы шаттлов
konushi Jan 4, 2025
c77591a
доступы, декали, фиксы
konushi Jan 4, 2025
82dab64
напоминалка, фикс шаттлов, зоны прилета экипажа
konushi Jan 5, 2025
25dea35
Merge remote-tracking branch 'upstream/master' into trurl
konushi Jan 5, 2025
d0eedf2
коробочки по местам
konushi Jan 5, 2025
84f71c9
НАСТОЯЩИЙ НАШ ЦК
konushi Jan 5, 2025
5096a54
порты кибериада, айсбокс, мета, трам и фиксы
konushi Jan 6, 2025
3e22b34
фиксы тестов №1
konushi Jan 6, 2025
2883b8b
фикс тестов №2
konushi Jan 6, 2025
d3c6621
фикс тестов №3
konushi Jan 6, 2025
9ad9530
фикс тестов №4
konushi Jan 6, 2025
f512fc1
фикс тестов №5
konushi Jan 6, 2025
da593b1
бейзтурфы
konushi Jan 6, 2025
6383ac5
Merge branch 'master' into trurl
konushi Jan 6, 2025
d8c64c6
фикс тестов №6, без лееров
konushi Jan 6, 2025
dca119f
ставим ЦК автомаппером №1
konushi Jan 6, 2025
363bd7f
ставим ЦК автомаппером №2
konushi Jan 6, 2025
eb34ae1
автомаппер работает, но есть нюанс
konushi Jan 6, 2025
44c32c9
парень хочет разобраться с layer
konushi Jan 6, 2025
7b61175
возьмите лейер у кого
konushi Jan 6, 2025
83daa40
дайте ему лейер
konushi Jan 6, 2025
4a0f29f
последние лееры
konushi Jan 6, 2025
1a77c64
автомаппер победил
konushi Jan 6, 2025
fff44c7
бэкап шаттл
konushi Jan 6, 2025
1c5ccae
Update CentCom.dmm
konushi Jan 6, 2025
d5d319a
Update CentCom.dmm
konushi Jan 6, 2025
665d838
я не верю что проблема в лишней M
konushi Jan 6, 2025
b14cc0c
это такой
konushi Jan 6, 2025
6a5bc5d
автомаппер портов на трам
konushi Jan 6, 2025
4094ea7
автомаппер порт на мету и фикс трама
konushi Jan 6, 2025
cc0170c
автомаппер порты на дельте
konushi Jan 7, 2025
eb99652
автомаппер порты айсбок
konushi Jan 7, 2025
0a98c20
Update floor_decals.dm
konushi Jan 7, 2025
2dbe7f2
Update Cyberiad.dmm
konushi Jan 7, 2025
323d91e
аргос кнопка да
konushi Jan 7, 2025
455df48
Bunch of fixes & tweaks from my heart
dj-34 Jan 8, 2025
07ac3f9
ревью фиксы
konushi Jan 8, 2025
9551d4b
пробуем фиксануть бекапшаттл
konushi Jan 13, 2025
e0ba5c7
Merge branch 'master' into trurl
konushi Jan 14, 2025
f42572e
дублирование кнопок в оружейной ОБР
konushi Jan 14, 2025
4286be9
фикс труб в автомаппере порта айсбокса
konushi Jan 14, 2025
dcfc04d
Merge branch 'master' into trurl
dj-34 Jan 15, 2025
6a1afb0
Merge branch 'master' into trurl
dj-34 Jan 17, 2025
73e4af3
Merge branch 'master' into trurl
konushi Jan 19, 2025
8d3d240
Update CentCom.dmm
konushi Jan 19, 2025
ddd4ff8
криокапсулы для ОБР и СРТ
konushi Jan 19, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge branch 'master' into trurl
konushi authored Jan 14, 2025
commit e0ba5c7b1e92a91587f9f23535ebcc60c03c73f4

This merge commit was added into this branch cleanly.

There are no new changes to show, but you can still view the diff.