Commit Graph

9169 Commits

Author SHA1 Message Date
Zeruth
f4b024804e Merge remote-tracking branch 'upstream/master' into runelite-master-1
# Conflicts:
#	runelite-api/src/main/java/net/runelite/api/Varbits.java
#	runelite-client/src/test/java/net/runelite/client/plugins/cluescrolls/clues/hotcold/HotColdTemperatureTest.java
2019-07-05 00:59:14 -04:00
Runelite auto updater
d7a1e51041 [maven-release-plugin] prepare for next development iteration 2019-07-04 13:01:18 +00:00
Runelite auto updater
4fd0fcab0f [maven-release-plugin] prepare release runelite-parent-1.5.28 2019-07-04 13:01:12 +00:00
sdburns1998
4045d18b14 Merge pull request #873 from sdburns1998/test-ganom
DynamicObjectAnimationChanged
2019-07-04 04:56:20 +02:00
Owain van Brakel
be301d14fa DynamicObjectAnimationChanged 2019-07-04 04:48:57 +02:00
se7enAte9
2d3af49624 pluginsorter: fix runelite plugin incorrect position when unhidi… (#872) 2019-07-03 19:00:16 -07:00
JavaBlah
6193c08aad cursors plugin: add dragon dagger (p) cursor 2019-07-03 18:34:26 -04:00
kristo naeris
9d927c3d6f world hopper: add option to disable Hop-to menu option 2019-07-03 18:25:29 -04:00
Abex
d004dc0548 Merge pull request #9272 from abextm/framedumpertest-index-confusion
cache/FrameDumperTest: Don't get the wrong framemaps for a frame
2019-07-03 13:04:38 -06:00
Ian William O'Neill
9e7d124d49 Quick fix for people not being able to send/receive Translated messages. (#868)
Thanks to 7ate9.
2019-07-03 14:53:44 -04:00
sdburns1998
781a1cc2a4 Merge pull request #867 from runelite-extended/runepouch-font-fix
incorporate font manager into rune pouch
2019-07-03 20:23:33 +02:00
Kyleeld
d8d75eac1b Update RunepouchOverlay.java
stupid insert key
2019-07-03 15:47:23 +01:00
Max Weber
911893b710 cache/FrameDumperTest: Don't get the wrong framemaps for a frame 2019-07-03 08:45:24 -06:00
Kyleeld
3889ebefa1 bring inline with font manager
bring inline with font manager

currently ignores font manager
2019-07-03 15:13:03 +01:00
Kusha Gharahi
80f0000f89 wintertodt plugin: add round start notification
Co-authored-by: Adam <Adam@sigterm.info>
2019-07-02 22:34:32 -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
Adam
ff5d0432c8 Merge pull request #9256 from Nightfirecat/hot-cold-fixes
Hot cold fixes
2019-07-02 20:48:32 -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
a86ef48f16 Merge pull request #855 from f0rmatme/timeout
runeliteapi: add timeout to rlp api call.
2019-07-02 18:54:35 -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
b68f39fe1d Merge pull request #858 from Kyleeld/bringup-rl
upstream: bringup merge
2019-07-02 18:47:54 -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
Tyler Bochard
269db34f11 Update README.md 2019-07-02 14:41:47 -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
sdburns1998
249d444178 Merge pull request #859 from Kyleeld/NMZ-overlay-fix
NMZ points overlay not showing fix
2019-07-02 14:17:10 +02: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
James Munson
6518102e31 Update 2019-07-02 03:06:02 -07:00
James Munson
09419c2f81 Updated okhttp3 from 3.7.0 okhttp3 4.0.0
Updated timeout stuff
2019-07-02 03:01:15 -07:00
Kyleeld
4fd1e47032 Update WorldHoppingMixin.java 2019-07-02 10:48:48 +01:00
Kyleeld
af43a8c460 Merge branch 'pr/3' into bringup-rl 2019-07-02 10:36:03 +01:00
James Munson
cfe7fe6be8 Merge remote-tracking branch 'MEEEEEEEEEEEEEEEEEEEEEEEEEE/timeout' into timeout
# Conflicts:
#	http-api/src/main/java/net/runelite/http/api/RuneLiteAPI.java
2019-07-02 01:47:40 -07:00
James Munson
4a77249440 Update 2019-07-02 01:46:35 -07: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