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
b1cac7e781
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Content.Client/Chat/Managers/IChatManager.cs
# Content.Client/IoC/ClientContentIoC.cs
# Content.Server/Administration/Systems/BwoinkSystem.cs
# Content.Server/Chat/Managers/ChatManager.cs
# Content.Server/GameTicking/GameTicker.Player.cs
# Resources/Audio/Machines/attributions.yml
# Resources/Locale/en-US/_strings/administration/commands/custom-vote-command.ftl
# Resources/Locale/en-US/_strings/discord/vote-notifications.ftl
# Resources/Locale/en-US/_strings/npc/firebot.ftl
# Resources/Locale/en-US/_strings/paper/syndicate-business-card.ftl
# Resources/Locale/en-US/_strings/store/uplink-catalog.ftl
# Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
# Resources/Prototypes/Recipes/Crafting/bots.yml
# Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json
# Resources/Textures/Structures/Walls/solid.rsi/reinf_over0.png
2024-10-02 06:45:10 +03:00
metalgearsloth
bc461b91a5
Predict stripping ( #32478 )
...
* Predict stripping
Stops mob verbs from getting moved around again.
* Bola
* Fix ftl
2024-09-27 17:12:10 +10:00
VigersRay
67c8ba2471
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTab.xaml.cs
# Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTabEntry.xaml
# Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTabEntry.xaml.cs
# Content.IntegrationTests/Tests/PostMapInitTest.cs
# Content.Server/Chat/Systems/ChatSystem.cs
# Content.Server/Clothing/Components/GloveHeatResistanceComponent.cs
# Content.Server/Light/EntitySystems/PoweredLightSystem.cs
# Content.Server/Medical/HealthAnalyzerSystem.cs
# Content.Server/Medical/SuitSensors/SuitSensorComponent.cs
# Content.Server/StationEvents/Events/MeteorSwarmSystem.cs
# Content.Server/StationEvents/Events/StationEventSystem.cs
# Content.Shared/Actions/SharedActionsSystem.cs
# Content.Shared/Interaction/SharedInteractionSystem.cs
# Resources/Prototypes/AlertLevels/alert_levels.yml
# Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
# Resources/Prototypes/Catalog/Fills/Lockers/misc.yml
# Resources/Prototypes/Catalog/VendingMachines/Inventories/engivend.yml
# Resources/Prototypes/Datasets/Names/fortunes.yml
# Resources/Prototypes/Datasets/ion_storm.yml
# Resources/Prototypes/Entities/Clothing/Neck/mantles.yml
# Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
# Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml
# Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
# Resources/Prototypes/Entities/Objects/Fun/pai.yml
# Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
# Resources/Prototypes/Entities/Objects/Specific/Medical/handheld_crew_monitor.yml
# Resources/Prototypes/Entities/Structures/Machines/lathe.yml
# Resources/Prototypes/GameRules/events.yml
# Resources/Prototypes/Loadouts/Jobs/Science/research_director.yml
# Resources/Prototypes/Recipes/Lathes/clothing.yml
# Resources/Prototypes/game_presets.yml
# Resources/Prototypes/secret_weights.yml
# Resources/ServerInfo/Guidebook/Engineering/Singularity.xml
# Resources/Textures/Clothing/Head/Helmets/security.rsi/equipped-HELMET-vox.png
# Resources/Textures/Clothing/Head/Helmets/security.rsi/equipped-HELMET.png
# Resources/Textures/Clothing/Head/Helmets/security.rsi/icon.png
# Resources/Textures/Clothing/Head/Helmets/security.rsi/inhand-left.png
# Resources/Textures/Clothing/Head/Helmets/security.rsi/inhand-right.png
# Resources/Textures/Clothing/Head/Helmets/security.rsi/meta.json
# Resources/Textures/Clothing/Mask/ert.rsi/meta.json
# Resources/Textures/Clothing/Mask/joy.rsi/meta.json
# Resources/Textures/Clothing/Mask/squadron.rsi/meta.json
# Resources/Textures/Clothing/Neck/Cloaks/cmo.rsi/equipped-NECK.png
# Resources/Textures/Clothing/Neck/Cloaks/cmo.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Armor/security.rsi/equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Armor/security.rsi/icon.png
# Resources/Textures/Clothing/OuterClothing/Armor/security.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Hardsuits/medical.rsi/inhand-left.png
# Resources/Textures/Clothing/OuterClothing/Hardsuits/medical.rsi/inhand-right.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_alt.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Objects/Specific/Hydroponics/aloe.rsi/produce.png
# Resources/Textures/Objects/Specific/Hydroponics/apple.rsi/produce.png
# Resources/Textures/Objects/Specific/Hydroponics/cannabis.rsi/produce.png
# Resources/Textures/Objects/Tools/crowbar.rsi/meta.json
# Resources/Textures/Objects/Tools/crowbar.rsi/red-icon.png
# Resources/Textures/Objects/Tools/crowbar.rsi/red-storage.png
# Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/base.png
# Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/broken.png
# Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/burned.png
# Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/empty.png
# Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/glow.png
# Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/meta.json
# Resources/migration.yml
2024-08-14 19:55:44 +03:00
DrSmugleaf
1fb03e9074
Fix popups not working properly with an eye offset ( #30990 )
2024-08-14 09:38:36 -04:00
VigersRay
65db2701fe
Оверлей урона
2024-08-08 08:09:14 +03:00
eoineoineoin
b44b159431
Replace Matrix3 with System.Numerics.Matrix3x2 ( #27443 )
...
Replace Matrix3 with Matrix3x2
2024-06-02 14:07:41 +10:00
ShadowCommander
49982acc88
Popup duplicate stacking ( #27978 )
2024-05-29 00:05:40 -04: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
f4cb02fb0c
Code cleanup: Purge calls to obsolete EntityCoordinates methods ( #26292 )
...
* Purge calls to obsolete EntityCoordinates methods
* Pizza defruited; rerun those tests!
2024-03-21 12:59:56 +11:00
LordCarve
7d275a4b5e
Obsolete Logger cleanup for EntitySystems part 2 ( #26159 )
...
* Kill the static InRangeUnOccluded
* Adjusted 4 more EntitySystems that were missed.
2024-03-17 18:31:09 +11:00
Tayrtahn
0738829510
Add SharedPopupSystem.PopupPredicted ( #25811 )
...
* Added SharedPopupSystem.PopupPredicted
* Documentation improvement
2024-03-06 02:59:05 +01:00
metalgearsloth
560ea9775a
Fix screenspace popups ( #24987 )
...
* Fix screenspace popups
Never got around to it earlier but need to draw it above UI controls.
* Minor null change
2024-02-10 00:51:11 -08: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
metalgearsloth
5b8f3c48c4
Revert "Update submodule to 175.0.0 ( #21318 )" ( #21319 )
2023-10-29 15:29:30 +11:00
metalgearsloth
9b1b3e03ed
Content audio ( #20862 )
2023-10-29 14:58:23 +11: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
deltanedas
76173285b9
Add missing type argument from PopupClient to PopupEntity ( #20725 )
...
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-10-04 10:52:04 -08:00
metalgearsloth
5a0fc68be2
Content update for NetEntities ( #18935 )
2023-09-11 09:42:41 +10:00
Vordenburg
42ed9dd550
Improve Popup animation ( #18721 )
...
* Cap and slow Popup Y-distance
* Make Popup lifetime a function of text length
2023-08-05 16:26:15 -05:00
metalgearsloth
68480af109
Update content vectors to numerics ( #17759 )
2023-07-08 14:08:32 +10:00
Leon Friedrich
b03d9a90ab
Add support for client-side replays ( #17168 )
2023-06-19 03:23:31 +10:00
metalgearsloth
bf5d706e70
Fix filter popup prediction spam ( #16274 )
2023-05-10 10:00:58 +10:00
deltanedas
ddc2785110
rcd refactor ( #15172 )
...
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-05-01 23:46:59 +10:00
metalgearsloth
67ecae6b7d
Ignore player ent for popup raycasts ( #13485 )
2023-01-16 05:14:21 +11:00
Leon Friedrich
0875865d6d
Update engine ( #13474 )
2023-01-15 14:21:08 +11:00
metalgearsloth
ed4a22510a
Popup occlusion ( #13255 )
2022-12-31 21:47:52 -08:00
Leon Friedrich
2f4e90a3e0
Fix popup bugs ( #13233 )
2022-12-31 10:46:04 +11:00
metalgearsloth
f38f9499f3
Use UI scaling for popup overlay ( #13169 )
...
* Use UI scaling for popup overlay
* oop
2022-12-24 15:07:00 -06:00
metalgearsloth
ab68d300f7
Multi-viewport popups ( #11591 )
2022-12-19 13:39:35 +11:00
Leon Friedrich
881a2b2ece
PopupSystem public methods rejig ( #12830 )
2022-12-19 08:41:47 +11:00
Visne
58769634c7
Fix a bunch of compiler warnings ( #10518 )
2022-08-13 22:28:34 -07:00
metalgearsloth
9eec2268d8
Fix cursor popups ( #10016 )
2022-07-25 01:58:23 -07: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
Leon Friedrich
ca7960382b
Missing nullables ( #8634 )
2022-06-04 17:17:48 +10:00
Leon Friedrich
763b79bbf9
Remove (some?) pop-up error spam. ( #8538 )
2022-06-03 03:42:59 -07:00
Leon Friedrich
1954e0c3de
Fix cursor popups ( #8401 )
...
* Fix cursor popups
* RemoveSwap
2022-05-25 12:33:48 +10:00
Leon Friedrich
8b1bb590e2
Fix popups appearing at 0,0 ( #8221 )
...
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2022-05-19 08:12:09 +10:00
Pieter-Jan Briers
ebfe5e888f
Kick mines (real) ( #8056 )
...
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2022-05-18 14:07:35 +10:00
metalgearsloth
6903209a31
Show ghosts popups etc through walls ( #8077 )
...
* Show ghosts popups etc through walls
* Stage moment
* crashes
2022-05-12 21:18:38 +10:00
Leon Friedrich
c00b459e31
Machine Port Prototypes ( #7659 )
...
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2022-05-12 18:46:20 +10:00
metalgearsloth
1ef2407d02
Fix popup deletion raycasts ( #8072 )
...
* Fix popup deletion raycasts
* woops
2022-05-10 02:37:02 -07:00
metalgearsloth
bba26373ea
Popup label occlusion ( #8017 )
2022-05-08 01:54:27 -07:00
Leon Friedrich
9833d25103
Fix entity popup error ( #7500 )
2022-04-11 19:42:52 +10:00
DrSmugleaf
c19e268748
Fix popups moving with the viewer ( #7275 )
2022-03-26 05:16:30 +11:00
