Commit Graph

8882 Commits

Author SHA1 Message Date
Ganom
3388614767 Fix Travis (#714)
* Fix Travis

* Fix Travis

* Fix Travis

* Fix Travis
2019-06-23 21:01:25 +01:00
Ganom
a3a4d18951 Merge pull request #712 from gazivodag/pileindicators_fix
fixes #696 and adds the intended functionality
2019-06-23 15:46:38 -04:00
gazivodag
7b6e47897b fixes #696 and adds the intended functionality
some slight cleanup as well
2019-06-23 07:57:00 -04:00
zeruth
2869c0db55 Update XteaPlugin.java 2019-06-23 06:20:58 -04:00
zeruth
3c02f5b9c8 Use our own http-service / http-api
Also starts scraping xtea keys :)
2019-06-23 05:51:52 -04:00
Tyler Bochard
f8ba2de7a1 Merge pull request #696 from f0rmatme/updatee
Moved pile stuff in player indicators to the pileindicators
2019-06-23 00:53:34 -04:00
Tyler Bochard
841155777c Merge pull request #701 from runelite-extended/ninja
add ninja impling
2019-06-23 00:52:54 -04:00
Tyler Bochard
cf7973b5eb Merge pull request #703 from Lucwousin/aaooaoaoaoaoaoaoooaoaoooa
Fix tests and make travis run them again
2019-06-22 18:46:49 -04:00
Lucas
8c190cb491 Fix tests and make travis run them again 2019-06-23 00:38:22 +02:00
James Munson
9d07e360f5 How did i miss this 2019-06-22 14:58:57 -07:00
James Munson
42654621f0 How did i miss this 2019-06-22 14:58:31 -07:00
James Munson
fc3547bb73 Checkstyle 2019-06-22 14:51:06 -07:00
Lucwousin
14e6ff1806 Cleanup inferno plugin (functionality should be the same) (#700)
* Cleanup inferno plugin (functionality should be the same)

* Cleanup inferno plugin (functionality should be the same)
2019-06-22 22:28:29 +01:00
Kyleeld
c18a30bc0c Update MenuEntrySwapperPlugin.java 2019-06-22 20:37:58 +01:00
Kyleeld
63015add38 add ninja impling
add ninja impling menu entry swapper
2019-06-22 19:01:11 +01:00
Kyleeld
1caaae14a8 wave fix (#698)
wave fix

nextWaveNumber = ((currentWaveNumber < 63) ? (currentWaveNumber + 1) : -1);

changed to

nextWaveNumber = ((currentWaveNumber < 69) ? (currentWaveNumber + 1) : -1);
2019-06-22 06:14:44 -06: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
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
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
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