Commit b988b960 authored by Marwolf's avatar Marwolf 💬

Merge branch '2.0.0' into 'runecrafting'

# Conflicts:
#   Android/Open RSC Android Client/src/main/java/com/openrsc/android/render/InputImpl.java
parents 51319a29 ce8f5813
......@@ -44,7 +44,7 @@ public class Config {
public static final String DL_URL = "androidcheck.openrsc.com"; // needs to be set as public for the Android client to use
public static final String ANDROID_DOWNLOAD_PATH = "https://" + DL_URL + "/downloads/";
public static final String CACHE_URL = "https://" + DL_URL + "/downloads/cache/";
public static final int ANDROID_CLIENT_VERSION = 43; // Important! Depends on web server android_version.txt to check for an updated version
public static final int ANDROID_CLIENT_VERSION = 44; // Important! Depends on web server android_version.txt to check for an updated version
public static boolean F_SHOWING_KEYBOARD = false;
public static boolean C_HOLD_AND_CHOOSE = true;
public static int C_LONG_PRESS_TIMER = 5; // default hold timer setting
......
File mode changed from 100644 to 100755
......@@ -44,7 +44,7 @@ public class Config {
public static final String DL_URL = "game.openrsc.com"; // needs to be set as public for the Android client to use
public static final String ANDROID_DOWNLOAD_PATH = "https://" + DL_URL + "/downloads/";
public static final String CACHE_URL = "https://" + DL_URL + "/downloads/cache/";
public static final int ANDROID_CLIENT_VERSION = 43; // Important! Depends on web server android_version.txt to check for an updated version
public static final int ANDROID_CLIENT_VERSION = 44; // Important! Depends on web server android_version.txt to check for an updated version
public static boolean F_SHOWING_KEYBOARD = false;
public static boolean C_HOLD_AND_CHOOSE = true;
public static int C_LONG_PRESS_TIMER = 5; // default hold timer setting
......
......@@ -377,10 +377,10 @@ public class ORSCApplet extends Applet implements MouseListener, MouseMotionList
mudclient.runScroll(e.getWheelRotation());
// Disables zoom while visible
if (mudclient.auctionHouse.isVisible() || mudclient.onlineList.isVisible() || mudclient.skillGuideInterface.isVisible()
|| mudclient.questGuideInterface.isVisible() || mudclient.clan.getClanInterface().isVisible() || mudclient.experienceConfigInterface.isVisible()
|| mudclient.ironmanInterface.isVisible() || mudclient.achievementInterface.isVisible() || mudclient.doSkillInterface.isVisible()
|| mudclient.lostOnDeathInterface.isVisible() || mudclient.territorySignupInterface.isVisible() || mudclient.messageTabSelected != MessageTab.ALL)
if (Config.S_SPAWN_AUCTION_NPCS && mudclient.auctionHouse.isVisible() || mudclient.onlineList.isVisible() || Config.S_WANT_SKILL_MENUS && mudclient.skillGuideInterface.isVisible()
|| Config.S_WANT_QUEST_MENUS && mudclient.questGuideInterface.isVisible() || mudclient.clan.getClanInterface().isVisible() || mudclient.experienceConfigInterface.isVisible()
|| mudclient.ironmanInterface.isVisible() || mudclient.achievementInterface.isVisible() || Config.S_WANT_SKILL_MENUS && mudclient.doSkillInterface.isVisible()
|| Config.S_ITEMS_ON_DEATH_MENU && mudclient.lostOnDeathInterface.isVisible() || mudclient.territorySignupInterface.isVisible() || mudclient.messageTabSelected != MessageTab.ALL)
return;
if (mudclient.showUiTab == 0 && (S_ZOOM_VIEW_TOGGLE || mudclient.getLocalPlayer().isStaff())) {
......
File mode changed from 100644 to 100755
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment