Commit Graph

9693 Commits

Author SHA1 Message Date
Tomas Slusny
5763ef4c33 Merge pull request #9152 from Hydrox6/farming-guild-fishing-spot
fishing: add missing spots near farming guild
2019-06-22 12:50:10 +02:00
Tomas Slusny
d96f273db3 Merge pull request #9182 from Nightfirecat/fix-emote-clues-with-null-stash-units
EmoteClue: Add null checks for stashUnit
2019-06-22 12:49:30 +02:00
James Munson
1552b8d9fc Moved pile stuff in player indicators to the pileindicators 2019-06-22 01:47:19 -07:00
zeruth
c655c9f542 Revert "Merge branch 'master' into master"
This reverts commit 43520c1958, reversing
changes made to 2e7aea3c62.
2019-06-22 02:38:35 -04:00
Tyler Bochard
98bc364490 Merge pull request #4 from runelite-extended/master
bringup
2019-06-22 02:36:26 -04:00
Tyler Bochard
43520c1958 Merge branch 'master' into master 2019-06-22 02:35:58 -04:00
zeruth
2e7aea3c62 live update 2019-06-22 02:02:02 -04:00
Tyler Bochard
2d0c2b8eb6 Merge pull request #695 from runelite/master
bringup
2019-06-22 00:50:16 -04:00
Tyler Bochard
e74ef8dbef Merge pull request #693 from runelite-extended/inferno-and-fightcaves-fix
Inferno and fightcaves fix
2019-06-22 00:47:34 -04:00
Kyleeld
70335b5a95 sigh, yet another fix
sigh, yet another fix
2019-06-22 05:24:46 +01:00
Kyleeld
53b36a6397 Update InfernoWaveOverlay.java 2019-06-22 05:18:37 +01:00
Kyleeld
2f6f3d8157 NPE fix + wave info
NPE fix + wave info
2019-06-22 05:16:12 +01:00
Kyleeld
a58898f46e Update InfernoWaveOverlay.java 2019-06-22 04:46:12 +01:00
Kyleeld
fce9847c15 nibbler overlay fix
nibbler overlay fix
2019-06-22 04:40:29 +01:00
Ganom
e689fc0b7a Add Seperate handler for Toxic Lists (#694)
This was causing an issue where toxic players were being labeled as scammers.
2019-06-22 04:32:42 +01:00
Kyleeld
bf72c1775b Update InfernoConfig.java
sigh c != C
2019-06-22 04:31:10 +01:00
pklite
b33852f28a Makes the player count overlay only show up in PvP areas (#691)
* Makes the player counter overlay only show up in wilderness, pvp worlds,
or clan wars

Signed-off-by: PKLite <stonewall@pklite.xyz>

* Include deadman mode worlds

Signed-off-by: PKLite <stonewall@pklite.xyz>
2019-06-22 04:24:00 +01:00
Kyleeld
76928a1455 Update InfernoConfig.java
changing from wildcard import to named import
2019-06-22 04:22:39 +01:00
Kyleeld
83567adef7 information
wave overlay fix for fightcaves

overhaul of inferno plugin to allow customization of wave info box + reworked mappings of caves.
2019-06-22 04:20:15 +01:00
Tyler Bochard
d0a43f0a98 Merge pull request #688 from Lucwousin/injected_art
Make injected-client a maven dependency
2019-06-21 22:16:26 -04:00
Lucwousin
7a537b2359 Merge pull request #690 from Ganom/mixinfix
Entity Hider Mixin NPE Fixin
2019-06-22 03:26:13 +02:00
Ganom
0550600132 Fix #689 NPE from entity hider mixin. 2019-06-21 21:20:04 -04:00
Lucas
3977f9ca61 Make injected-client maven dependency 2019-06-22 02:46:39 +02:00
ScapeRune
15d6be2919 worldmap: Fix MEP2 and Shadows of the Storm quest tooltips (#9166) 2019-06-22 02:41:02 +02:00
Daniel
f31739b7e2 Add snakeskin gear to skill calculator (#9172) 2019-06-22 02:40:10 +02:00
Jordan Atwood
392c934393 EmoteClue: Add null checks for stashUnit
Some clues may have item requirements, but no STASH unit, which would
cause NPEs during rendering. This commit also marks stashUnit as
nullable so this issue can hopefully be avoided in the future.
2019-06-21 17:24:20 -07:00
Ganom
d16ef229eb Update Scouter to include background options, and fix record raid bug. 2019-06-21 19:19:06 -04:00
Tyler Bochard
a27cf7d415 Merge pull request #685 from Ganom/entityhiderfix
Fix 'Selected Npc' Entity-Hider
2019-06-21 18:13:52 -04:00
Ganom
2dc8e181d7 Fix 'Selected Npc' Entity-Hider 2019-06-21 18:11:45 -04:00
Tyler Bochard
230aa84bfa Merge pull request #684 from Ganom/vanguardfix
Fix-up Vanguards in Cox Helper
2019-06-21 18:08:35 -04:00
Ganom
619d4907e6 Fix-up Vanguards in Cox Helper 2019-06-21 17:54:35 -04:00
Ganom
311f924dd2 Merge pull request #1 from runelite-extended/master
Merge
2019-06-21 17:51:23 -04:00
Lucwousin
85d030e631 Fix inventory setups (#683) 2019-06-21 19:38:36 +01:00
Tyler Bochard
a83a58f402 Merge pull request #682 from runelite-extended/runelite-master
Upstream Bringup
2019-06-21 13:04:29 -04:00
Lucas
24228f86fe Fix healthbar stuff, remove double constant 2019-06-21 18:55:58 +02:00
PKLite
b951ce3ef7 WIP: part 2 of loot tracker updates started.
Adds reset button to clear all local data.

Signed-off-by: PKLite <stonewall@pklite.xyz>
2019-06-21 05:28:37 -04:00
zeruth
8020f758e1 bringup 2019-06-21 03:32:48 -04:00
zeruth
1f5ac7a86a Merge branch 'master' of https://github.com/runelite/runelite into runelite-master 2019-06-21 03:32:14 -04:00
James
711e6c1a82 Bug fixes for inventory setup (#673)
* Fix for inventory setup

*  Fix bug where toggling plugin would fail to load setups from config

*  Fix bug where toggling plugin would fail to load setups from config

* Revert
2019-06-21 02:08:30 +01:00
Ganom
f5a40623f0 Add back in regular GameObjects for Dev Tools (#677) 2019-06-20 17:39:40 -07:00
Ganom
c07504af5f Merge pull request #676 from Lucwousin/bpbpbppbp
Add gameobject id's to dev tools via dynamicobjects
2019-06-20 20:10:47 -04:00
Lucas
2a4fbef7ee Add gameobject id's to dev tools via dynamicobjects 2019-06-21 02:03:34 +02:00
Lucwousin
33653966a0 Merge pull request #675 from Lucwousin/asdfghjklzxcvbnmqwertyuiop
Fix various injector/mixin issues
2019-06-20 23:27:19 +02:00
Lucas
1fa656ce2d Stop nosuchmethoderrors being thrown by dumb vanilla to api stuff 2019-06-20 23:19:02 +02:00
Ganom
072bea6583 Merge pull request #674 from xperiaclash/fix-cox-burn
remove burn after cox raid is done
2019-06-20 16:27:34 -04:00
xperiaclash
3adafeb578 remove burn after cox raid is done 2019-06-20 22:19:41 +02:00
Lucas
1a54fc4711 Fix npc/gameobject combo's not being clickable with gpu enabled 2019-06-20 22:00:36 +02:00
Ganom
d2841b1216 Merge pull request #672 from Lucwousin/alalallalalallala
Bump up version numbers
2019-06-20 14:14:54 -04:00
Lucwousin
3ec45958b8 Merge pull request #671 from xperiaclash/master
keyboard bank pin for NMZ
2019-06-20 19:14:57 +02:00
Lucas
9cc32a6307 Bump up version numbers 2019-06-20 19:05:13 +02:00