ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'runelite/master' into rl-update

Browse Source
This commit is contained in:
Owain van Brakel
2019-07-23 21:51:56 +02:00
parent 596689a4f7 7ffea7f41e
commit cb6eecfa29
16 changed files with 340 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
runelite-api/src/main/java/net/runelite/api/ItemDefinition.java
View File

@@ -105,9 +105,9 @@ public interface ItemDefinition
/**
* Sets the menu action index of the shift-click action.
*
* @param shiftclickActionIndex the new index of the shift-click action
* @param shiftClickActionIndex the new index of the shift-click action
*/
void setShiftClickActionIndex(int shiftclickActionIndex);
void setShiftClickActionIndex(int shiftClickActionIndex);
/**
* Resets the menu action index of the shift-click action to its

5
runelite-api/src/main/java/net/runelite/api/SpriteID.java
View File

@@ -1564,7 +1564,10 @@ public final class SpriteID
public static final int MOBILE_FUNCTION_MODE_DISABLED = 1624;
public static final int MOBILE_YELLOW_TOUCH_ANIMATION_1 = 1625;
public static final int MOBILE_YELLOW_TOUCH_ANIMATION_2 = 1626;
/* Unmapped: 1627~1707 */
/* Unmapped: 1627~1701 */
public static final int BUTTON_FRIENDS = 1702;
public static final int BUTTON_IGNORES = 1703;
/* Unmapped: 1704~1707 */
public static final int TAB_MAGIC_SPELLBOOK_ARCEUUS_UNUSED = 1708;
/* Unmapped: 1709, 1710 */
public static final int TAB_MAGIC_SPELLBOOK_ARCEUUS = 1711;