Galactic Chimp
5363f59a90
Merge branch 'master' into replace-sounds-with-sound-specifier
...
# Conflicts:
# Content.Server/Kitchen/Components/ReagentGrinderComponent.cs
# Content.Server/Storage/Components/SecureEntityStorageComponent.cs
2021-07-30 20:26:22 +02:00
Paul Ritter
3501bcbea6
reagentgrinder ecs & xamlui ( #4347 )
...
* started converting grinder to ecs
* finished reagentcontainer ecs
refactored bui
converted ui to xaml
* adds handling
* fixes handling
* oopsie
Co-authored-by: Paul <ritter.paul1+git@googlemail.com >
2021-07-28 21:58:38 -07:00
Galactic Chimp
f531c65a0b
Merge branch 'master' into replace-sounds-with-sound-specifier
...
# Conflicts:
# Content.Server/Actions/Actions/DisarmAction.cs
# Content.Server/Actions/Actions/ScreamAction.cs
# Content.Server/Arcade/Components/SpaceVillainArcadeComponent.cs
# Content.Server/Damage/Components/DamageOnHighSpeedImpactComponent.cs
# Content.Server/Explosion/Components/FlashExplosiveComponent.cs
# Content.Server/Physics/Controllers/MoverController.cs
# Content.Server/Portal/Components/PortalComponent.cs
# Content.Server/Portal/Components/TeleporterComponent.cs
# Content.Server/Projectiles/Components/ProjectileComponent.cs
# Content.Server/Singularity/Components/EmitterComponent.cs
# Content.Server/Sound/EmitSoundSystem.cs
# Content.Server/Stunnable/Components/StunbatonComponent.cs
# Content.Server/Tools/Components/MultitoolComponent.cs
# Content.Server/Weapon/Ranged/Barrels/Components/ServerBatteryBarrelComponent.cs
# Content.Shared/Gravity/GravityComponent.cs
# Content.Shared/Light/Component/SharedExpendableLightComponent.cs
# Content.Shared/Maps/ContentTileDefinition.cs
# Content.Shared/Slippery/SlipperyComponent.cs
# Content.Shared/Standing/StandingStateComponent.cs
# Resources/Prototypes/Entities/Objects/Fun/bike_horn.yml
2021-07-25 14:12:00 +02:00
Visne
b7dc3c81ae
Remove redundant #nullable enable ( #4275 )
2021-07-16 17:37:09 -07:00
Acruid
59e5cc5e3c
Remove Static Component NetIds ( #4247 )
...
* Remove the unnecessary NetID property from ComponentState.
* Remove Component.NetworkSynchronizeExistence.
* Removed Component.NetID.
* Adds component netID automatic generation.
* Removed NetIdAttribute from serverside components with no corresponding clientside registration.
* Completely remove static NetIds.
* Renamed NetIDAttribute to NetworkedComponentAttribute.
* Add GenerateNetIds calls to client and server entry points.
Add test to make sure auto generated NetIds are identical.
* Component changes when rebasing that I am too lazy to rewrite into the branch.
Co-authored-by: Vera Aguilera Puerto <6766154+Zumorica@users.noreply.github.com >
2021-07-12 10:32:10 +02:00
Galactic Chimp
ce3c59e0e6
replacing sound (collection) names with SoundSpecifier - part 1
2021-07-10 17:35:33 +02:00
Swept
a51305466e
Makes more stuff destructible/breakable ( #4081 )
2021-06-19 19:34:01 +00:00
DrSmugleaf
ff1a2d97ea
Re-organize all projects ( #4166 )
2021-06-09 22:19:39 +02:00
