Commit Graph

13375 Commits

Author SHA1 Message Date
Kyle
a32e52f73a Merge pull request #2455 from xKylee/upstream2
upstream: i actually hate git desktop
2020-03-23 20:40:44 +00:00
Kyle
8ac2637c83 ffs 2020-03-23 20:23:52 +00:00
xKylee
987bec4b36 upstream: merge
upstream: merge
2020-03-23 20:11:17 +00:00
Kyle
0a3ebca541 Merge pull request #2453 from open-osrs/revert-2451-upupandaway
Revert "upstream: merge"
2020-03-23 17:38:49 +00:00
Kyle
ab93ecba36 Revert "upstream: merge" 2020-03-23 17:32:54 +00:00
Kyle
da8b03a927 Merge pull request #2448 from Fred4106/feature-identifyIdValues
WidgetID: Add Arceus reanimate spells + several others
2020-03-23 15:13:57 +00:00
TheStonedTurtle
32e435e42d Revert "opponentinfo: add opponent's opponent for npcs"
This reverts commit 34f94e973c.
2020-03-23 10:09:23 -04:00
Kyle
f338e0b8f6 Merge pull request #2451 from xKylee/upupandaway
upstream: merge
2020-03-23 13:46:35 +00:00
Kyle
6a7da81f0f Update Client.java 2020-03-23 13:05:48 +00:00
xKylee
a51724244f oops 2020-03-23 12:39:40 +00:00
xKylee
82806d1df3 Merge branch 'pr/4' into upupandaway 2020-03-23 11:30:56 +00:00
Adam
046c20fb5b client: block extra mouse keys
The key remapping plugin has no way to operate being on and also not
blocking chat input, due to the other features of the plugin all doing
key remaps and thus are required to know whether or not you are trying
to type, or using a remapped key.

This moves the blocking to the core, which we think won't affect many
users anyway, and those that it does can just remap their mouse keys.
2020-03-22 17:59:41 -04:00
Adam
5da84178e7 chatcommands: fix showing -1 experience/rank in lvl 2020-03-22 14:24:52 -04:00
Adam
0ee189cf9d keyremapping: add test for typing mode change 2020-03-22 12:15:20 -04:00
Adam
203ecce4db keyremapping: add option to block extra mouse buttons 2020-03-22 12:15:20 -04:00
Fred4106
4bffec4f93 Found a bunch of ID's over the last few weeks and figured I should merge them upstream. 2020-03-22 10:11:22 -05:00
github-actions[bot]
af21e43dff Merge pull request #2446 from open-osrs/NPC-UPDATE-d2288fc07
Client: Update NPC stats
2020-03-22 00:23:15 +00:00
OpenOSRS
4a7bba9cfc Client: Update NPC stats 2020-03-22 00:15:13 +00:00
DeliciousLunch55
c3bb4f0d37 cannon: Add Black Knights cannoning spot in Taverley Dungeon (#11046) 2020-03-21 04:31:27 +01:00
github-actions[bot]
d2288fc078 Merge pull request #2445 from open-osrs/NPC-UPDATE-796e8f29e
Client: Update NPC stats
2020-03-21 00:22:28 +00:00
OpenOSRS
be99e9b8eb Client: Update NPC stats 2020-03-21 00:14:15 +00:00
ThatGamerBlue
796e8f29e6 Merge pull request #2444 from ThatGamerBlue/discord-is-shit
party: fix websocket events not being posted
2020-03-20 17:42:26 +00:00
ThatGamerBlue
f4887eb2c0 party: fix websocket events not being posted 2020-03-20 17:32:23 +00:00
github-actions[bot]
f063b84591 Merge pull request #2442 from open-osrs/NPC-UPDATE-0acdc7061
Client: Update NPC stats
2020-03-20 00:26:12 +00:00
OpenOSRS
e8defe3db9 Client: Update NPC stats 2020-03-20 00:18:18 +00:00
rfick
4369d8baa8 kourendlibrary: Show a hint arrow above target book
This commit adds a configuration to the Kourend library plugin to
display a hint arrow above the target bookcase. (when it is known)

Co-authored-by: Jordan Atwood <jordan.atwood423@gmail.com>
2020-03-19 11:50:53 -07:00
rfick
931cb7adf2 kourendlibrary: Indicate books not in inventory
This commit changes the Kourend library panel to show a different color
for books which are not the target based on whether they are in the
player's inventory or not. Previously, the target book would be shown in
green and all other books would be listed in white. Now, non-target
books in the player's inventory are shown in white and those the player
does not have are shown in orange.

Co-authored-by: Jordan Atwood <jordan.atwood423@gmail.com>
2020-03-19 11:48:46 -07:00
Jordan Atwood
95556aadc7 widget: Expose widget model getters and setters
This commit also adds these widget properties to the widget inspector
dev tool.
2020-03-18 23:55:09 -07:00
github-actions[bot]
0acdc70614 Merge pull request #2441 from open-osrs/NPC-UPDATE-6a719da33
Client: Update NPC stats
2020-03-19 00:23:08 +00:00
OpenOSRS
4313f53ba4 Client: Update NPC stats 2020-03-19 00:14:49 +00:00
Adam
023860f928 client: add dps plugin
Co-authored-by: Max Weber <mii7303@gmail.com>
2020-03-18 18:40:34 -04:00
Adam
ed5c0f7336 overlay: add mouseover callback 2020-03-18 18:40:34 -04:00
melkypie
df18bdb542 timetracking: add timer warning colors
Lets the user choose a time for showing when the timer should turn orange.

Co-authored-by: jakewilson <jakewilsonfl@gmail.com>
2020-03-18 18:22:16 -04:00
melkypie
59361c0d95 timetracking: add ability to sort timers
Lets the user sort by ascending or descending time.

Co-authored-by: jakewilson <jakewilsonfl@gmail.com>
2020-03-18 18:22:16 -04:00
melkypie
902078cb62 friendslist: update titles using onScriptPostFired rather than onGameTick 2020-03-18 16:51:44 -04:00
DeliciousLunch55
a8d9d524ca cannon plugin: update Gnome Stronghold dungeon Bloodvelds cannon location. (#11028) 2020-03-18 16:23:09 -04:00
Justin Hiltz
6c5c579fd1 custom cursor: add option to use equipped weapon 2020-03-18 16:18:13 -04:00
DeliciousLunch55
f9436d06e3 cannon plugin: add cannoning spot for Lizard Shamans 2020-03-18 14:29:18 -04:00
Austin
a9f270cbcb skybox: add nightmare dungeon area 2020-03-18 14:17:06 -04:00
Owain van Brakel
6a719da335 Merge pull request #2440 from Owain94/upstream-1803
project: Merge upstream
2020-03-18 16:41:22 +01:00
Owain van Brakel
e3e0306ecf Merge remote-tracking branch 'runelite/master' 2020-03-18 16:20:57 +01:00
JZomerlei
ca063d606c chatcommands: Don't remove spaces before cleared word (#11017) 2020-03-18 15:14:47 +01:00
Owain van Brakel
37701fd310 Merge remote-tracking branch 'runelite/master' 2020-03-18 13:23:44 +01:00
Owain van Brakel
82555d4064 project: Update deps 2020-03-18 13:09:20 +01:00
github-actions[bot]
132173a834 Merge pull request #2439 from open-osrs/NPC-UPDATE-568620cfa
Client: Update NPC stats
2020-03-18 00:27:21 +00:00
OpenOSRS
451948ac16 Client: Update NPC stats 2020-03-18 00:16:53 +00:00
Daniel
84a23cb59d skillcalculator: Don't clear fields when re-loading current skill
Previously, clicking on the active calculator's skill would reset the
goal level and experience text input fields. This commit prevents that
reset when selecting the already-active skill, and only resets them when
viewing a different skill's calculator.
2020-03-17 21:34:46 +00:00
dekvall
9ac4592a63 menu entry swapper: swap nets on annette 2020-03-17 17:26:12 -04:00
dekvall
32b98965fe drift net fishing: add plugin
This will add a plugin which shows the status of your nets and
highlights any fish you haven't tagged.
2020-03-17 17:26:12 -04:00
Tomas Slusny
c7bbb3bb3a Merge pull request #10912 from dekvall/ground-count
ground items: add support for quantity thresholds
2020-03-17 21:29:51 +01:00