Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update RT to 223.1.2 #1810

Merged
merged 4 commits into from
May 27, 2024
Merged

Update RT to 223.1.2 #1810

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b16ba61
update
amylizzle May 25, 2024
9af8ecd
remove clickmap warning
amylizzle May 25, 2024
1754c10
Revert "remove clickmap warning"
amylizzle May 27, 2024
f5d9a26
compat mode disables clicking
amylizzle May 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions OpenDreamClient/Input/MouseInputSystem.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
using Robust.Client.Graphics;
using Robust.Client.Input;
using Robust.Client.UserInterface;
using Robust.Shared;
using Robust.Shared.Configuration;
using Robust.Shared.Input;
using Robust.Shared.Input.Binding;
using Robust.Shared.Map;
Expand All @@ -22,6 +24,7 @@ internal sealed class MouseInputSystem : SharedMouseInputSystem {
[Dependency] private readonly EntityLookupSystem _lookupSystem = default!;
[Dependency] private readonly IEntityManager _entityManager = default!;
[Dependency] private readonly MapSystem _mapSystem = default!;
[Dependency] private readonly IConfigurationManager _configurationManager = default!;

private DreamViewOverlay? _dreamViewOverlay;
private ContextMenuPopup _contextMenu = default!;
Expand Down Expand Up @@ -84,6 +87,9 @@ public void HandleStatClick(string atomRef, bool isMiddle) {

var mapCoords = viewport.ScreenToMap(args.PointerLocation.Position);
var mousePos = (args.RelativePixelPosition - viewportBox.TopLeft) / viewportBox.Size * viewport.ViewportSize;

if(_configurationManager.GetCVar(CVars.DisplayCompat))
return null; //Compat mode causes crashes with RT's GetPixel because OpenGL ES doesn't support GetTexImage()
var lookupColor = _dreamViewOverlay.MouseMap.GetPixel((int)mousePos.X, (int)mousePos.Y);
var underMouse = _dreamViewOverlay.MouseMapLookup.GetValueOrDefault(lookupColor);
if (underMouse == null)
Expand Down
2 changes: 1 addition & 1 deletion RobustToolbox
Open in desktop
Submodule RobustToolbox updated 54 files
+1 −1 MSBuild/Robust.Engine.Version.props
+43 −0 RELEASE-NOTES.md
+45 −1 Robust.Analyzers/DataDefinitionAnalyzer.cs
+68 −4 Robust.Analyzers/DataDefinitionFixer.cs
+5 −0 Robust.Analyzers/Robust.Analyzers.csproj
+2 −2 Robust.Client/Debugging/DebugPhysicsSystem.cs
+1 −1 Robust.Client/GameObjects/EntitySystems/DebugLightTreeSystem.cs
+1 −1 Robust.Client/GameObjects/EntitySystems/GridChunkBoundsDebugSystem.cs
+23 −9 Robust.Client/GameStates/ClientGameStateManager.cs
+16 −20 Robust.Client/GameStates/GameStateProcessor.cs
+1 −1 Robust.Client/GameStates/IClientGameStateManager.cs
+3 −3 Robust.Client/GameStates/IGameStateProcessor.cs
+1 −1 Robust.Client/GameStates/NetInterpOverlay.cs
+7 −14 Robust.Client/Graphics/ClientEye/EyeManager.cs
+11 −7 Robust.Client/Graphics/ClientEye/IEyeManager.cs
+6 −3 Robust.Client/Graphics/Clyde/Clyde.HLR.cs
+1 −1 Robust.Client/Graphics/Clyde/Clyde.Textures.cs
+4 −4 Robust.Client/Placement/Modes/AlignSnapgridCenter.cs
+6 −6 Robust.Client/Placement/PlacementManager.cs
+3 −2 Robust.Client/Placement/PlacementMode.cs
+1 −1 Robust.Client/Placement/PlacementOverlay.cs
+31 −8 Robust.Client/Replays/Loading/ReplayLoadManager.Checkpoints.cs
+2 −2 Robust.Client/Replays/Loading/ReplayLoadManager.Implicit.cs
+2 −0 Robust.Client/Replays/Loading/ReplayLoadManager.cs
+2 −2 Robust.Client/Replays/Playback/ReplayPlaybackManager.Time.cs
+2 −2 Robust.Client/Replays/Playback/ReplayPlaybackManager.cs
+3 −1 Robust.Client/UserInterface/Controls/LineEdit.cs
+1 −0 Robust.Roslyn.Shared/Diagnostics.cs
+10 −8 Robust.Serialization.Generator/Generator.cs
+4 −2 Robust.Server/GameStates/PvsSystem.GetStates.cs
+3 −0 Robust.Server/Robust.Server.csproj
+1 −1 Robust.Server/ServerStatus/WatchdogApi.cs
+2 −0 Robust.Server/run_server.bat
+2 −2 Robust.Server/server_config.toml
+8 −3 Robust.Shared/CVars.cs
+122 −49 Robust.Shared/Configuration/ConfigurationManager.cs
+21 −1 Robust.Shared/Configuration/IConfigurationManager.cs
+109 −23 Robust.Shared/Containers/SharedContainerSystem.cs
+42 −29 Robust.Shared/GameObjects/ComponentState.cs
+8 −3 Robust.Shared/GameObjects/Components/UserInterface/UserInterfaceComponent.cs
+2 −4 Robust.Shared/GameObjects/EntityManager.Components.cs
+3 −4 Robust.Shared/GameObjects/EntityState.cs
+1 −1 Robust.Shared/GameObjects/IEntityManager.Components.cs
+40 −29 Robust.Shared/GameObjects/Systems/SharedMapSystem.Grid.cs
+128 −29 Robust.Shared/GameObjects/Systems/SharedTransformSystem.Coordinates.cs
+41 −34 Robust.Shared/GameObjects/Systems/SharedUserInterfaceSystem.cs
+2 −0 Robust.Shared/GameStates/ComponentStateEvents.cs
+28 −29 Robust.Shared/Map/Components/MapGridComponent.cs
+22 −96 Robust.Shared/Map/EntityCoordinates.cs
+1 −1 Robust.Shared/Network/AuthManager.cs
+1 −2 Robust.Shared/Serialization/Manager/Definition/DataDefinition.cs
+12 −0 Robust.Shared/Serialization/Manager/Definition/DataDefinitionUtility.cs
+1 −1 Robust.UnitTesting/Shared/GameObjects/EntityState_Tests.cs
+1 −1 Robust.UnitTesting/Shared/GameState/NoSharedReferencesTest.cs
Loading