Vigers Ray
0e350ab6d3
Merge remote-tracking branch 'space-wizards/master'
...
# Conflicts:
# Content.Client/Actions/ActionsSystem.cs
# Content.Client/UserInterface/Systems/Chat/Widgets/ChatBox.xaml
# Content.Server/GameTicking/GameTicker.GamePreset.cs
# Content.Server/GameTicking/GameTicker.Spawning.cs
# Content.Server/Station/Systems/StationSpawningSystem.cs
# Content.Shared/Actions/BaseActionComponent.cs
# Content.Shared/Actions/SharedActionsSystem.cs
# Content.Shared/Weapons/Reflect/ReflectComponent.cs
# Content.Shared/Weapons/Reflect/ReflectSystem.cs
# README.md
# Resources/Prototypes/Actions/types.yml
# Resources/Prototypes/Entities/Clothing/Eyes/hud.yml
# Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
# Resources/Prototypes/Entities/Mobs/Player/dragon.yml
# Resources/Prototypes/Recipes/Lathes/security.yml
# Resources/Prototypes/ai_factions.yml
2025-04-19 00:46:30 +03:00
Tayrtahn
e00e2ba407
Add PopupPredictedCursor and fix doubled popups on vending machines ( #36655 )
...
* Add PopupCursorPredicted method
* Fix doubled popups on vending machine restock failures
* Rename to match existing pattern
2025-04-18 14:01:46 +10:00
Vigers Ray
84c607c84a
Merge remote-tracking branch 'space-wizards/master'
...
# Conflicts:
# Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTab.xaml.cs
# Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTabEntry.xaml
# Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTabEntry.xaml.cs
# Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTabHeader.xaml
# Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTabHeader.xaml.cs
# Content.Server/Administration/Systems/AdminSystem.cs
# Content.Server/Administration/Systems/AdminVerbSystem.Antags.cs
# Content.Server/Ghost/GhostSystem.cs
# Resources/Locale/en-US/_strings/administration/antag.ftl
# Resources/Locale/en-US/_strings/administration/commands/adminnotes.ftl
# Resources/Locale/en-US/_strings/construction/components/block-anchor-component.ftl
# Resources/Locale/en-US/_strings/power/commands.ftl
# Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml
# Resources/Textures/Interface/Misc/job_icons.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/aloe.rsi/produce.png
# Resources/Textures/Objects/Specific/Hydroponics/apple.rsi/produce.png
# Resources/Textures/Objects/Specific/Hydroponics/chili.rsi/produce.png
# Resources/Textures/Objects/Specific/Hydroponics/corn.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/corn.rsi/produce.png
# Resources/Textures/Objects/Specific/Hydroponics/eggplant.rsi/produce.png
# Resources/Textures/Objects/Specific/Hydroponics/eggy.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/lemon.rsi/produce.png
# Resources/Textures/Objects/Specific/Hydroponics/onion_red.rsi/produce.png
# Resources/Textures/Objects/Specific/Hydroponics/potato.rsi/produce.png
# Resources/Textures/Objects/Specific/Hydroponics/sugarcane.rsi/produce.png
# Resources/Textures/Objects/Specific/Hydroponics/tomato.rsi/produce.png
2025-03-27 20:37:49 +03:00
Milon
b97de9d603
add predicted popups with PVS filtering ( #36092 )
...
add
2025-03-26 12:45:29 +01:00
Vigers Ray
ed0a30bb64
Merge remote-tracking branch 'space-wizards/master'
...
# Conflicts:
# Content.Client/Weapons/Ranged/Systems/GunSystem.cs
# Content.IntegrationTests/Tests/PostMapInitTest.cs
# Content.Server/Entry/EntryPoint.cs
# Content.Server/Ghost/GhostSystem.cs
# Content.Server/IoC/ServerContentIoC.cs
# Content.Server/Shuttles/Systems/ArrivalsSystem.cs
# Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs
# Content.Server/Storage/EntitySystems/SpawnItemsOnUseSystem.cs
# Content.Server/Voting/Managers/VoteManager.DefaultVotes.cs
# Content.Server/Weapons/Ranged/Systems/GunSystem.Battery.cs
# Content.Server/Weapons/Ranged/Systems/GunSystem.Cartridges.cs
# Content.Server/Weapons/Ranged/Systems/GunSystem.cs
# Content.Shared/Damage/Systems/DamageableSystem.cs
# Content.Shared/Follower/FollowerSystem.cs
# Resources/Locale/en-US/_strings/actions/actions/dna-scrambler.ftl
# Resources/Locale/en-US/_strings/administration/commands/change-cvar-command.ftl
# Resources/Locale/en-US/discord/vote-notifications.ftl
# Resources/Prototypes/Catalog/Fills/Crates/armory.yml
# Resources/Prototypes/Catalog/Fills/Lockers/security.yml
# Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml
# Resources/Prototypes/Entities/Objects/Specific/Medical/handheld_crew_monitor.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
# Resources/Prototypes/Voice/speech_emotes.yml
2025-02-19 13:16:37 +03:00
Cooper Wallace
e0d911bc47
Wizard Recall shows Disappearing text at Coordinate ( #35272 )
...
* Add prediction for coordinate based popups
* Remove use of deprecated EntityCoordinates.ToMap
* RecallItem displays disppearing text at entity coordinates
* Update Content.Shared/ItemRecall/SharedItemRecallSystem.cs
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
* Update Content.Shared/Popups/SharedPopupSystem.cs
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
* Add ItemRecall message for witnesses
* Update Content.Shared/ItemRecall/SharedItemRecallSystem.cs
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
* Update Resources/Locale/en-US/item-recall/item-recall.ftl
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
* Fix namespace issues
* Fix Loc string
* Dont fixstuff tired..
* Prefix THE
* Filter around the entity, and remove recipient if needed
* Alphabetical imports
* Update Content.Client/Popups/PopupSystem.cs
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
* fixup
* Better handling.
---------
Co-authored-by: Cooper Wallace <CooperWallace@users.noreply.github.com>
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2025-02-18 20:47:10 -05:00
Vigers Ray
3fc11027a9
ыыы
2025-02-19 00:12:10 +03:00
ThereDrD
e6c17204dd
Визуализация указывания стрелочкой в чате ( #1383 )
2025-02-16 00:25:57 +03:00
ThereDrD
d07cbcda6e
Красивые циферки урона ( #993 )
...
* damage overlay refactor: new visuals and ignored damage types feature
* remove unused popup types
* add horizontal direction movement
* fix default popup type
* fix fix
* fix fix fix
* add damage overlay to structures
* comments + better implementation
* add ui dropdown option
* better values
* fix missing disabled sessions check
* asdasdadasd new commit on my pr
* ЧЕ БЛЯДЬ СЛОЖНО ДА
* ы
---------
Co-authored-by: Vigers Ray <vigersray@gmail.com>
2025-01-05 14:51:20 +03:00
VigersRay
65db2701fe
Оверлей урона
2024-08-08 08:09:14 +03:00
DrSmugleaf
81f2dc7cf9
Add SharedPopupSystem.PopupClient for cursor and coordinates ( #27231 )
2024-04-22 13:57:13 +10:00
Tayrtahn
9107d421bd
Add two-message overload to PopupPredicted ( #26907 )
...
Added two-message overload to PopupPredicted
2024-04-14 13:42:45 +10:00
Nemanja
1b69762816
disallow unanchoring or opening panels on locked emitters/APEs ( #26600 )
...
* disallow unanchoring or opening panels on locked emitters/APEs
* no locking open panels
* oops
* needback feedback
* Update Content.Shared/Lock/LockSystem.cs
* Update Content.Shared/Lock/LockSystem.cs
* Update Content.Shared/Lock/LockSystem.cs
* sanity
---------
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2024-03-31 17:34:17 +11:00
Tayrtahn
0738829510
Add SharedPopupSystem.PopupPredicted ( #25811 )
...
* Added SharedPopupSystem.PopupPredicted
* Documentation improvement
2024-03-06 02:59:05 +01:00
metalgearsloth
606c5a8c8b
Make popups nullable ( #24802 )
...
This standardises it with audio and whatever. Me when I sprinkle nullchecks everywhere.
Was 50/50 on making new non-nullable methods but figured it would bloat too hard and you can't access strings by .Value anyway.
2024-02-01 23:25:58 -05:00
Leon Friedrich
e685cb626b
Un-revert IPlayerManager refactor ( #21244 )
2023-10-28 09:59:53 +11:00
metalgearsloth
a2bbda43cc
Revert "Update submodule to 172.0.0 ( #21222 )" ( #21225 )
2023-10-24 21:55:20 +11:00
Leon Friedrich
7ba0ea2926
IPlayerManager refactor ( #21215 )
2023-10-24 20:19:08 +11:00
metalgearsloth
5a0fc68be2
Content update for NetEntities ( #18935 )
2023-09-11 09:42:41 +10:00
deltanedas
ddc2785110
rcd refactor ( #15172 )
...
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-05-01 23:46:59 +10:00
metalgearsloth
448165ffda
Escape pods ( #14809 )
...
* Namespace adjustments for days
* pod
* thanks rider
* Fix the oop launch
* Fixes
* Fix stuff
* eeeeeeeee
* Fix
* access
* map
* forgor
* thing
* Genericise escape pod fill
2023-03-23 19:54:41 -06:00
Leon Friedrich
881a2b2ece
PopupSystem public methods rejig ( #12830 )
2022-12-19 08:41:47 +11:00
Kara
50fc190f7f
Visual popup addendum ( #9570 )
2022-07-09 02:32:06 -07:00
Kara
dc28b58468
Visual popup types ( #9523 )
...
* Visual popup types
* Pass over `PopupCoordinates` and `PopupCursor`
* `PopupEntity` pass
* Disease and reagent popup pass
* COLOUR
2022-07-09 04:09:52 -05:00
wrexbe
bc68ac96dd
Cleanup the namespaces ( #8132 )
2022-05-13 17:59:03 +10:00
mirrorcult
ec4d4688c7
Seal/abstract/virtual everything ( #6739 )
2022-02-16 18:23:23 +11:00
Vera Aguilera Puerto
4f70dc87f0
Remove obsolete "GetFilterFromEntity" method from PopupSystem.
2021-10-03 16:19:07 +02:00
Vera Aguilera Puerto
3e2a8738a9
PopupSystem now uses Filter methods for getting players from entities. ( #4751 )
2021-10-03 16:15:15 +02:00
Vera Aguilera Puerto
0767bd3777
Popup ECS Refactor ( #4692 )
2021-09-26 15:18:45 +02:00
