Commit Graph

492 Commits

Author SHA1 Message Date
Kyle
d3b0402795 Merge branch 'master' into party-time 2020-01-11 23:18:00 +00:00
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
Runelite auto updater
8eefd98482 Bump for 1.6.2-SNAPSHOT 2020-01-09 12:13:59 +00:00
Runelite auto updater
3ac681ea08 Release 1.6.1 2020-01-09 12:13:50 +00:00
TheRealNull
87ecf13e8a discord: party support 2020-01-06 17:18:17 -05:00
Hydrox6
90ce907ade hiscore api: add Callisto and Cerberus 2020-01-06 13:52:43 +00: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
Gamma91
062d1b99b9 hiscore skill: fix spelling of commander zilyana 2020-01-05 10:10:49 -05:00
Runelite auto updater
d678e67ab3 Bump for 1.6.1-SNAPSHOT 2019-12-19 21:51:07 +00:00
Runelite auto updater
4882b4e7a1 Release 1.6.0 2019-12-19 21:50:57 +00:00
Adam
85288c0261 Bump to 1.6.0-SNAPSHOT 2019-12-19 08:40:40 -05:00
Owain van Brakel
5f51eb441a Merge remote-tracking branch 'runelite/master' 2019-12-17 10:22:29 +01:00
Runelite auto updater
510aa63d57 Bump for 1.5.44-SNAPSHOT 2019-12-16 17:31:17 +00:00
Runelite auto updater
aa4a631a36 Release 1.5.43 2019-12-16 17:31:12 +00:00
Adam
e789c72333 hiscore result builder: fix building hiscore result with no boss hiscores
THe seasonal hiscore endpoint doesn't include boss hiscores
2019-12-11 12:21:13 -05:00
Adam
9ae4e772a4 http-api: update for boss hiscores
This leaves Callisto and Cerberus commented out as they are currently
not being returned by the hiscores
2019-12-08 20:43:48 -05:00
Owain van Brakel
594d141d9b Merge remote-tracking branch 'runelite/master' 2019-11-28 21:31:34 +01:00
Runelite auto updater
f6cbfeb8ce Bump for 1.5.43-SNAPSHOT 2019-11-28 13:01:43 +00:00
Runelite auto updater
56465edd1f Release 1.5.42 2019-11-28 13:01:37 +00:00
Adam
6f5a719cfb world client: always return non null or throw an error 2019-11-25 09:47:05 -05:00
Owain van Brakel
0f9d3c7718 Merge remote-tracking branch 'runelite/master' 2019-11-18 01:47:30 +01:00
Runelite auto updater
581d27b608 Bump for 1.5.42-SNAPSHOT 2019-11-17 02:09:15 +00:00
Runelite auto updater
bfe5873b39 Release 1.5.41 2019-11-17 02:09:08 +00: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
Adam
7463d2de1a api: add league world type
Co-authored-by: Hydrox6 <ikada@protonmail.ch>
2019-11-15 10:29:15 -05:00
Adam
fab50b1725 http api: update hiscore for leagues
Co-authored-by: Hydrox6 <ikada@protonmail.ch>
2019-11-15 10:29:12 -05:00
Adam
bcf89dce92 Remove DEADMAN_TOURNAMENT world type
Co-authored-by: Hydrox6 <ikada@protonmail.ch>
2019-11-15 10:29:09 -05:00
Adam
71d2e74732 Remove SEASONAL_DEADMAN world type
Co-authored-by: Hydrox6 <ikada@protonmail.ch>
2019-11-15 10:28:59 -05:00
Runelite auto updater
11e83ac02b Bump for 1.5.41-SNAPSHOT 2019-11-14 11:35:38 +00:00
Runelite auto updater
1d3752cfe8 Release 1.5.40 2019-11-14 11:35:31 +00:00
Owain van Brakel
7ec5373457 Merge remote-tracking branch 'upstream/master' into gradle6 2019-11-10 18:16:18 +01: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
Owain van Brakel
7866cc612b client: make error logging opt out 2019-11-08 04:58:09 +01:00
Runelite auto updater
16aba589fd Bump for 1.5.40-SNAPSHOT 2019-11-07 15:05:22 +00:00
Runelite auto updater
0fdb3ee80d Release 1.5.39 2019-11-07 15:05:15 +00:00
Runelite auto updater
ddd95dc7a4 Bump for 1.5.39-SNAPSHOT 2019-10-31 12:07:59 +00:00
Runelite auto updater
1b487fc64b Release 1.5.38 2019-10-31 12:07:52 +00:00
Runelite auto updater
ca58d24c7f Bump for 1.5.38-SNAPSHOT 2019-10-30 16:45:29 +00:00
Runelite auto updater
55346c7d2b Release 1.5.37 2019-10-30 16:45:22 +00:00
Owain van Brakel
d9bdab87fe Merge remote-tracking branch 'runelite/master' into 2310-merge 2019-10-30 04:30:39 +01:00
Adam
f3a52b1113 Add layout chat command 2019-10-28 20:10:35 -04:00
Adam
a2166f1215 http-api: centralize json mediatype 2019-10-28 18:05:35 -04:00
Owain van Brakel
b859cec91a gradle: kts dsl (#1845)
* gradle: kts dsl

* deob: Fix tests

* gradle: Convert fernflower plugin to kotlin
2019-10-27 14:35:25 -04:00
Lucwousin
bdf947775e Clean up playerscouter disc (aim at specific uses, instead of general) (#1806) 2019-10-17 17:54:11 -04:00
Runelite auto updater
38e3cd1ed3 [maven-release-plugin] prepare for next development iteration 2019-10-17 13:40:59 +00:00
Runelite auto updater
a924773edc [maven-release-plugin] prepare release runelite-parent-1.5.36 2019-10-17 13:40:53 +00:00
Lucwousin
1282880a2c Clean up most resources, Completable > Observable 2019-10-15 23:43:57 +02:00