Merge remote-tracking branch 'upstream/master' into master

This commit is contained in:
ThatGamerBlue
2021-03-31 12:49:31 +01:00
28 changed files with 999 additions and 304 deletions

View File

@@ -51,6 +51,20 @@ public interface Scene
int getDrawDistance();
void setDrawDistance(int drawDistance);
/**
* Get the minimum scene level which will be rendered
*
* @return the plane of the minimum level
*/
int getMinLevel();
/**
* Set the minimum scene level which will be rendered
*
* @param minLevel the plane of the minimum level
*/
void setMinLevel(int minLevel);
/**
* Remove a game object from the scene
* @param gameObject

View File

@@ -615,6 +615,15 @@ public enum Varbits
*/
PARASITE(10151),
/**
* Whether the vanilla wiki entity lookup is displayed under the minimap
*
* 0 = Enabled
* 1 = Disabled
*
*/
WIKI_ENTITY_LOOKUP(10113),
/**
* Whether the Special Attack orb is disabled due to being in a PvP area
*

View File

@@ -178,6 +178,7 @@ public class WidgetID
public static final int DIALOG_NOTIFICATION_GROUP_ID = 229;
public static final int DIALOG_SPRITE2_ID = 11;
public static final int MULTISKILL_MENU_GROUP_ID = 270;
public static final int TEMPOROSS_GROUP_ID = 437;
static class WorldMap
{
@@ -1076,6 +1077,10 @@ public class WidgetID
static final int TELEPORT = 59;
}
static class TemporossStatus
{
static final int STATUS_INDICATOR = 4;
}
static class DialogPlayer
{

View File

@@ -542,6 +542,8 @@ public enum WidgetInfo
MULTICOMBAT_RESIZEABLE_MODERN(WidgetID.RESIZABLE_VIEWPORT_BOTTOM_LINE_GROUP_ID, WidgetID.ResizableViewport.MULTICOMBAT_INDICATOR),
MULTICOMBAT_RESIZEABLE_CLASSIC(WidgetID.RESIZABLE_VIEWPORT_OLD_SCHOOL_BOX_GROUP_ID, WidgetID.ResizableViewport.MULTICOMBAT_INDICATOR),
TEMPOROSS_STATUS_INDICATOR(WidgetID.TEMPOROSS_GROUP_ID, WidgetID.TemporossStatus.STATUS_INDICATOR),
//OpenOSRS
WORLD_MAP_BUTTON_BORDER(WidgetID.MINIMAP_GROUP_ID, WidgetID.Minimap.WORLDMAP_ORB),