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
faacbc4160
feed controller: catch any exception when fetching newes sources
2020-01-09 10:32:50 -05:00
Hydrox6
90ce907ade
hiscore api: add Callisto and Cerberus
2020-01-06 13:52:43 +00: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
c117bc9bd5
chat controller: limit layouts to 16 rooms
2019-11-25 13:07:22 -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
Adam
6d34e2b2f3
Merge pull request #10155 from Adam-/layout
...
Add layout chat command
2019-11-08 11:32:18 -05:00
Owain van Brakel
e031512fb0
Merge remote-tracking branch 'runelite/master' into 0311-merge
2019-11-03 20:34:04 +01:00
Adam
bbe38dae95
osb exchange service: validate price averages
...
After an update they get reset to 0 for a time and it is overwriting our
price cache
2019-10-31 18:27:35 -04:00
Owain van Brakel
2655654c9f
project: merge upstream
2019-10-30 04:22:38 +01:00
Adam
f3a52b1113
Add layout chat command
2019-10-28 20:10:35 -04:00
Adam
423d16fa8e
http-service: make mongo database configurable
2019-10-26 21:58:50 -04:00
Owain van Brakel
945391073b
Merge remote-tracking branch 'runelite/master'
2019-10-23 18:21:03 +02:00
Lotto
541af9084c
feed: use RuneLiteClient's Twitter list
2019-10-20 15:16:26 +02:00
Owain van Brakel
72ae9ddabd
Merge remote-tracking branch 'runelite/master' into 2009-merge
2019-10-03 17:35:19 +02:00
Adam
cade74c18c
feed controller: add etag
2019-10-02 15:59:53 -04:00
Adam
1e58a77683
item controller: add etag to bulk prices
2019-10-02 15:59:53 -04:00
Owain van Brakel
748801d562
Merge remote-tracking branch 'runelite/master' into 2308-merge
2019-08-23 02:31:44 +02:00
Adam
c8ffa3994d
loot tracker: batch loot submissions
2019-08-19 12:15:00 -04:00
Adam
bd0badf7fc
authfilter: cache sessions
2019-08-19 11:56:57 -04:00
Owain van Brakel
bd621269a6
gradle: Update deps, format files ( #1316 )
...
* gradle: Update dependencies
Also made the version numbers global to make updating easier, also this
way we can't have mismatches where different projects use diffrent
versions of a dep
* cache: Fix TitleDumper test
* gradle: Format build files
* httpserviceplus: Remove unneeded deps
2019-08-13 21:02:45 -04:00
Owain van Brakel
83717e76ed
Merge remote-tracking branch 'runelite/master' into 1308-merge
2019-08-13 03:40:32 +02:00
Adam
d77134893a
osbuddy client: set UA to RuneLite
2019-08-12 17:05:40 -04:00
Adam
86f0c5ebd2
osbuddy client: update exchange summary location
2019-08-12 17:05:33 -04:00
Owain van Brakel
08f84b5181
Merge remote-tracking branch 'runelite/master' into 0908-merge
...
Conflicts:
runelite-client/src/main/java/net/runelite/client/plugins/attackstyles/AttackStylesPlugin.java
runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/item/AllRequirementsCollection.java
2019-08-09 19:06:39 +02:00
Adam
c6e24b832d
http-service: remove inferred destroy method on mongo client bean
...
It is important that the client isn't closed when using the jndi
provided client as it is a singleton and is reused.
2019-08-09 10:43:55 -04: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
Adam
277a3ccd35
http-service: use jndi provided mongo
2019-08-08 19:29:51 -04:00
Adam
edfd52af23
config service: validate config values
2019-08-08 17:31:12 -04:00
Adam
4286c680f2
config service: add test for parseJsonString
2019-08-08 17:31:12 -04:00
Adam
730ad1c3c6
config service: return status based on whether set/unset were successful
2019-08-08 17:31:11 -04:00
Owain van Brakel
17b35205fd
project: Fix deprecations and supress unchecked warnings
2019-07-25 20:34:09 +02:00
Owain van Brakel
af4c2ad6ae
gradle: Update all deps
2019-07-25 01:37:17 +02:00
Jordan Atwood
41968c725f
Remove unused Slf4j annotations and imports
2019-07-11 00:33:00 -07:00
Zeruth
e111b3aeae
Revert "bringup to current runelite-master"
...
This reverts commit 74da8a883f
2019-07-02 18:39:36 -04:00
Zeruth
74da8a883f
bringup to current runelite-master
2019-07-01 18:10:13 -04:00
sdburns1998
8d77971c83
Merge remote-tracking branch 'runelite/master' into ihategitandihatethisihatemergingupstream
2019-06-29 01:08:56 +02:00
Kyleeld
c2f405cf8f
Revert "Upstreamyboy"
2019-06-28 23:58:38 +01:00
sdburns1998
63664fbac7
chat commands: add ba high gamble command
2019-06-29 00:28:22 +02:00
Tyler Bochard
bebb8d8264
Update AnimationEndpoint.java
...
Test
2019-06-27 21:39:46 -04:00
Robert Alexander
8ee3e483f4
chat commands: add duel arena chat command
2019-06-27 21:38:55 -04:00
zeruth
219a25f3c3
Small DB fix
2019-06-27 18:01:32 -04:00
