Commit Graph

342 Commits

Author SHA1 Message Date
kyle-escobar
bb9a55b39f Update: Upstream runelite/runelite 2020-04-07 21:33:29 -04:00
kyle-escobar
8a00bd3ece Merge branch 'master' of https://github.com/runelite/runelite into upstream-4-7-2020
 Conflicts:
	http-api/src/main/java/net/runelite/http/api/item/ItemClient.java
	http-service/src/main/java/net/runelite/http/service/item/ItemController.java
	http-service/src/main/java/net/runelite/http/service/item/ItemEntry.java
	http-service/src/main/java/net/runelite/http/service/item/ItemService.java
	http-service/src/main/java/net/runelite/http/service/item/RSItem.java
	http-service/src/main/java/net/runelite/http/service/item/RSItemResponse.java
	runelite-api/src/main/java/net/runelite/api/ScriptID.java
	runelite-api/src/main/java/net/runelite/api/Varbits.java
	runelite-api/src/main/java/net/runelite/api/widgets/WidgetInfo.java
	runelite-client/src/main/java/net/runelite/client/callback/Hooks.java
	runelite-client/src/main/java/net/runelite/client/plugins/antidrag/AntiDragConfig.java
	runelite-client/src/main/java/net/runelite/client/plugins/antidrag/AntiDragPlugin.java
	runelite-client/src/main/java/net/runelite/client/plugins/camera/CameraPlugin.java
	runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/hotcold/HotColdLocation.java
	runelite-client/src/main/java/net/runelite/client/plugins/config/PluginHubPanel.java
	runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/BookPanel.java
	runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/KourendLibraryConfig.java
	runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/KourendLibraryPanel.java
	runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/KourendLibraryPlugin.java
	runelite-client/src/main/java/net/runelite/client/plugins/music/MusicPlugin.java
	runelite-client/src/main/java/net/runelite/client/plugins/party/PartyPlugin.java
	runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldHopperPlugin.java
2020-04-07 21:16:50 -04:00
Adam
670e62b6b9 item service: remove old item searching and item lookup methods
We haven't used this code in awhile. Additionally modify the price
crawler to re-fetch known items in the event the name or examine
changes.
2020-04-07 16:09:30 -04:00
Max Weber
6a0fd2a0d0 http-api: remove unused fields from NPCInfo
These fields are never used. If we need this information we can get it
from the client's cache
2020-04-04 05:21:19 -06:00
Owain van Brakel
f79d5ede89 party: Revert botches and fix party support 2020-03-29 16:27:28 +02:00
xKylee
118beeb92e Merge branch 'pr/1' into upstream-gpack 2020-03-25 22:19:33 +00:00
Adam
c930a5d261 http-api: add world region to World
Add a WorldRegion to convert from location id to region

Co-authored-by: melkypie <melkypie@users.noreply.github.com>
2020-03-24 11:54:54 -04:00
Owain van Brakel
cb0995f037 project: Update to RxJava 3 2020-03-11 11:20:21 +01:00
Kyle
17a2213fec api: who even thought this was a good idea???? (#2396)
* Update RuneLiteAPI.java

* Update ChatClient.java

* Update RuneLiteAPI.java

* Update ChatClient.java
2020-03-01 23:18:20 +00:00
Owain van Brakel
4ddfe9fae7 project: Merge upstream 2020-02-26 07:22:56 +01:00
Adam
5a46abddc5 Use GE limits from item stats 2020-02-24 15:02:47 -05:00
Owain van Brakel
d64d9b848d Merge remote-tracking branch 'runelite/master' 2020-02-15 02:32:15 +01:00
dekvall
976ecd8f6b hiscores: add nightmare boss 2020-02-13 07:13:12 +01:00
Owain van Brakel
491a7e76c4 Merge remote-tracking branch 'runelite/master' 2020-02-11 20:01:42 +01:00
Adam
4d5857214e loot tracker: add pickpocket events
Co-authored-by: Daniel Cimento <daniel.cimento@mail.mcgill.ca>
2020-02-10 18:27:01 -05:00
Jason
5b0f6fe89d Force WorldClient Http Rquests to ignore local OkHttp cache 2020-02-03 12:10:29 -05:00
Owain van Brakel
6d4e1ddf85 Merge remote-tracking branch 'runelite/master' 2020-01-23 12:57:53 +01:00
Adam
f6640844b5 Use wiki scraped npcs for npc healths 2020-01-22 09:18:29 -05:00
TheRealNull
d8a4196c76 plugins: add sounds service plugin 2020-01-20 23:48:48 -05:00
TheRealNull
620282baed plugins: add animations plugin / api 2020-01-19 04:18:10 -05:00
Adam
97b4f0d56f loot tracker: store aggregated drops
This modifies both the service and the client plugin to no longer store
loot per-kill, with the exception of the current sessions kill log. The
amount of loot data returned now from the service defaults to the last
1024 unique events
2020-01-18 21:56:56 -05:00
TheRealNull
cd43ef62fe project: Add xtea base, Fix session base 2020-01-17 01:20:58 -05:00
TheRealNull
9192f1ef7e http-api: update session URL to use our domain 2020-01-13 13:49:14 -05:00
TheRealNull
f4d136bd88 session: use temp session base 2020-01-12 22:19:23 -05:00
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
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
Owain van Brakel
5f51eb441a Merge remote-tracking branch 'runelite/master' 2019-12-17 10:22:29 +01: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
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
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
Owain van Brakel
883a499b5e Merge remote-tracking branch 'runelite/master' 2019-11-09 07:51:02 +01: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
Lucwousin
1282880a2c Clean up most resources, Completable > Observable 2019-10-15 23:43:57 +02:00
Lucwousin
3b9a5df8b1 increase http api item price parsing by a slightly really negligible amt 2019-10-15 11:58:30 +02:00