Pieter-Jan Briers
|
c4fe0c904c
|
Merge branch 'master' into expl_int_analyzer
|
2021-02-08 22:46:28 +01:00 |
|
metalgearsloth
|
329d599107
|
Fix drag-drop stripping (#3001)
* Fix drag-drop stripping
* More robust
Co-authored-by: Metal Gear Sloth <metalgearsloth@gmail.com>
|
2021-01-24 19:00:58 +11:00 |
|
DrSmugleaf
|
fcd52fa90c
|
Add ActionBlockerExtensions
|
2020-12-20 04:26:21 +01:00 |
|
DrSmugleaf
|
cdedaeb12e
|
Refactor drag and drop to use a shared interface (#2012)
* WIP in progress hours
* Cleanup
* Fix bugle
* Fix nullable error
* Merge fixes
* Merge fixes
* Merge fixes
|
2020-10-14 15:24:07 +02:00 |
|
DrSmugleaf
|
74943a2770
|
Typo, redundant string interpolation, namespaces and imports cleanup (#2068)
* Readonly, typos and redundant string interpolations
* Namespaces
* Optimize imports
* Address reviews
* but actually
* Localize missing strings
* Remove redundant vars
|
2020-09-13 14:23:52 +02:00 |
|
nuke
|
a62935dab2
|
Handcuff system (#1831)
* Implemented most serverside logic
* All serverside cuff logic complete
* SFX, Clientside HUD stuff, Other logic.
* fffff
* Cuffs 1.0
* missing loc string
* Cuffs are stored in the balls now.
* Basic integrationtest
* Support stripping menu.
* rrr
* Fixes
* properties
* gun emoji
* fixes
* get rid of unused
* reeee
* Update Content.Shared/GameObjects/ContentNetIDs.cs
Co-authored-by: Víctor Aguilera Puerto <6766154+Zumorica@users.noreply.github.com>
|
2020-08-25 14:54:23 +02:00 |
|
Víctor Aguilera Puerto
|
c3df108b27
|
Stripping (#1668)
* Start work on stripping.
* more strippable work
* Stripping works
* Nullable
* MORE NULLABLE
* nullable moment
* life is pain
* Interaction check.
* Update Content.Client/GameObjects/Components/HUD/Inventory/StrippableBoundUserInterface.cs
Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
* Update Content.Client/GameObjects/Components/HUD/Inventory/StrippableBoundUserInterface.cs
Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
* Update Content.Server/GameObjects/Components/GUI/HandsComponent.cs
Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
* Update Content.Server/GameObjects/Components/GUI/HandsComponent.cs
Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
* Update Content.Server/GameObjects/Components/GUI/HandsComponent.cs
Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
* Update Content.Server/GameObjects/Components/GUI/StrippableComponent.cs
Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
* Update Content.Server/GameObjects/Components/GUI/StrippableComponent.cs
Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
* Update Content.Server/GameObjects/Components/GUI/HandsComponent.cs
Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
* Update Content.Server/GameObjects/Components/GUI/StrippableComponent.cs
Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
* Update Content.Server/GameObjects/Components/GUI/StrippableComponent.cs
Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
* Update Content.Shared/GameObjects/Components/GUI/SharedStrippableComponent.cs
Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
* Update Content.Server/GameObjects/Components/GUI/StrippableComponent.cs
Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
* Rename InventoryComponent and HandsComponent's OnChanged event to OnItemChanged
* Apply suggestions from code review
Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
* Apply suggestions from code review
Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
* Apply suggestions from code review
Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
* Use static EquipmentSlotDefines
* Do not expose ContainerSlot on Inventory or Hands.
Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
|
2020-08-15 20:33:42 +02:00 |
|