Commit Graph

8597 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
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
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
Hydrox6
10744a0edc clues: add Lava battlestaff (or) to the Trollheim emote clue 2020-01-03 23:24:52 +00: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
Ganom
cfa501dea5 mes: standardize entry.getOption, as it contains tags. (#2184) 2020-01-03 13:24:38 +00:00
Lucwousin
d7efe2304a Merge pull request #2179 from dutta64/feature/plugin-itemcharges
Plugin: Add Kharedst's Memoirs to ItemChargePlugin
2020-01-03 00:07:45 +01:00
Dutta64
1149bd8b2c Plugin: Add Kharedst's Memoirs to ItemChargePlugin 2020-01-02 15:14:00 -07:00
Lucwousin
d1b4e2e23f Merge pull request #2060 from Lucwousin/hd-minimaps
Client: add hd minimaps
2020-01-02 19:39:51 +01:00
Dennis
e75968ce9f runelite-client: add hd minimap toggle to minimap plugin 2020-01-02 19:19:51 +01:00
dutta64
f93ed474b3 Re-write lizardmanshaman plugin (#2175) 2020-01-02 10:26:27 +00:00
Dozer
4b7597019b SuppliesTracker: Prayer, farming, and bug fixes (#2167)
* Farming, prayer, bug fixes

* Fix jewellery tooltip

* rename Skills to skills
2020-01-02 10:26:01 +00:00
Dozer
78a92baaa1 GauntletPlugin: Resource fix (#2168)
* Fix double resource counter and resource counter starting at 1

* Checkstyle cause ya boi a brainlet

* Moved onstatschanged to switch

* brainlet move added breaks
2020-01-02 10:25:43 +00:00
Lucwousin
9515f6d220 Don't set stop to false 2019-12-31 22:29:40 +01:00
Lucwousin
214f642e95 Refactor chat input listeners to just use the eventbus 2019-12-31 22:22:13 +01:00
Adam
618050ad07 clientloader: throw an exception when unable to peek first entry 2019-12-30 15:44:02 -05:00
Adam
61a72d5a54 menu swapper: add shift click abort ge offer
Co-authored-by: Adelaidian <Adelaidian@users.noreply.github.com>
2019-12-29 14:38:04 -05:00
Adam
9ae897667f Merge pull request #10506 from Hydrox6/library-swing
kourendlibrary: fix panel reloading not being done on the swing thread
2019-12-29 14:35:02 -05:00
Alexsuperfly
9f86c9f128 woodcutting: create maple timer for miscellania region 2019-12-29 14:16:33 -05:00
Adam
9508934074 Merge pull request #10499 from dekvall/unpause-xp-tracker
xp tracker: don't unpause on failed login
2019-12-29 14:02:40 -05:00
dekvall
5ad94eae2e chatcommands: support keybinds in pms 2019-12-29 14:01:46 -05:00
Adam
2586da3a70 Merge pull request #10496 from Hydrox6/library-complete-reset
kourendlibrary: only reset if layout changes when complete
2019-12-29 13:20:16 -05:00
Adam
a969a17fcf Merge pull request #10492 from Hydrox6/clanchat-fix-icons-recolour
chat message manager: make sender recoloring use messageNode
2019-12-29 13:18:52 -05:00
Adam
3df0b2a799 Merge pull request #10480 from Alexsuperfly/raids-unknown-rooms
raids:  allow "unknown" to evaluate to both unknown room types
2019-12-29 13:11:54 -05:00
Adam
7a810a94ce Merge pull request #10489 from Hydrox6/library-npc
kourendlibrary: clear tracked NPCs when changing worlds
2019-12-29 13:09:54 -05:00
Adam
39d87a553d cannon plugin: make ammo notification threshold configurable
Co-authored-by: Lucas Childers <LucasChilders@users.noreply.github.com>
Co-authored-by: redrumyliad <jzomerlei@gmail.com>
2019-12-29 13:06:01 -05:00
Adam
627749423d Merge pull request #10468 from Hydrox6/interface-styles-2005-minimap
interfacestyles: fix 2005 fixed mode minimap's right side
2019-12-29 11:16:29 -05:00
Adam
0f57b400b3 Merge pull request #10460 from emerald000/add_guard_hp
Add HP for level 19 and 22 Guards.
2019-12-29 11:15:29 -05:00
Rami-J
9cc321e143 menu swapper: add support for ge offer withdraw
Co-authored-by: Adam <Adam@sigterm.info>
2019-12-29 11:10:08 -05:00
Adam
0e5eb27be6 Merge pull request #10453 from Alexsuperfly/woodcutting-timers2
woodcutting: fix inaccurate despawn events
2019-12-29 11:09:38 -05:00
Kyle
9955cef11b groundmarkers: fix 10, 11 & 12 not displaying (#2173)
groundmarkers: fix 10, 11 & 12 not displaying
2019-12-29 01:53:56 +00:00