Commit Graph

6280 Commits

Author SHA1 Message Date
PKLite
1e80b0ef14 Merge branch 'master' into loot-tracker-reset 2019-07-03 11:30:28 -04:00
PKLite
4390617d0e test
Signed-off-by: PKLite <stonewall@pklite.xyz>
2019-07-03 04:20:22 -04:00
Zeruth
1754ade711 Revert "Merge branch 'master' into master"
This reverts commit 16561db1d6, reversing
changes made to c2710ada6b.
2019-07-02 21:09:07 -04:00
Tyler Bochard
16561db1d6 Merge branch 'master' into master 2019-07-02 21:08:27 -04:00
Zeruth
c2710ada6b fixes cluescroll plugin 2019-07-02 19:22:20 -04:00
Tyler Bochard
236ccaf33f Merge pull request #864 from runelite/master
bringup to upstream
2019-07-02 18:59:16 -04:00
Tyler Bochard
2da2a0d6e6 Merge pull request #857 from Kyleeld/MES-fixes
menuentryswapper: various fixes
2019-07-02 18:58:16 -04:00
Tyler Bochard
b135a65939 Merge pull request #733 from gazivodag/lootingbag_viewer_update
lootingbagviewer: add gp amount overlay to looting bag in inventory.
2019-07-02 18:55:47 -04:00
Tyler Bochard
3aacea79ac Merge pull request #860 from Kyleeld/nmz-fix-4-sammich
NMZ total points added as config option
2019-07-02 18:53:20 -04:00
Tyler Bochard
ea20ce5521 Merge pull request #862 from icyredstar/patch-1
Fix Barrows overlay colors
2019-07-02 18:52:51 -04:00
Tyler Bochard
5090480382 Merge pull request #861 from Kyleeld/corp-overlay
Corp Overlay update
2019-07-02 18:52:33 -04:00
Tyler Bochard
f1fa898687 Merge branch 'master' into bringup-rl 2019-07-02 18:41:47 -04:00
Zeruth
a24cab01e2 makes translator work in clan chat as well. 2019-07-02 18:39:36 -04:00
Zeruth
e111b3aeae Revert "bringup to current runelite-master"
This reverts commit 74da8a883f.
2019-07-02 18:39:36 -04:00
icyredstar
8a2bad0728 Update BarrowsBrotherSlainOverlay.java
Accurately apply red color to X (brothers not killed yet) and green color to ✓ (brother has been killed)
2019-07-02 16:33:15 -04:00
Adam
6d51862668 Merge pull request #9236 from Nightfirecat/fix-npc-respawn-timer-bug
npc indicators: Fix long respawn timer bug
2019-07-02 13:54:22 -04:00
Adam
8df4e0ef43 Merge pull request #8845 from Hydrox6/hd-prayer-bar
prayer: Add HD Prayer Bar
2019-07-02 13:11:18 -04:00
Damen
7fe69bd86b worldmap: fix shield of arrav start points 2019-07-02 12:45:28 -04:00
Daniel Serpa
692609480f ge plugin: add grand exchange total value
Co-authored-by: Adam <Adam@sigterm.info>
2019-07-02 11:10:40 -04:00
Kyleeld
728a40ae50 update corp overlay
update corp overlay to follow new table building practice
2019-07-02 13:48:03 +01:00
Kyleeld
d37a1767b2 checkstyle fix
checkstyle fix
2019-07-02 13:34:35 +01:00
Kyleeld
9e8445cd1c Update NightmareZoneOverlay.java 2019-07-02 13:28:15 +01:00
Kyleeld
923ddb190d Update NightmareZoneConfig.java 2019-07-02 13:26:26 +01:00
Tomas Slusny
23197077a6 Merge pull request #9123 from Twiglet1022/mlm-same-level-timers
mining plugin: only show timers on same level in motherlode mine
2019-07-02 13:21:12 +02:00
Kyleeld
10dc1a9a0b resolved points overlay not showing
resolves points overlay not showing

confirmed working with @Justin
2019-07-02 11:55:10 +01:00
Kyleeld
af43a8c460 Merge branch 'pr/3' into bringup-rl 2019-07-02 10:36:03 +01:00
Kyleeld
d5766e82d4 fixes
fixes 853, part of 805.

added in the correct swaps && mising target.equals evaluation points.
2019-07-02 09:37:25 +01:00
Tyler Bochard
a11e25709c Merge pull request #842 from f0rmatme/grid
inventorygrid: add color configuration
2019-07-02 03:09:48 -04:00
Tyler Bochard
daaa88abc4 Merge pull request #823 from se7enAte9/menufixpt9000
menumanager: more menu fixes
2019-07-02 03:09:05 -04:00
Tyler Bochard
f136cf41e3 Merge pull request #851 from f0rmatme/fonts
runelite: font update
2019-07-02 03:06:46 -04:00
PKLite
805cb27566 Merge branch 'master' into loot-tracker-reset 2019-07-02 02:00:39 -04:00
Tyler Bochard
58dd86e54c Merge pull request #856 from IanWONeill/translator
Translator
2019-07-02 01:20:22 -04:00
Zeruth
eb73a35102 reverts draft merge 2019-07-02 01:19:21 -04:00
Ian William O'Neill
b21d447aac Added 'Translate' menu option to right-click menu on players and chatbox,
This will add player names to a list of player who should be translated to the set language.
Thanks to Ganom and Oak.
2019-07-02 05:26:29 +01:00
se7enAte9
36b6af04e4 barbarianassault: fix horn hidden entry hiding non ba items (#852)
* barbarianassault: fix horn hidden entry hiding non ba items

* barbarianassault: include light log fix
2019-07-01 21:07:51 -04:00
James Munson
6e0eee982a Fix for test failing 2019-07-01 17:13:06 -07:00
Adam
166e547f67 timers plugin: fix teleblock timers
Co-authored-by: jordibenck <jordi.b-98@hotmail.com>
2019-07-01 19:41:39 -04:00
James Munson
06224bd42e TODO : SUPPORT CUSTOM FONT ON UI? 2019-07-01 16:26:22 -07:00
James Munson
3b96dcf8a5 buildLinkPanel no longer static 2019-07-01 15:50:29 -07:00
James Munson
81ee1f9fba Added transparent text support
Added border color
2019-07-01 15:46:43 -07:00
James Munson
e72af39f27 Font Change 2019-07-01 15:29:48 -07:00
sdburns1998
89e3b8e49b Merge pull request #849 from runelite-extended/refactor
refactor: npcomp to npcdef to stay consistent with mixin naming.
2019-07-02 00:12:09 +02:00
Zeruth
74da8a883f bringup to current runelite-master 2019-07-01 18:10:13 -04:00
tanlines
60a23c901b Add item charges for baskets and sacks (#9212) 2019-07-01 23:12:17 +02:00
Ganom
9e0dc2bcc9 Change logging for maiden so it actually outputs if not using debug. 2019-07-01 16:46:06 -04:00
Ganom
65f7d0f6b1 Maiden Handler now utilizes npc definition changed for nylos. 2019-07-01 16:33:35 -04:00
Ganom
4cbfc8dda0 Refactor NpcCompositionChanged to NpcDefinitionChanged to stay consistent with mixin naming. 2019-07-01 16:12:00 -04:00
7ate9
fa30bcd48f menumanager: cleanup 2019-07-01 14:35:15 -04:00
7ate9
0a3fcb70b7 Merge branch 'master' of https://github.com/runelite-extended/runelite into basebase 2019-07-01 13:15:40 -04:00
7ate9
77c78aa970 menumanager: utilize beforerender, make use of additional threads 2019-07-01 13:15:04 -04:00