Morbo
|
6b74e70360
|
Merge remote-tracking branch 'upstream/master' into test2
# Conflicts:
# Resources/Maps/infiltrator.yml
# Resources/Textures/Tiles/attributions.yml
|
2022-08-16 00:21:46 +03:00 |
|
Morb
|
fac3c2e4c5
|
Revert "Revert "Upstream sync""
|
2022-08-15 14:19:44 -07:00 |
|
metalgearsloth
|
9eb60ed641
|
Add shuttle walls to icon smoothing (#10573)
|
2022-08-13 22:00:40 -07:00 |
|
ike709
|
7bb7e17412
|
Adds yet another dweeb to the name replacements (#10562)
|
2022-08-13 21:32:42 +02:00 |
|
Morb
|
105ee80f09
|
Revert "Upstream sync"
|
2022-08-13 08:05:52 -07:00 |
|
Morbo
|
ae6d6c5a56
|
Remove lokalise python module
|
2022-08-13 00:07:48 +03:00 |
|
Arthur
|
6edf90d517
|
Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
# Resources/Maps/infiltrator.yml
# Resources/Textures/Objects/Specific/Janitorial/janitorial_cart.rsi/cart_water_1.png
# Resources/Textures/Objects/Specific/Janitorial/janitorial_cart.rsi/cart_water_2.png
# Resources/Textures/Objects/Specific/Janitorial/janitorial_cart.rsi/cart_water_3.png
# Resources/Textures/Tiles/attributions.yml
|
2022-08-07 13:28:53 +03:00 |
|
ike709
|
e966432044
|
Adds another dweeb to the username replacements script (#10365)
|
2022-08-07 00:35:20 +02:00 |
|
Arthur
|
0052df0cf5
|
Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
# Resources/Maps/infiltrator.yml
|
2022-07-15 15:39:41 +03:00 |
|
Pieter-Jan Briers
|
b33b5e3737
|
Actually include clientCommandPerms.yml in client builds. (#9632)
|
2022-07-11 23:25:35 +02:00 |
|
Arthur
|
46de728dce
|
Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
# Content.Server/GameTicking/GameTicker.RoundFlow.cs
# Resources/Maps/infiltrator.yml
|
2022-06-13 16:50:11 +03:00 |
|
LudwigVonChesterfield
|
77e829c472
|
TauCeti smoothing mode (#8723)
|
2022-06-12 17:39:12 -07:00 |
|
Arthur
|
5e78fb6fff
|
Merge remote-tracking branch 'upstream/master' into upstream-sync
|
2022-06-06 04:32:53 +03:00 |
|
20kdc
|
3d346b3477
|
Iconsmoothing: Subtile metrics (🦆 Edition) (#8307)
|
2022-06-05 16:35:04 +10:00 |
|
Arthur
|
da3072a8b4
|
Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
# Resources/Maps/infiltrator.yml
# Resources/manifest.yml
|
2022-05-19 20:03:31 +03:00 |
|
Pieter-Jan Briers
|
b0e4fc4b8c
|
Unify ignore/replacement lists for the two contrib ps1 scripts.
|
2022-05-16 22:27:29 +02:00 |
|
Arthur
|
82c0b1c8e7
|
Merge remote-tracking branch 'upstream/master' into upstream-sync
|
2022-05-15 16:38:40 +03:00 |
|
20kdc
|
ac4c5fb737
|
Expanded icon smoothing conversion scripts (#8055)
* Expanded icon smoothing conversion scripts
* hotfix `iconsmooth_inv.py` b/c of table weirdness
|
2022-05-12 22:25:33 +10:00 |
|
Arthur
|
ce0980c4f5
|
Ignore engine files warnings
|
2022-05-11 01:17:17 +03:00 |
|
Arthur
|
a6c1a837ad
|
Merge remote-tracking branch 'upstream/master' into upstream-sync
|
2022-04-24 14:25:19 +03:00 |
|
ike709
|
2e6afcfe6f
|
Makes dump_contributors_since.ps1 work on PowerShell 5.1 (#7679)
|
2022-04-21 09:39:10 +02:00 |
|
ike709
|
9757382aaf
|
Makes dump_commits_since.ps1 work on PowerShell 5.1 (#7680)
|
2022-04-21 09:39:02 +02:00 |
|
Arthur
|
58a8579edb
|
Update gen_build_info script urls
|
2022-04-17 04:49:09 +03:00 |
|
Arthur
|
c5051d5144
|
Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
# Content.Client/GameTicking/Managers/ClientGameTicker.cs
# Content.Client/RoundEnd/RoundEndSummaryWindow.cs
# Content.Server/GameTicking/GameTicker.RoundFlow.cs
# Content.Shared/GameTicking/SharedGameTicker.cs
# Resources/Locale/en-US/round-end/round-end-summary-window.ftl
# Tools/gen_build_info.py
|
2022-04-15 00:30:04 +03:00 |
|
Pieter-Jan Briers
|
7e61c824e7
|
Add new manifest-update metadata to gen_build_info.py (#7555)
|
2022-04-14 17:20:32 +02:00 |
|
Arthur
|
cec80e9668
|
Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
# Resources/Prototypes/species.yml
|
2022-04-02 03:45:49 +03:00 |
|
ike709
|
5c7a1534db
|
Makes ElectroJr a boomer (#7339)
|
2022-03-30 16:06:08 +11:00 |
|
Arthur
|
8e2d5adb1c
|
Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
# .github/CODEOWNERS
# .github/workflows/build-docfx.yml
# Resources/Prototypes/Entities/Clothing/Head/hats.yml
# Resources/Server Info/Rules.txt
|
2022-03-27 05:57:13 +03:00 |
|
ike709
|
ba29b1335a
|
Add Rane and Daemon to the contribs script overrides (#7262)
|
2022-03-24 20:08:09 +01:00 |
|
Arthur
|
8a4feed815
|
Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
# .github/CODEOWNERS
# Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml
# Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml
# Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
# Resources/Server Info/Rules.txt
# Resources/Textures/Structures/Wallmounts/signs.rsi/direction_evac.png
# Resources/Textures/Structures/Wallmounts/signs.rsi/direction_supply.png
|
2022-03-20 03:34:39 +03:00 |
|
Pieter-Jan Briers
|
d0c0dfc1dc
|
Update contributors scripts to do more stuff
|
2022-03-18 20:32:29 +01:00 |
|
Morbo
|
2b67cb6424
|
Update locale scripts & add new locale files (#106)
* Support Windows paths & save locale files in utf8
* Actualise locale keys
* Support Windows paths in scripts
* Actualise entities locale
* Add empty desc & suffix setting & attributes correct update
* Add missing entity locale files
* Add suffix to all entity locale
|
2022-02-20 21:07:45 +03:00 |
|
Morbo
|
aee8ca7776
|
Update locale keys (#92)
* Update locale tools
* Update locale keys
* Update prototypes locale
* Revert "Update prototypes locale"
|
2022-02-09 16:46:28 +03:00 |
|
Arthur
|
e52523e9e1
|
Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
# Resources/Server Info/Rules.txt
|
2022-01-29 06:58:08 +03:00 |
|
Pieter-Jan Briers
|
38d54e41bd
|
Reduce size of server binaries.
Remove unnecessary dlls like duplicate Roslyn copy.
|
2022-01-29 03:15:07 +01:00 |
|
Arthur
|
b278ab0437
|
Merge remote-tracking branch 'upstream/master' into upstream
|
2022-01-18 12:13:44 +03:00 |
|
Kara D
|
0ef31d2e56
|
put kdc's iconsmooth script in the repo
|
2022-01-16 23:22:55 -07:00 |
|
SpaceCarp
|
96471d081c
|
add: Добавлены переводы от Lekar, ga
|
2022-01-08 23:26:09 +03:00 |
|
Morbo
|
58a4038302
|
Revert "add: Добавлен скрипт актуализации переводов из lokalise"
|
2022-01-08 11:02:41 +03:00 |
|
SpaceCarp
|
17448e044d
|
add: Добавлены переводы от Lekar, ga
add: Добавлен файл defaultwindow.ftl из core
fix: Актуализированы ключи русской локали после пулла основного репозитория
|
2022-01-07 22:43:16 +03:00 |
|
SpaceCarp
|
ee1d0cc291
|
fix: yaml name inheritance (#38)
|
2022-01-06 21:02:42 +03:00 |
|
SpaceCarp
|
4570298a0b
|
Add localization/yaml extractor script (#26)
|
2022-01-06 00:40:25 +03:00 |
|
SpaceCarp
|
5f46b7648a
|
Add script for updating keys from official repository (#25)
* fix: Исправлено форматирование .ftl-файлов локали ru-RU
* fix: Исправлено форматирование .ftl-файлов локали ru-RU
* fix: Исправлено форматирование .ftl-файлов локали ru-RU
* add: Скрипт актуализации ключей из официального репозитория
* add: Скрипт актуализации ключей из официального репозитория
|
2022-01-06 00:30:26 +03:00 |
|
SpaceCarp
|
ac0c0217aa
|
Fix .ftl files ru-RU locale formatting (#24)
* fix: Исправлено форматирование .ftl-файлов локали ru-RU
|
2022-01-05 16:25:24 +03:00 |
|
Morbo
|
db52cd8f53
|
Merge branch 'space-wizards:master' into master
|
2021-12-27 02:17:52 +03:00 |
|
Vera Aguilera Puerto
|
666be08d86
|
Fix client-only command permissions. (#5899)
|
2021-12-25 19:53:21 +01:00 |
|
Pieter-Jan Briers
|
61b4aef318
|
Update to new CDN URL.
|
2021-12-23 23:41:35 +01:00 |
|
Arthur
|
1e7d69a823
|
Update builds server
|
2021-12-22 19:24:21 +03:00 |
|
Arthur
|
756fbc4685
|
Update builds path
|
2021-12-15 07:59:45 +03:00 |
|
Arthur
|
2e973513f6
|
Update publish & build info generation scripts
|
2021-12-15 06:42:56 +03:00 |
|