Commit graph

210 commits

Author SHA1 Message Date
Morbo
0e5004268b Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
#	.github/workflows/publish.yml
2023-02-28 20:00:24 +03:00
Pieter-Jan Briers
24121c1168
Fix GITHUB_REPOSITORY in changelog pusher (#14294) 2023-02-26 18:03:57 +01:00
Pieter-Jan Briers
61a671bbc6
Send changelog to Discord webhook. (#14292) 2023-02-26 17:45:06 +01:00
Morb
fdfafd06e7
Add evil twin + Secrets (#823) 2023-02-18 23:49:55 -08:00
Morbo
fbd3c5b1ad Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
#	Resources/Prototypes/Maps/box.yml
#	Resources/Prototypes/Maps/meta.yml
2023-02-15 02:34:58 +03:00
Pieter-Jan Briers
ce1b5b5d00
Use config presets for server configuration. (#14098) 2023-02-14 00:11:54 +01:00
Morbo
202728e432 Update CDN url in build script 2023-02-11 20:21:54 +03:00
Morbo
cdfcfe6722 Merge remote-tracking branch 'upstream/master' into upstream-sync 2023-01-22 00:07:21 +03:00
Pieter-Jan Briers
b1cb32519d
Update patrons and credits (#13554) 2023-01-17 13:42:03 -08:00
Morbo
6343d1e1f8 Merge remote-tracking branch 'upstream/master' into master-syndie
# Conflicts:
#	Content.Server/Chat/Managers/ChatManager.cs
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/rainbow.rsi/meta.json
2022-12-20 14:15:13 +03:00
Pieter-Jan Briers
f78dca8504
Script to dump user data for GDPR purposes. (#13016) 2022-12-19 13:37:42 +01:00
Morbo
b108cf168e Fix newline serialization in locale script 2022-10-07 20:36:11 +03:00
Morb
05b96b273c
Remove en-US locale for unique content (#436) 2022-10-03 10:06:10 -07:00
Morbo
a301bf012b Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
#	Content.Shared/Humanoid/Prototypes/SpeciesPrototype.cs
2022-09-23 16:31:55 +03:00
Flipp Syder
5a0a04bde7
Humanoid appearance refactor (#10882)
* initial commit
- species prototype modifications
- markings points as its own file
- shared humanoid component

* adds a tool to convert sprite accessories to markings (in go)

* removes a fmt call

* converts sprite accessory to markings

* adds hair and facial hair to marking categories

* multiple changes
- humanoid visualizer system
- markings modifications for visualizer
- modifications to shared humanoid component
- lays out a base for humanoid system

* hidden layers, ports some properties from appearance component, shrinks DefaultMarkings a little

* squishes the initialize event calls into one function

adds stuff to set species/skin color externally from a server message - currently laid out as if it a dirty call to a networked component, may be subject to change (server-side has not been implemented yet)

* makes the sprite pipeline more obvious

* apply all markings, hidden layer set replacement

* ensures that markings are cleared when the new set is applied

* starts refactoring markingsset (unfinished)

* more additions to the markingset api

* adds constructor logic to markingset

* adds a method to filter out markings in a set based on a given species

* fixes enumerators in markingset

* adds validator into MarkingSet, fixes ForwardMarkingEnumerator

* modifications to the humanoid visual system

* ensuredefault in markingset

* oop

* fixes up data keys, populates OnAppearanceChange in visualizer

* changes to humanoid component, markings

marking equality is now more strict, humanoidcomponent is now implemented for client as a child of sharedhumanoidcomponent

* markings are now applied the visualizer by diffing them

* base sprites are now applied to humanoids from humanoidvisualizer

* passes along base sprite settings to the marking application so that markings know to follow skin color/alpha or not (see: slimes)

* custom base layers on humanoids

* merges all data keys into one data class for humanoid visualizers

* setappearance in sharedhumanoidsystem, removes custombaselayercolors

* humanoidcomponent, system (empty) in server

* adds some basic public API functions to HumanoidSystem

* add marking, remove marking

* changes appearance MarkingsSet to a List<Marking>, adds listener for PlayerSpawnCompleteEvent in HumanoidSystem

* ensuredefaultmarkings, oninit for humanoids

* markingmanager API changes

* removes MarkingsSet

* LoadProfile, adjusts randomization in humanoid appearance to account for species

* base layer settings in humanoidsystem, eye color from profile

* rearranges files to centralize under Humanoid namespace

* more reorganization, deletes some stuff

gotta break stuff to make other things work, right?

goodbye SpriteAccessory...

* fixes a good chunk of server-side issues

still does not compile, yet

* singlemarkingpicker xaml layout

* singlemarkingpicker logic

* magic mirror window (varying pieces of it, mostly client-oriented)

* removes some imports, gives MagicMirror a BUI class (not filled in yet)

* populates magic mirror BUI functionality / window callbacks

* fixes up some errors in humanoidprofileeditor

* changes to SingleMarkingPicker

SingleMarkingPicker now accepts a List<Marking>, species, and total possible markings available in that marking category

* fixes up hair pickers on humanoid profile editor

* fixes the errors in markingpicker

* markingsystem is now gone

* fixes a bunch of build errors

* so that's why i did it like that

* namespace issues, adds robustxamlloader to singlemarkingpicker

* another robustxamlloader

* human, lizard sprites/points

* prototype fixes, deletion of old spriteaccessory

* component registration, fixes dwarf skin toning

no, 'ReptilianToned' does not exist

* removes component registration from abstract humanoid component

* visualizer data now cloneable

* serialize for visualizer key

* zero-count edge case

* missing semi-colon moment

* setspecies in humanoidsystem

* ensures that default markings, if empty, will cause ensuredefault to skip over that given category

* tryadd instead of add

* whoops

* diff and apply should properly apply markings now

* always ensure default, fixes double load for player spawning

* apply skin color now sets the skin color property in humanoidcomponent

* removes sprite from a few species prototypes

* sprite changes for specific base layers based on humanoid sex

* layer ordering fix, and a missing base layer should now disallow markings on that layer

* anymarking base layer, adds the right leg/foot for humans

* loading a profile will now clear all markings on that humanoid

* adds missing layers for humans

* separates species.yml into respective species prototype files

* ensures that if layer visibility was changed, all markings have to be reapplied

* server-side enforcement of hiding hair (and other head-related markings) when equipping things that hide hair

* slime fix, clothingsystem now dictates layer visibility server side

* sussy

* layer settings should now ensure a marking should match the skin tone

* whoops

* skincolor static class and functions in UI

* skin color validation in humanoidcharacterappearance

* markingpicker now shows only the markings for the selected category in used

* getter for slot in singlemarkingpicker now ensures slot is 0 if markings exists

* FilterSpecies no longer attempts to do removal while iterating

* expands for SingleMarkingPicker

* humanoid base dummy has blank layers now (and snout/tail/headside/headtop)

* fixes an issue with visualizer system if the marking count was different but the markings themselves were (somewhat) the same

* whoops

* adds edge case handlers for count differences in humanoid markings

* preview now loads profile instead of directly setting appearance

* moves marking set loading to update controls

* clones a marking set in markingpicker by using the deep clone constructor

* whoops (deep cloning a marking now copies the marking id)

* adds replace function for markingset

* points should now update after the markings are remove/added

* merging base layer sprites into a humanoid should now clear them before merging

* sets dirty range start to count only if the dirty range start was never set above 0

* fixes up some issues with singlemarkingpicker

* color selector sliders in single marking picker should now expand

* hair from hair pickers should now apply in profile loading (client-side)

* category in singlemarkingpicker now sets the private category variable

* slot selector should now populate

* single marking picker buttons now have text, also shows the category name over all user-clickable elements

* removes a comment

* removing hair slots now sets it to bald, defaults to zero used slots if current hair is bald on hair/facial hair

* random skin color, eye color

* populate colors now checks if the marking count is greater than zero in singlemarkingpicker

* hair/facial hair pickers now just get the first possible hair from the respective species list

* different approach to random skin color

* oh, that's why it wasn't working

* randomize everything now just updates every single control

* selecting a new marking in SingleMarkingPicker should attempt to copy over old colors, populate list now uses cache,

* markingmanager now uses OnlyWhitelisted to populate by category and species

* filterspecies now uses onlyWhitelist to filter markings based on whitelist or not

* oops

* ui fix for singlemarkingpicker, ensures that cache is not null if it is null when populatelist is called

* order of operations for the horizontal expand for add/remove

* hair pickers should now update when you add/remove the hair slot

* fixes variable naming error in character appearance

* loc string fix in singlemarkingpicker

* lizards, vox now have onlyWhitelist, vox restriction for hair/facialhairs

* having zero possible hairs should no longer cause an exception in randomization

* setting species should now update hair pickers

* ignore categories for marking picker

* and a clear as well for the category button

* places that functionality in its own function instead

* adds eye base sprite, vox now also have their own custom eye sprites

* loading a profile client-side should do FilterSpecies for markings now

* client-side load profile does filter species after adding in the hairs now

* magic mirror

* callbacks now call the callback instead of adding it on construct

* whoops

* in removemarking too

* adds missing synchronize calls

* comments out an updateinterface call in magic mirror

* magic mirror window title, minimum sizing

* fixes minsize, adds warning for players who try to set their hair for species that have no hair

* removes spaces in xaml

* namespace changes/organization

* whoopsie (merge conflicts)

* re-enables identity from humanoid component

* damagevisuals now uses the enum given to it instead of the layerstate given on that layer tied to the enum

* removes commas from json

* changes to visuals system so the change is consistent

* chest

* reptilian

* visualizer system now handles body sprite setting/coloration, similar to how characterappearance did it

not a big fan of this

* adds a check in applybasesprites

* adding/removing parts should now make them invisible on a humanoid

* body part removal/adding now enumerates over sublayers instead

* synchro now runs in bodycomponent startup

* parts instead of slots

* humanoidcompnent check

* switches from rsi to actualrsi

* removes all the body stuff (too slow)

* cleans up resolves from humanoid visualizer system

* merging sprites now checks if the base sprites have been modified or not (through things like species changes, or custom base sprite changes)

* not forgetting that one again

* merging now returns an actual dirty value

* replaces the sequenceequal with a more accurate solution

* permanent layers, layer visibility on add/remove part in body

* should send all hidden layers over now

* isdirty in visualizer system for base layers

* isdirty checks count as well

* ok, IsDirty should now set the base layers if the merged sprites are different

* equals override in HumanoidSpritePrototypes.cs

temporary until record prototypes :heck:

* makes fields readonly, equates IDs instead

* adds forced markings through marking picker

* forced in humanoidsystem api, ignorespecies in markingpicker

* marking bui

* makes that serializable as well

* ignore species/forced toggles now work

* adds icon to modifier verb, interface and keys to humanoid bases

* needs the actual enum value to open, no?

* makes the key the actual key

* actions now propagate upwards

* ignore species when set now repopulates markingpicker

* modifiable base layers in the markings window

* oops!

* layout changes

* info box should now appear

* adds ignorespecies for marking picker, collapsible for base layer section of appearance modification window

* collapsible layout moment

* if base layers have changed, all markings are now dirty (and if a base layer is missing, the marking is still 'applied' but it's now just invisible

* small change to marking visibility

* small changes to modifier UI

* markings now match skin on zombification

* zombie stuff

* makes the line edit in marking modifier window more obvious

* disables vox on round start

* horizontal expand on the single label in base layer modifiers

* humanoid profiles in prototypes

* randomhumanoidappearance won't work if the humanoid has a profile already stored

* removes unused code

* documentation in humanoidsystem server-side

* documentation in shared/client

* whoops

* converts accessory into marking in locale files (also adds marking loc string into single marking picker)

* be gone, shared humanoid appearance system from the last upstream merge

* species ignore on randomization (defaults to no ignored species)

* more upstream merge parts that bypassed any errors before merge

* addresses review (also just adds typeserializers in some places)

* submodule moment

* upstream merge issues
2022-09-22 17:19:00 -05:00
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