client: merge upstream

This commit is contained in:
zeruth
2020-05-28 02:47:16 -04:00
parent 3c2f26b523
commit a7eb45b3e3
3 changed files with 10 additions and 5 deletions

View File

@@ -2030,7 +2030,7 @@ public interface Client extends GameShell
* If the image is larger than half the width of fixed mode,
* it won't get mirrored to the other side of the screen
*/
void setLoginScreen(SpritePixels pixels);
void setLoginScreen(Sprite pixels);
/**
* Sets whether the flames on the login screen should be rendered

View File

@@ -279,6 +279,11 @@ public enum MenuOpcode
* Menu action for configuring runelite overlays.
*/
RUNELITE_OVERLAY_CONFIG(1502),
/**
* Menu action injected by runelite for menu items which target
* a player and have its identifier set to a player index.
*/
RUNELITE_PLAYER(1503),
FOLLOW(2046),
TRADE(2047),