Commit Graph

14592 Commits

Author SHA1 Message Date
Alowan
97a356a596 SpriteID: Fix UNKNOWN_STANCE_ICON_2 ID (#12202) 2020-07-22 03:37:59 +00:00
ThatGamerBlue
cc28d4d2f2 api: more imports and tile stuff 2020-07-22 03:23:52 +01:00
Jordan
35a539be4d Merge pull request #6819 from trimbe/remove-tag-tab-separator 2020-07-21 16:31:34 -07:00
trimbe
d8df5920ba banktags: Add tag tab drag blocking 2020-07-21 16:11:30 -07:00
Cyborger1
4362adb876 itemstats: check for two handed interactions (#12168) 2020-07-21 02:13:11 -06:00
trimbe
e8d4ff38cb banktags: Remove tab separators from tag tabs 2020-07-20 23:43:45 -07:00
Snowflak3
05c4a5c1d5 notifier: make flash color configurable
Co-authored-by: Snowflak3 <mitchellgn@yahoo.com>
2020-07-20 19:00:01 -04:00
Kyle
dee591a415 WeaponMap: add missing weapons
WeaponMap: add missing weapons
2020-07-20 21:56:34 +01:00
ThatGamerBlue
15180d895c Merge pull request #2749 from ThatGamerBlue/rsc-refactor
rs-client: refactoring and imports
2020-07-19 18:00:19 +01:00
ThatGamerBlue
2c8ca731e6 rs-client: refactoring and imports 2020-07-19 17:46:33 +01:00
Lucwousin
57b7476299 Collapse @Copy, @Replace mixin methods 2020-07-19 03:31:16 +02:00
Lucwousin
fa2944d50a Use new injector ver 2020-07-19 03:31:16 +02:00
Lucwousin
86f6886d8c Finishing touches to annotations 2020-07-19 03:29:45 +02:00
Lucwousin
663bbc80db Annotations: signature -> descriptor; use linkedhashmap 2020-07-19 03:29:45 +02:00
Lucwousin
42affee0f0 Use more descriptive names in Block (+lombok) 2020-07-19 03:29:45 +02:00
Lucwousin
29105c9501 asm: Use a more sensible approach for annotations 2020-07-19 03:29:45 +02:00
Lucwousin
eb1d6bbd74 Make jars saved by JarUtil reproducible 2020-07-19 03:29:45 +02:00
Lucwousin
b75695475d Deob control flow housekeeping 2020-07-19 03:29:44 +02:00
Jordan
f79f1c2390 Merge pull request #12156 from Nightfirecat/uncharged-glory-clue-requirement
EmoteClue: Specify uncharged glory amulet when needed
2020-07-18 15:57:48 -07:00
ThatGamerBlue
4e3c887e87 xpdrop: fix recoloring xp drops with hide skill icons enabled 2020-07-17 21:34:37 -04:00
Adam
11d244bd06 Revert "xpdrops: fix recoloring xpdrops with hide skill icons on"
This reverts commit abbff79294.
2020-07-17 21:33:46 -04:00
Adam
abbff79294 xpdrops: fix recoloring xpdrops with hide skill icons on
The widget child array is filled with nulls to hide the sprites. It is also
valid for the child array to have null entries in it in general, but that does
not happen otherwise.
2020-07-17 21:17:46 -04:00
Owain van Brakel
3fad382843 bootstrap: Fix client not being copied over 2020-07-17 07:51:48 +02:00
Owain van Brakel
c36b5e4f03 externalpluginmanager: Catch all throwables 2020-07-17 07:19:44 +02:00
Owain van Brakel
d2a55e2a9d Merge remote-tracking branch 'origin/master' 2020-07-17 07:09:36 +02:00
Owain van Brakel
04196e593d Merge pull request #2746 from ThatGamerBlue/rl-upstream-16072020
project: merge upstream
2020-07-17 06:22:40 +02:00
OpenOSRS
402c4c2eb5 project: Update gradle dependencies 2020-07-17 00:03:51 +00:00
ThatGamerBlue
3ca8b40310 bump version number 2020-07-17 00:50:15 +01:00
ThatGamerBlue
5a3992b5c4 implement api changes 2020-07-17 00:50:08 +01:00
ThatGamerBlue
9fc44d80de Merge remote-tracking branch 'runelite/master' into rl-upstream-16072020
# Conflicts:
#	cache-client/pom.xml
#	cache-updater/pom.xml
#	cache/pom.xml
#	http-api/pom.xml
#	http-service/pom.xml
#	pom.xml
#	runelite-api/pom.xml
#	runelite-client/pom.xml
#	runelite-script-assembler-plugin/pom.xml
2020-07-16 18:38:55 +01:00
ThatGamerBlue
ea056d0604 Merge remote-tracking branch 'runelite/master' into rl-upstream-16072020
# Conflicts:
#	cache/src/main/java/net/runelite/cache/util/XteaKeyManager.java
#	http-api/pom.xml
#	http-api/src/main/java/net/runelite/http/api/account/AccountClient.java
#	http-api/src/main/java/net/runelite/http/api/chat/ChatClient.java
#	http-api/src/main/java/net/runelite/http/api/item/ItemClient.java
#	http-api/src/main/java/net/runelite/http/api/osbuddy/OSBGrandExchangeClient.java
#	http-api/src/main/java/net/runelite/http/api/xtea/XteaClient.java
#	http-service/src/main/java/net/runelite/http/service/hiscore/HiscoreService.java
#	runelite-api/src/main/java/net/runelite/api/Client.java
#	runelite-api/src/main/java/net/runelite/api/EnumID.java
#	runelite-api/src/main/java/net/runelite/api/IndexDataBase.java
#	runelite-api/src/main/java/net/runelite/api/ItemComposition.java
#	runelite-api/src/main/java/net/runelite/api/PlayerComposition.java
#	runelite-api/src/main/java/net/runelite/api/ScriptID.java
#	runelite-api/src/main/java/net/runelite/api/VarbitComposition.java
#	runelite-api/src/main/java/net/runelite/api/events/ActorDeath.java
#	runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java
#	runelite-api/src/main/java/net/runelite/api/widgets/WidgetInfo.java
#	runelite-client/src/main/java/net/runelite/client/ClientSessionManager.java
#	runelite-client/src/main/java/net/runelite/client/RuneLite.java
#	runelite-client/src/main/java/net/runelite/client/RuneLiteModule.java
#	runelite-client/src/main/java/net/runelite/client/RuneLiteProperties.java
#	runelite-client/src/main/java/net/runelite/client/SessionClient.java
#	runelite-client/src/main/java/net/runelite/client/account/SessionManager.java
#	runelite-client/src/main/java/net/runelite/client/config/ConfigManager.java
#	runelite-client/src/main/java/net/runelite/client/externalplugins/ExternalPluginManager.java
#	runelite-client/src/main/java/net/runelite/client/game/ItemManager.java
#	runelite-client/src/main/java/net/runelite/client/game/WorldService.java
#	runelite-client/src/main/java/net/runelite/client/input/KeyListener.java
#	runelite-client/src/main/java/net/runelite/client/plugins/agility/AgilityConfig.java
#	runelite-client/src/main/java/net/runelite/client/plugins/agility/AgilityOverlay.java
#	runelite-client/src/main/java/net/runelite/client/plugins/agility/AgilityPlugin.java
#	runelite-client/src/main/java/net/runelite/client/plugins/agility/Obstacles.java
#	runelite-client/src/main/java/net/runelite/client/plugins/bank/BankPlugin.java
#	runelite-client/src/main/java/net/runelite/client/plugins/banktags/tabs/TabInterface.java
#	runelite-client/src/main/java/net/runelite/client/plugins/chatcommands/ChatCommandsPlugin.java
#	runelite-client/src/main/java/net/runelite/client/plugins/chatfilter/ChatFilterConfig.java
#	runelite-client/src/main/java/net/runelite/client/plugins/chatnotifications/ChatNotificationsConfig.java
#	runelite-client/src/main/java/net/runelite/client/plugins/chatnotifications/ChatNotificationsPlugin.java
#	runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/CrypticClue.java
#	runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/SkillChallengeClue.java
#	runelite-client/src/main/java/net/runelite/client/plugins/config/PluginListItem.java
#	runelite-client/src/main/java/net/runelite/client/plugins/config/PluginListPanel.java
#	runelite-client/src/main/java/net/runelite/client/plugins/devtools/VarInspector.java
#	runelite-client/src/main/java/net/runelite/client/plugins/discord/DiscordGameEventType.java
#	runelite-client/src/main/java/net/runelite/client/plugins/discord/DiscordPlugin.java
#	runelite-client/src/main/java/net/runelite/client/plugins/examine/ExaminePlugin.java
#	runelite-client/src/main/java/net/runelite/client/plugins/experiencedrop/XpDropPlugin.java
#	runelite-client/src/main/java/net/runelite/client/plugins/feed/FeedPanel.java
#	runelite-client/src/main/java/net/runelite/client/plugins/feed/FeedPlugin.java
#	runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangeItemPanel.java
#	runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangeOfferSlot.java
#	runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangePlugin.java
#	runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemsPlugin.java
#	runelite-client/src/main/java/net/runelite/client/plugins/hiscore/HiscorePanel.java
#	runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemChargeConfig.java
#	runelite-client/src/main/java/net/runelite/client/plugins/itemprices/ItemPricesOverlay.java
#	runelite-client/src/main/java/net/runelite/client/plugins/keyremapping/KeyRemappingListener.java
#	runelite-client/src/main/java/net/runelite/client/plugins/loginscreen/LoginScreenPlugin.java
#	runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerConfig.java
#	runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerPlugin.java
#	runelite-client/src/main/java/net/runelite/client/plugins/npchighlight/NpcIndicatorsConfig.java
#	runelite-client/src/main/java/net/runelite/client/plugins/npchighlight/NpcIndicatorsPlugin.java
#	runelite-client/src/main/java/net/runelite/client/plugins/raids/Raid.java
#	runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidRoom.java
#	runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsConfig.java
#	runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsPlugin.java
#	runelite-client/src/main/java/net/runelite/client/plugins/raids/RoomType.java
#	runelite-client/src/main/java/net/runelite/client/plugins/randomevents/RandomEventConfig.java
#	runelite-client/src/main/java/net/runelite/client/plugins/randomevents/RandomEventPlugin.java
#	runelite-client/src/main/java/net/runelite/client/plugins/screenshot/ScreenshotPlugin.java
#	runelite-client/src/main/java/net/runelite/client/plugins/slayer/SlayerPlugin.java
#	runelite-client/src/main/java/net/runelite/client/plugins/timers/TimersPlugin.java
#	runelite-client/src/main/java/net/runelite/client/plugins/wiki/WikiSearchChatboxTextInput.java
#	runelite-client/src/main/java/net/runelite/client/plugins/worldmap/MinigameLocation.java
#	runelite-client/src/main/java/net/runelite/client/plugins/worldmap/MiningSiteLocation.java
#	runelite-client/src/main/java/net/runelite/client/plugins/worldmap/TeleportLocationData.java
#	runelite-client/src/main/java/net/runelite/client/plugins/worldmap/TransportationPointLocation.java
#	runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpTrackerPlugin.java
#	runelite-client/src/main/java/net/runelite/client/plugins/xpupdater/XpUpdaterPlugin.java
#	runelite-client/src/main/java/net/runelite/client/plugins/xtea/XteaPlugin.java
#	runelite-client/src/main/java/net/runelite/client/rs/ClientConfigLoader.java
#	runelite-client/src/main/java/net/runelite/client/rs/ClientLoader.java
#	runelite-client/src/main/resources/net/runelite/client/plugins/skillcalculator/skill_fletching.json
#	runelite-client/src/test/java/net/runelite/client/plugins/PluginManagerTest.java
#	runelite-client/src/test/java/net/runelite/client/plugins/bank/BankPluginTest.java
#	runelite-client/src/test/java/net/runelite/client/plugins/chatcommands/ChatCommandsPluginTest.java
#	runelite-client/src/test/java/net/runelite/client/plugins/examine/ExaminePluginTest.java
#	runelite-client/src/test/java/net/runelite/client/plugins/grandexchange/GrandExchangePluginTest.java
#	runelite-client/src/test/java/net/runelite/client/plugins/hiscore/HiscorePanelTest.java
#	runelite-client/src/test/java/net/runelite/client/plugins/keyremapping/KeyRemappingListenerTest.java
#	runelite-client/src/test/java/net/runelite/client/plugins/loottracker/LootTrackerPluginTest.java
#	runelite-client/src/test/java/net/runelite/client/plugins/npchighlight/NpcIndicatorsPluginTest.java
#	runelite-client/src/test/java/net/runelite/client/plugins/raids/RaidsPluginTest.java
#	runelite-client/src/test/java/net/runelite/client/plugins/slayer/SlayerPluginTest.java
#	runelite-client/src/test/java/net/runelite/client/plugins/xptracker/XpTrackerPluginTest.java
#	runelite-client/src/test/java/net/runelite/client/rs/ClientConfigLoaderTest.java
#	runelite-client/src/test/java/net/runelite/client/ui/overlay/infobox/InfoBoxManagerTest.java
2020-07-16 18:32:30 +01:00
Runelite auto updater
7f354ca5e4 Bump for 1.6.23-SNAPSHOT 2020-07-16 16:24:47 +00:00
Runelite auto updater
bd190d87ba Release 1.6.22 2020-07-16 16:24:36 +00:00
Abex
8702b6d068 Merge pull request #12161 from Broooklyn/ferox-canoe
worldmap: Add Ferox Enclave canoe location
2020-07-16 08:17:49 -06:00
Abex
f4bda3f789 Merge pull request #12162 from Broooklyn/clan-cup
clues: Update text and description for clan cup clue
2020-07-16 08:17:25 -06:00
Broooklyn
72ae9a20ae clues: Update text and description for clan cup clue 2020-07-16 10:04:41 -04:00
Broooklyn
b3fa285d1a worldmap: Add Ferox Enclave canoe location 2020-07-16 09:49:43 -04:00
Abex
899bb5c049 Merge pull request #12160 from Broooklyn/ferox-enclave
Update world map for Ferox Enclave release
2020-07-16 07:34:28 -06:00
Broooklyn
2884f3043e agility: add GWD crack obstacle highlight 2020-07-16 09:30:53 -04:00
Broooklyn
1f4cb2ae2d agility: fix Sara GWD obstacle highlights 2020-07-16 09:30:53 -04:00
Broooklyn
564510417e worldmap: Add Ferox Enclave—Ring of dueling teleport location 2020-07-16 09:07:14 -04:00
Broooklyn
5873b01fc7 worldmap: Add Citharede Abbey and Eagles Outpost mining spots 2020-07-16 09:06:16 -04:00
Broooklyn
41a8d4605e worldmap: Update minigame locations for Ferox Enclave 2020-07-16 09:04:59 -04:00
Jordan Atwood
468d0a7967 EmoteClue: Specify uncharged glory amulet when needed 2020-07-16 00:35:52 -07:00
Kyle
b407e4b567 Update RSItemContainerMixin.java 2020-07-15 21:47:45 +01:00
Cyborger1
69534cc3cf notifier: make flash cancelling more responsive
Currently the cancel check is only performed when the flash is on, and not off, making it perform one last flash when you provide input to the client when the flash is off.
2020-07-15 16:20:27 -04:00
Adam
82a99a2b2b inventoryid: add trade inventories 2020-07-15 14:51:31 -04:00
Jordan
45660a1520 Merge pull request #11903 from Broooklyn/sepulchre-config 2020-07-14 22:18:02 -07:00
Broooklyn
bc417d587d agility: Add Hallowed Sepulchre config section 2020-07-14 21:42:25 -07:00
Broooklyn
8b20626a3b agility: Add config for Sepulchre obstacles and skill obstacles
This commit moves Sepulchre obstacle IDs into a separate set so their
highlighting can be toggled separately. It also adds a toggle to
highlight Sepulchre skill obstacles.
2020-07-14 21:41:58 -07:00