Commit Graph

212 Commits

Author SHA1 Message Date
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
Lucwousin
a433b58fae increase http api item stat parsing by a really really negligible amt 2019-10-15 11:57:27 +02:00
Lucwousin
b711aa328d Clean up httpapi a bit 2019-10-15 09:48:12 +02:00
Lucwousin
f47ccfa177 async account session check 2019-10-15 09:48:11 +02:00
Zeruth
8b4c391960 client: enable session manager 2019-10-13 16:55:26 -04:00
Zeruth
38097619f8 client: update session base URL 2019-10-13 16:38:15 -04:00
ST0NEWALL
027a369084 client: Rebrand (#1688)
client: Rebrand
2019-10-04 22:49:34 -04:00
Owain van Brakel
72ae9ddabd Merge remote-tracking branch 'runelite/master' into 2009-merge 2019-10-03 17:35:19 +02:00
Owain van Brakel
c82d2c8c0f http: Revert API since the API is not live yet 2019-10-03 06:07:09 +02:00
Owain van Brakel
55839f684c client: Rebase further 2019-10-03 06:00:19 +02:00
Adam
f49670cd5b Use caching okhttp client for worldclient 2019-10-02 15:59:53 -04:00
Adam
9c5b36cec7 item manager: use caching okhttp client 2019-10-02 15:59:53 -04:00
Adam
2af98eacfc feed: use caching okhttp client 2019-10-02 15:59:53 -04:00
f0rmatme
00f6cbf39e OPENOSRS branding 2019-09-29 17:29:53 -07:00
Owain van Brakel
748801d562 Merge remote-tracking branch 'runelite/master' into 2308-merge 2019-08-23 02:31:44 +02:00
ThatGamerBlue
a27b355fdd http-api: change useragent, remove unused methods, reordering 2019-08-20 21:05:06 +01:00
Ganom
aa4b505fe2 discordclient: remove build.default, as it was causing NPEs (#1400) 2019-08-20 00:39:44 +01:00
Adam
c8ffa3994d loot tracker: batch loot submissions 2019-08-19 12:15:00 -04:00
Owain van Brakel
7777a5ff72 client: Change Maven string to Gradle 2019-08-11 02:33:28 +02:00
Owain van Brakel
3a92e3b008 http-services(-pro): Add back http-service and move custom http-service 2019-08-09 05:22:26 +02:00
ThatGamerBlue
5bcd704bab http api: fix rlp api using the wrong url (#1233) 2019-08-02 12:46:47 +01:00
ThatGamerBlue
30354c925e http-api: fix api going down after runelite update 2019-08-01 14:56:12 +01:00
Owain van Brakel
9bbf160bab Apply suggestions from code review
upstream: Merge suggested changes
2019-07-29 09:13:57 +02:00
Zeruth
2e2c25843d Merge remote-tracking branch 'Upstream/master'
# Conflicts:
#	http-api/src/main/java/net/runelite/http/api/ws/messages/party/PartyChatMessage.java
#	runelite-api/src/main/java/net/runelite/api/Quest.java
#	runelite-client/src/main/java/net/runelite/client/RuneLite.java
#	runelite-client/src/main/java/net/runelite/client/game/AgilityShortcut.java
#	runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItem.java
#	runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemsConfig.java
#	runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemsOverlay.java
#	runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemsPlugin.java
#	runelite-client/src/main/java/net/runelite/client/plugins/itemprices/ItemPricesOverlay.java
#	runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerPlugin.java
#	runelite-client/src/main/java/net/runelite/client/plugins/questlist/QuestListPlugin.java
#	runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsPlugin.java
#	runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpTrackerPlugin.java
#	runelite-client/src/main/java/net/runelite/client/plugins/zoom/ZoomPlugin.java
#	runelite-client/src/main/java/net/runelite/client/rs/ClientLoader.java
#	runelite-client/src/main/java/net/runelite/client/ws/PartyService.java
#	runelite-client/src/test/java/net/runelite/client/plugins/chatcommands/ChatCommandsPluginTest.java
2019-07-29 01:44:57 -04:00
Tyler Bochard
a3ee9551c5 Merge pull request #1155 from Owain94/eventbus-double-sub
eventbus: event interface & prevent double subscribing
2019-07-28 17:44:46 -04:00
Ganom
c4402febf7 Remove builder.default on embed array. 2019-07-27 20:27:19 -04:00
Owain van Brakel
75ef43cc0e client: Add back item tests (#1160)
* Fix upstream merge

* mixins: Fix checkstyle

* client: Add back item tests

* discord: builder default
2019-07-27 23:45:27 +01:00
Ganom
9ed6f586dd Update and refactor PlayerScouter (#1158) 2019-07-27 17:58:30 -04:00
Owain van Brakel
eaf747ab66 eventbus: Add event interface 2019-07-27 22:30:04 +02:00
Tomas Slusny
00a4c627c5 party: add party chat messages
Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2019-07-27 16:02:45 -04:00
ThatGamerBlue
2ba1c7f80b gradle: add properties and modify injected-client (#1145)
* add implementation for getItemCount

* Ignore build directory in project root

* save injector results as class files

* package injected-client for shading into client

* auto-updating properties

* fix run task

* shade injected-client into jar
2019-07-27 15:02:57 -04:00