Commit Graph

12306 Commits

Author SHA1 Message Date
OpenOSRS
cd26f72d4a project: Update gradle wrapper 2020-01-09 20:13:56 +00:00
Owain van Brakel
f2c1fd99bc Update gradle.yml 2020-01-09 21:10:50 +01:00
Owain van Brakel
e53cfe60bf Merge remote-tracking branch 'upstream/master' 2020-01-09 21:06:50 +01:00
Owain van Brakel
c0db3155a0 actions: Fix actions 2020-01-09 21:06:40 +01:00
Owain van Brakel
f2476d7f89 Update Dependencies.kt 2020-01-09 20:36:07 +01:00
Owain van Brakel
b870e62725 Update Dependencies.kt 2020-01-09 20:34:18 +01:00
Owain van Brakel
9c4f81ec34 raids: Implemented !layout command (#2194)
raids: Implemented !layout command

Co-authored-by: Owain van Brakel <owain.vanbrakel@gmail.com>
2020-01-09 20:32:43 +01:00
Im2be
de33328653 Merge branch 'master' of https://github.com/Im2be/runelite 2020-01-09 20:25:07 +01:00
Im2be
a4e13d665f raids: Implemented !layout command (fix for real this time) 2020-01-09 20:21:31 +01:00
Owain van Brakel
9b9a883a22 Update Dependencies.kt 2020-01-09 20:20:31 +01:00
Im2be
cabd84e673 raids: Implemented !layout command (fix) 2020-01-09 20:19:58 +01:00
Owain van Brakel
3399795f04 Merge branch 'master' into master 2020-01-09 20:19:33 +01:00
Owain van Brakel
6ff33493ec project: Merge upstream (#2195)
project: Merge upstream

Co-authored-by: Abex <mii7303@gmail.com>
Co-authored-by: null <emerald000@hotmail.com>
Co-authored-by: Adam <Adam@sigterm.info>
Co-authored-by: Hydrox <ikada@protonmail.ch>
Co-authored-by: Rami <rami2162@hotmail.com>
Co-authored-by: Zachary Waller <zacharydwaller@gmail.com>
Co-authored-by: Runelite auto updater <runelite@runelite.net>
Co-authored-by: TheStonedTurtle <mgoodwin559@gmail.com>
Co-authored-by: RuneLite Cache-Code Autoupdater <mii7303+rlccau@gmail.com>
Co-authored-by: null <shshadri@ncsu.edu>
Co-authored-by: Jason O'Neill <CreativeTechGuy@users.noreply.github.com>
Co-authored-by: Caleb Waters <cw@mekanation.com>
Co-authored-by: null <alexcsumner@gmail.com>
Co-authored-by: null <dkvldev@gmail.com>
Co-authored-by: Trevor <trevorguidry6@gmail.com>
Co-authored-by: Gamma91 <bramvgemert@gmail.com>
Co-authored-by: null <samedelsten1@gmail.com>
2020-01-09 20:13:44 +01: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
Im2be
20d8a25467 raids: Implemented !layout command 2020-01-09 19:39:06 +01:00
Im2be
595ec442c8 raids: Implemented !layout command 2020-01-09 19:14:41 +01:00
Adam
faacbc4160 feed controller: catch any exception when fetching newes sources 2020-01-09 10:32:50 -05: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
Max Weber
fa5c6eee35 Merge branch 'cache-code-2020-01-09-rev182' 2020-01-09 04:41:26 -07:00
Abex
818018e858 Merge pull request #10568 from abextm/banktags-new-at-end
banktags: move new tagtab button to the bottom of the list
2020-01-09 04:41:05 -07:00
RuneLite Cache-Code Autoupdater
a3d1c9b348 Update Widget IDs to 2020-01-09-rev182
Lost widget 387.16
Lost widget 387.7
Lost widget 387.8
Lost widget 387.9
Lost widget 387.10
Lost widget 387.11
Lost widget 387.12
Lost widget 387.13
Lost widget 387.14
Lost widget 387.15
Lost widget 12.10
2020-01-09 04:40:59 -07:00
Abex
732db3940f Merge pull request #10571 from Hydrox6/remove-music-indicator
Remove Music Indicator plugin
2020-01-09 04:34:18 -07:00
RuneLite Cache-Code Autoupdater
75815a2188 Update NPC IDs to 2020-01-09-rev182 2020-01-09 11:33:01 +00:00
RuneLite Cache-Code Autoupdater
d1f588b762 Update Object IDs to 2020-01-09-rev182 2020-01-09 11:33:00 +00:00
Hydrox6
dc7d1dfb26 Revert "client: Add Music Track Indicator plugin"
This reverts commit f6e5ef1f3d
2020-01-09 11:13:13 +00:00
ST0NEWALL
4dbae7459f Merge pull request #2177 from Lucwousin/chat-eventbus
client: Refactor chat input listeners to just use the eventbus
2020-01-08 19:25:43 -05:00
ST0NEWALL
6875dcb73f Merge pull request #2192 from tomcylke/thin-tile-indicator
npchighlight: thin tile overlay
2020-01-08 19:23:42 -05:00
Max Weber
358703f307 banktags: move new tagtab button to the bottom of the list
To make way for the equipment button
2020-01-08 11:42:24 -07:00
Kyle
4c26ddc0c1 Update NpcSceneOverlay.java 2020-01-08 16:07:26 +00:00
Adam
ea61466a90 Merge pull request #10557 from Hydrox6/hiscores-callisto-cerb
hiscore api: add Callisto and Cerberus
2020-01-07 18:35:33 -05: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
Thomas Cylke
ad7e673c52 Thin tile outline for NPC indicators 2020-01-07 11:01:41 -05:00
Hydrox6
90ce907ade hiscore api: add Callisto and Cerberus 2020-01-06 13:52:43 +00:00
Adam
dba07c2475 Merge pull request #10542 from bytemunch/add-foods
Cooking calculator: add missing foods
2020-01-05 14:03:28 -05:00
Sam Edelsten
456f5dc216 add vscode files to gitignore 2020-01-05 17:31:14 +00:00
Sam Edelsten
af4fd1f6fe add foods to skill calculator
add missing foods to skill_cooking.json
2020-01-05 17:30:48 +00:00
Adam
f0bc773b26 Merge pull request #10547 from Hydrox6/clues-lava-battlestaff
clues: add Lava battlestaff (or) to the Trollheim emote clue
2020-01-05 11:15:26 -05:00
Danila Poyarkov
d980fed215 Change wrong BZip constant (#2190) 2020-01-05 16:15:37 +01: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
Kyle
bc68a9f02f Update BootstrapTask.kt (#2188) 2020-01-04 12:26:20 +00:00
Hydrox6
10744a0edc clues: add Lava battlestaff (or) to the Trollheim emote clue 2020-01-03 23:24:52 +00:00
Adam
5e84e99dfd Merge pull request #10524 from Trevor159/get-var
Add getVar methods for external plugins
2020-01-03 14:48:09 -05:00
Adam
da0f507ffb camera plugin: add Look South/East/West option to compass 2020-01-03 11:02:23 -05:00
Adam
49a7c18ad6 camera plugin: reposition startUp/shutdown members 2020-01-03 11:01:34 -05:00
Adam
c549114734 cache: add param config 2020-01-03 09:26:08 -05:00
Kyle
0531135f5f Update BootstrapTask.kt (#2185)
bootstrap fix.

injection annotation now uses the GH raw jar instead of trying to go via the maven repo.
2020-01-03 13:26:03 +00:00
Ganom
cfa501dea5 mes: standardize entry.getOption, as it contains tags. (#2184) 2020-01-03 13:24:38 +00:00
Lucwousin
f39c368bc6 increment injector version 2020-01-03 04:57:52 +01:00