Owain van Brakel
dfaf72eb35
Merge remote-tracking branch 'runelite/master' into ready-set-action
...
Conflicts:
.gitignore
cache-client/pom.xml
cache-updater/pom.xml
cache/pom.xml
cache/src/main/java/net/runelite/cache/definitions/loaders/ParamLoader.java
deobfuscator/src/main/java/net/runelite/deob/clientver/ClientVersion.java
http-api/pom.xml
http-service/pom.xml
http-service/src/test/java/net/runelite/http/service/hiscore/HiscoreServiceTest.java
pom.xml
protocol-api/pom.xml
protocol/pom.xml
runelite-api/pom.xml
runelite-api/src/main/java/net/runelite/api/Client.java
runelite-client/pom.xml
runelite-client/src/main/java/net/runelite/client/RuneLite.java
runelite-client/src/main/java/net/runelite/client/RuneLiteProperties.java
runelite-client/src/main/java/net/runelite/client/config/RuneLiteConfig.java
runelite-client/src/main/java/net/runelite/client/plugins/PluginManager.java
runelite-client/src/main/java/net/runelite/client/plugins/camera/CameraConfig.java
runelite-client/src/main/java/net/runelite/client/plugins/camera/CameraPlugin.java
runelite-client/src/main/java/net/runelite/client/plugins/cannon/CannonConfig.java
runelite-client/src/main/java/net/runelite/client/plugins/cannon/CannonPlugin.java
runelite-client/src/main/java/net/runelite/client/plugins/config/ConfigPanel.java
runelite-client/src/main/java/net/runelite/client/plugins/config/ConfigPlugin.java
runelite-client/src/main/java/net/runelite/client/plugins/config/HotkeyButton.java
runelite-client/src/main/java/net/runelite/client/plugins/config/PluginListItem.java
runelite-client/src/main/java/net/runelite/client/plugins/examine/ExaminePlugin.java
runelite-client/src/main/java/net/runelite/client/plugins/friendnotes/FriendNotesPlugin.java
runelite-client/src/main/java/net/runelite/client/plugins/hiscore/HiscorePanel.java
runelite-client/src/main/java/net/runelite/client/plugins/hiscore/HiscorePlugin.java
runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/KourendLibraryPlugin.java
runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerPlugin.java
runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperConfig.java
runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperPlugin.java
runelite-client/src/main/java/net/runelite/client/plugins/musicindicator/MusicIndicatorPlugin.java
runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsPlugin.java
runelite-client/src/main/java/net/runelite/client/plugins/slayer/Task.java
runelite-client/src/main/java/net/runelite/client/plugins/woodcutting/Tree.java
runelite-client/src/main/java/net/runelite/client/plugins/woodcutting/WoodcuttingPlugin.java
runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldTableHeader.java
runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpTrackerPlugin.java
runelite-client/src/main/java/net/runelite/client/rs/ClientLoader.java
runelite-client/src/main/java/net/runelite/client/rs/CountingInputStream.java
runelite-client/src/main/java/net/runelite/client/ui/FatalErrorDialog.java
runelite-client/src/main/java/net/runelite/client/ui/SplashScreen.java
runelite-client/src/main/java/net/runelite/client/util/CountingInputStream.java
runelite-client/src/main/java/net/runelite/client/util/ImageUtil.java
runelite-client/src/main/java/net/runelite/client/util/SwingUtil.java
runelite-client/src/main/resources/net/runelite/client/runelite.properties
runelite-client/src/main/resources/npc_health.json
runelite-client/src/test/java/net/runelite/client/plugins/hiscore/HiscorePanelTest.java
runelite-client/src/test/java/net/runelite/client/plugins/raids/RaidsPluginTest.java
runelite-script-assembler-plugin/pom.xml
2020-01-09 19:59:46 +01:00
Adam
bf0ff69e07
raids plugin: add option to show loot value
...
Co-authored-by: melkypie <melkypie@users.noreply.github.com >
2020-01-07 17:38:01 -05:00
Adam
3cf777d274
hiscore plugin: add boss hiscores
...
Co-authored-by: Abex <mii7303@gmail.com >
Co-authored-by: Gamma91 <bramvgemert@gmail.com >
2020-01-05 10:10:49 -05:00
Owain van Brakel
b637eeac7c
client: LambdaMetaFactory for subscribe annotation, java target… ( #2128 )
...
client: LambdaMetaFactory for subscribe annotation, java target level 11
2019-12-17 18:02:00 +01:00
Owain van Brakel
5f51eb441a
Merge remote-tracking branch 'runelite/master'
2019-12-17 10:22:29 +01:00
Max Weber
dc2f4b6f59
ImageUtil: Rename methods to luminance, and work with non ARGB images
2019-12-16 13:30:07 -07:00
Lucwousin
0c1c461139
Fix pluginmanagertest for async subbing (and some enhancements which don't really belong in this pr but shhh about that)
2019-12-15 21:25:25 +01:00
h3half
4578333fe0
slayer plugin: fix detecting Konar's first assignment
2019-12-09 18:15:08 -05:00
Owain van Brakel
b334aa159f
Merge remote-tracking branch 'runelite/master'
2019-12-05 13:09:03 +01:00
Owain van Brakel
594d141d9b
Merge remote-tracking branch 'runelite/master'
2019-11-28 21:31:34 +01:00
Owain van Brakel
7b67298a01
Merge remote-tracking branch 'MagicfTail/Fake-lvl-up' into fake-level-up
2019-11-28 03:43:01 +01:00
dekvall
1b3fe266bc
prayer-reorder: remove test
...
The plugin has been removed.
2019-11-27 21:23:57 +01:00
Adam
b273e9f464
client: use mock webserver for client config loader test
2019-11-25 09:47:05 -05:00
Owain van Brakel
2362cccfdf
project: 🧹 🧹
2019-11-24 13:02:51 +01:00
Adam
0b90fcde22
client: refactor for nameable api changes
2019-11-22 09:25:23 -05:00
Kyleeld
9cd3a15759
Merge branch 'pr/1' into IKOD_TROUVER
2019-11-22 13:08:10 +00:00
Adam
0e920bdd98
raids plugin: fix matching rotation whitelist
...
Spaces were not being removed from the config values causing the
whitelist contains check to fail.
Additionally, change the format of the raids whitelist to be newline
separated CSV which is not interpreted by GSON as valid JSON, fixing the
config service from serializing the whitelist rotation which is adding
erroneous quotes around the room names.
This also refactors the rotation whitelist display to be a simple yes/no
instead of this unused match count logic.
Co-authored-by: Alexsuperfly <alexcsumner@gmail.com >
2019-11-20 19:38:23 -05:00
Ganom
78491df24c
Merge branch 'master' into an-not-taters
2019-11-20 16:20:25 -05:00
Owain van Brakel
0f9d3c7718
Merge remote-tracking branch 'runelite/master'
2019-11-18 01:47:30 +01:00
Ganom
03a88f6c27
Merge pull request #2038 from Owain94/1411-merge
...
project: Merge upstream
2019-11-17 01:18:33 -05:00
Adam
7052977448
rotation solver: fix to use modulus instead of remainder operator
2019-11-16 12:46:42 -05:00
Lucwousin
4fa3a73eb9
Readd @Subscribe, for unconditionally active subscriptions in plugins
2019-11-16 11:17:20 +01:00
Lucwousin
b7bd7c5a08
{} where allowed
2019-11-16 04:51:03 +01:00
Lucwousin
55b0845a18
Optimize imports
2019-11-16 04:51:03 +01:00
Tomas Slusny
f7d441fc1d
Merge pull request #10255 from dekvall/attack-style-change-test
...
attack styles: add test for swap between bludgeon and bow
2019-11-15 10:32:30 +01:00
Owain van Brakel
07fa478e67
Merge remote-tracking branch 'runelite/master'
2019-11-15 10:09:35 +01:00
Owain van Brakel
1d9a3e2f2e
client: revert raid changes for now
2019-11-14 16:12:16 +01:00
dekvall
51e951e4dc
attack styles: add test for swap between bludgeon and bow
...
When swapping between bludgeon and bow, onWidgetHiddenChanged is called before
the weapon varbit is set. Since that varbit determines which widgets should be
hidden we would like to make sure the widget is set to hidden even after a
varbit change.
2019-11-14 09:54:00 +01:00
15987632
e3edc16f86
raids plugin: fix rotation solver
2019-11-11 08:22:41 -05:00
Owain van Brakel
7ec5373457
Merge remote-tracking branch 'upstream/master' into gradle6
2019-11-10 18:16:18 +01:00
JZomerlei
560a738845
woodcutting plugin: add arctic pine logs
2019-11-10 11:11:07 -05:00
Owain van Brakel
18021f6bed
gradle: Refactor and update to gradle 6
2019-11-10 01:42:11 +01:00
Owain van Brakel
883a499b5e
Merge remote-tracking branch 'runelite/master'
2019-11-09 07:51:02 +01:00
Adam
6d34e2b2f3
Merge pull request #10155 from Adam-/layout
...
Add layout chat command
2019-11-08 11:32:18 -05:00
Adam
7e57e15f47
Move ConfigChanged event to client events
2019-11-08 10:08:07 -05:00
Owain van Brakel
46c7f53112
client: Fix tests
2019-11-08 05:36:30 +01:00
Owain van Brakel
e880d094ad
Merge remote-tracking branch 'runelite/master'
2019-11-06 00:05:55 +01:00
Adam
eea61cdc8e
client: update for new skill change event
2019-11-04 13:15:06 -05:00
Owain van Brakel
e031512fb0
Merge remote-tracking branch 'runelite/master' into 0311-merge
2019-11-03 20:34:04 +01:00
Adam
ec0858548f
container calculation: fix overflow computing ge price
2019-11-01 10:14:44 -04:00
Adam
19b27d11fc
raids plugin: refactor RaidRoom
2019-10-28 20:04:54 -04:00
Adam
6a3264e68b
client: remove Cerberus plugin
...
Removed at Jagex's request
2019-10-24 14:12:36 -04:00
Owain van Brakel
2c469f2213
Merge branch 'master' into 2310-merge
2019-10-24 13:30:09 +02:00
Ganom
83f31b87b7
itemskeptondeath: add true risk handling. ( #1807 )
...
* itemskeptondeath: add true risk handling.
* itemmanager: ensure itemManager is grabbing true break value.
* itemskeptondeath: update test.
* itemskeptondeath: fix test this time.
* itemskeptondeath: i hate tests.
* itemskeptondeath: kms.
* itemreclaimcost: refactor.
2019-10-23 21:24:39 -04:00
Alex
fcbd26bbc9
menu entry swapper: add shift click teleport spell swap
...
Co-authored-by: Adam <Adam@sigterm.info >
2019-10-23 13:19:55 -04:00
Owain van Brakel
90b7775965
Merge remote-tracking branch 'runelite/master'
2019-10-23 18:33:58 +02:00
Owain van Brakel
945391073b
Merge remote-tracking branch 'runelite/master'
2019-10-23 18:21:03 +02:00
Adam
37e025ed79
client: update mockito
...
Remove various unused stubbing detected by the newer Mockito version
Update references to deprecated Matchers and MockitoJUnitRunner classes
2019-10-23 10:52:14 -04:00
SebastiaanVanspauwen
45c8da0adb
timers plugin: update full teleblock text
2019-10-18 20:57:59 -04:00
Owain van Brakel
cece8aa527
banktags: Fix tests
2019-10-17 19:39:12 +02:00
