Owain van Brakel
0677ccdda4
Merge remote-tracking branch 'runelite/master' into master
2020-10-29 17:28:59 +01:00
Jordan
d70003448c
Merge pull request #11765 from Plondrein/motherlode-broken-wheel
...
motherlode: Add overlay for broken water wheel struts
2020-10-24 19:45:31 -07:00
Plondrein
1c21d0671e
motherlode: Add overlay for broken water wheel struts
...
* Rename MotherlodeRocksOverlay to MotherlodeSceneOverlay
* When strut is broken, red border with hammer icon will show around it.
2020-10-24 19:35:40 -07:00
paymon123
03566d6702
ConfigManager: Fix NPE when resetting configs with null default
2020-10-24 22:52:44 +02:00
Matthew C
5a863f358f
discord: Fix action timeout, add in game time elapsed option ( #12471 )
...
Co-authored-by: Matthew C <66925241+Matthew-nop@users.noreply.github.com >
Co-authored-by: Tomas Slusny <slusnucky@gmail.com >
Co-authored-by: Jordan Atwood <jordan.atwood423@gmail.com >
2020-10-24 02:56:35 +02:00
Owain van Brakel
1cf50d54b1
project: Merge upstream
2020-10-21 12:57:38 +02:00
SirGirion
274df60d3c
timetracking: add compost bin time trackers ( #12619 )
2020-10-19 19:46:14 -06:00
Abex
736e649e24
Merge pull request #12621 from Nightfirecat/kourend-library-varlemore-envoy-fix
...
kourendlibrary: Don't reset state when not finding Varlamore Envoy
2020-10-18 16:30:01 -06:00
Adam
a2d693fc74
chat commands: unregister bh and lms commands
2020-10-16 13:06:34 -04:00
Jordan
67ecfc3cfa
Merge pull request #12130 from Cyborger1/contract-overlay-fix-12124
...
Check diseased and dead states on the Farming Contract Indicator
2020-10-12 13:07:17 -07:00
Cyborger1
6d78e6884d
farming: Fix contract status for plots with diseased/dead crops
...
This commit fixes the farming contract manager's behavior when
encountering crops which have become diseased. Previously, it would not
take this into account and incorrectly report the crop as IN_PROGRESS or
READY.
2020-10-08 19:52:02 -07:00
Jordan Atwood
d0589c80b9
kourendlibrary: Don't reset state when not finding Varlamore Envoy
...
The Varlamore Envoy is a quest item which, while having a known location
in the library once a rotation is determined, cannot be found under
certain circumstances. (when the Depths of Despair quest has not been
started, has been collected while completing the quest, and after the
quest is completed) Previously searching a bookcase which could contain
this book and not finding it would cause a state reset. This commit
keeps those null finds from resetting the known library state.
2020-10-08 14:09:06 -07:00
Jack Hodkinson
1ce0474336
Sort plugin search results with closer test matches higher ( #12432 )
2020-10-05 02:18:16 -06:00
Jordan Atwood
d9876976d6
util: Remove unused and unneeded methods
...
ImageUtil had previously provided a number of image fill and outline
methods which accepted Predicates to control the fill and outline
behavior, but they are not used anywhere in the client or by external
plugins. This commit removes these methods and the
is(Not)?FullyTransparent ColorUtil methods which existed solely as
Predicate defaults for them.
2020-10-03 12:06:52 -04:00
Adam
1799c9e593
loottracker: submit loot when not logged in
...
This is to aid the wiki drop log project. The data is not otherwise
stored.
2020-10-01 18:31:39 -04:00
Adam
475e463692
Merge pull request #12472 from Nightfirecat/fix-experience-tests-location
...
Move Experience tests to proper test class
2020-09-30 17:18:19 -04:00
Adam
c774117d93
loot tracker: fix tracking grubby chest
...
Co-authored-by: Jonathan Lee <cookmeplox@weirdgloop.org >
2020-09-28 20:16:33 -04:00
SirGirion
f01dce648a
loot tracker: add bird houses
2020-09-27 12:36:10 -04:00
Adam
908c6b4fe4
infobox: add support for multiple infobox groups
...
Co-authored-by: Ron Young <admin@ryoung.io >
2020-09-27 10:20:14 -04:00
Adam
9c362fb836
containable frame: assume jdk 12/13/14 do not have fix for JDK-8231564
...
These versions are EOL, and although greater than 11, do not include JDK-8231564
2020-09-24 18:44:54 -04:00
Jordan
6895ed54da
Merge pull request #12430 from usa-usa-usa-usa/feature/update-tzhaar-timer
2020-09-20 21:53:35 -07:00
Adam
62a69b94c5
containableframe: fix parsing Oracle Java 8 version string
2020-09-20 16:46:08 -04:00
jcwhisman
2c2c013cba
timers: Fix inferno timer starting time
2020-09-14 08:07:04 -05:00
jcwhisman
43c5e1f916
ElapsedTimer: Display time in mm:ss format
2020-09-09 17:38:03 -07:00
Adam
01447e52a7
timers: consolidate teleblock timers
2020-09-09 11:08:17 -04:00
Jordan Atwood
a0acbb0f7b
Move Experience tests to proper test class
2020-09-08 17:27:52 -07:00
ThatGamerBlue
06006bf7ae
Merge remote-tracking branch 'runelite/master'
2020-09-08 18:50:27 +01:00
Adam
2021b4c1ff
grounditems: add test for notify on highlight
2020-08-31 13:19:06 -04:00
Jordan Atwood
d1a765091a
screenshot: Fix BA high gamble toggle
...
Because both level up dialogs and BA high gambles use the same widget
interface, commit 40f032bede
2020-08-30 13:14:06 -04:00
Max Weber
431e09588b
specify utf8 encoding
...
this should fix the following known bugs:
- putting a U+2019 in the config causes it to become corrupted and
~double in size every launch
- scripts become assembled incorrectly and the nbsp after your name in
the chatbox becomes incorrect
- the feed panel doesn't show emoji
2020-08-28 21:58:08 -04:00
Adam
c9859f36b6
hiscore panel: fix lookup to run on edt
...
It modifies various fields in the ui and should be running on edt.
Additionally add a clear listener to reset the search state when the
input is cleared.
This requires changing the hiscore client to be async so that the
response can be properly applied on the edt
2020-08-23 11:54:36 -04:00
Adam
a89202e230
party service: prioritize user join handler over plugins
...
The Discord invites requires the party size to be >0 for invites to work.
Previously this was not updating the presence with the 1 (local) member
after joining due to the plugin event handler running prior to the
service adding the member to the party.
This also changes the party id to always be null when not in a party instead of
set to the special local party id. This simplifies the checks in the
plugins trying to differentiate being in your own party vs not being in
a party.
2020-08-23 11:43:08 -04:00
Adam
be1e1bbdbb
timers plugin: add fight cave and inferno timers
...
Co-authored-by: winterdaze <35933468+winterdaze-rs@users.noreply.github.com >
Co-authored-by: Jordan Atwood <jordan.atwood423@gmail.com >
2020-08-21 20:28:28 -04:00
Jordan Atwood
c9ef18b55e
menuentryswapper: Prefer last-destination on Zanaris fairy ring
2020-08-21 16:10:47 -04:00
Landy Chan
1a88b8e214
prayer plugin: fix time remaining text when greater than 1 hour
2020-08-19 16:40:26 -04:00
Adam
276746eea6
mining plugin: add session stats
...
Co-authored-by: jzomerlei <jzomerlei@gmail.com >
2020-08-15 00:30:37 -04:00
Adam
7c19a6c73b
slayer plugin: support new Turael task completion message
2020-08-12 11:04:37 -04:00
melkypie
c2026f5516
chatcommands: make cox pb account for 11-15 and 16-23 team sizes
2020-08-10 18:30:20 -04:00
leejt
18087ca9cc
loot tracker: add metadata field to loot record
...
This is for tracking miscellaneous data with the loot records, such as
npc id and skill levels, for the wiki drop log project.
Co-authored-by: Adam <Adam@sigterm.info >
2020-08-07 18:50:18 -04:00
Jordan Atwood
b16b3a8017
slayer: Fix slaughter bracelet proc text
...
After the 2020-08-06 game update[1] the Bracelet of slaughter gives a
slightly different text than before. This commit updates the slayer
plugin to identify that new text.
[1]: https://secure.runescape.com/m=news/pvp-changes?oldschool=1
2020-08-07 12:35:51 -04:00
LA
40f032bede
screenshot: Capture Barbarian Assault high gamble screenshots ( #12071 )
2020-07-30 05:39:22 +00:00
Jussi Kauppinen
6034d4646d
cooking: Add support for drying sinew ( #12184 )
2020-07-24 08:05:02 +00:00
Cyborger1
4362adb876
itemstats: check for two handed interactions ( #12168 )
2020-07-21 02:13:11 -06: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
melkypie
ffafa3a91a
loot tracker: add ability to have end of raid tob chest loot value in a chatmessage
2020-07-14 18:47:48 -04:00
melkypie
1ee41dba5a
loot tracker: move cox loot value message from raids to loot tracker
...
Reverts commit bf0ff69e07
2020-07-14 18:47:48 -04:00
Max Weber
4308d433a2
npchighlight: Don't iterate npcs off the client thread
2020-07-14 17:05:12 -04:00
Jordan
8464d9b604
Merge pull request #11972 from Nightfirecat/slayer-plugin-use-higher-of-task-lengths-for-start
...
slayer: Update initial amount if current amount is higher
2020-07-09 12:46:18 -07:00
Jordan
f91fd11621
Merge pull request #12048 from zeffirojoe/key-remapping-authent
2020-07-06 22:19:52 -07:00
Jordan Atwood
349efebd58
keyremapping: Remove vestigial LOGIN_SCREEN guard clause
...
Key remaps have been blocked at the KeyManager level as of commit
01bdbe5aab
2020-07-06 22:12:13 -07:00
