Commit Graph
14744 Commits
Author SHA1 Message Date
ThatGamerBlue ae9b0d6015 Merge remote-tracking branch 'runelite/master' into aaaaaaaaaaaaaaaaaaaaaaaaaaa 2020-09-19 14:09:05 +01:00
ThatGamerBlue f67cdfd405 Merge pull request #2810 from open-osrs/revert-2809-upstream-9-17
revert: client: upstream 9/17/2020
2020-09-19 14:03:49 +01:00
ThatGamerBlue 7ceda4d597 Revert "client: upstream 9/17/2020" 2020-09-18 19:08:51 +01:00
OpenOSRS 8fe9670181 client: Update NPC stats (#2806) 2020-09-18 10:13:24 +01:00
Tyler Bochard 7530090785 Merge pull request #2809 from open-osrs/upstream-9-17
client: upstream 9/17/2020
2020-09-18 00:12:14 -04:00
Null 1cd6b6a058 client: upstream 9/17/2020 2020-09-17 23:36:09 -04:00
Kyle a566c39039 Update Varbits.java 2020-09-18 00:18:37 +01:00
Kyle 52d924dfa3 varbit: add prayer unlockes (#2807)
missing:

Piety
Chivalry
2020-09-18 00:01:27 +01:00
OpenOSRS 0d828ca99a gradle: Update gradle dependencies (#2804) 2020-09-14 14:07:56 +01:00
OpenOSRS 4b3891a42c client: Update NPC stats (#2805) 2020-09-14 14:07:45 +01:00
OpenOSRS d7416a01d8 gradle: Update gradle dependencies (#2795) 2020-09-13 19:34:15 +01:00
OpenOSRS a2998d63b9 client: Update NPC stats (#2789) 2020-09-13 19:33:51 +01:00
Kyle 84cff2848b Merge pull request #2803 from tomcylke/spec-clickbox
runelite-api: add other spec clickbox widget
2020-09-13 19:33:27 +01:00
Kyle 85cdd73cb1 Merge pull request #2797 from Macweese/PlayerManager-high-risk-world
PlayerManager: High risk world mechanics
2020-09-13 19:33:11 +01:00
Thomas Cylke 83cf633dc4 Merge remote-tracking branch 'remotes/client-upstream/master' into spec-clickbox 2020-09-13 14:23:00 -04:00
Thomas Cylke 318cfcfd19 runelite-api: add other spec clickbox widget 2020-09-13 14:21:58 -04:00
ThatGamerBlue 3787d56213 Merge pull request #2801 from open-osrs/zeruth-patch-1
client: remove TimeFormatMode
2020-09-13 19:09:20 +01:00
Kyle 7fb1a0ed62 Merge pull request #2802 from tomcylke/spec-clickbox
runelite-api: add spec clickbox widget
2020-09-13 19:06:45 +01:00
Thomas Cylke 587de7c39a runelite-api: add spec clickbox widget 2020-09-13 13:56:02 -04:00
Tyler Bochard f453e56be7 Delete TimeFormatMode.java
This was made available in the external plugins repo at:  
https://github.com/open-osrs/plugins/blob/master/timetracking/src/main/java/net/runelite/client/plugins/timetracking/TimeFormatMode.java
2020-09-10 17:34:19 -04:00
RuneLite Cache-Code Autoupdater d2b361dabb Update Widget IDs to 2020-09-10-rev191 2020-09-10 10:32:53 +00:00
RuneLite Cache-Code Autoupdater 4d303fbd52 Update NPC IDs to 2020-09-10-rev191 2020-09-10 10:32:50 +00:00
RuneLite Cache-Code Autoupdater 84110c84f0 Update Object IDs to 2020-09-10-rev191 2020-09-10 10:32:50 +00:00
RuneLite Cache-Code Autoupdater 0e583c378f Update Item IDs to 2020-09-10-rev191 2020-09-10 10:32:49 +00:00
Adam 01447e52a7 timers: consolidate teleblock timers 2020-09-09 11:08:17 -04:00
Adam d2c72d6cbe core overlay: cleanup
Avoid checking config if there is no core npc
2020-09-09 11:07:04 -04:00
Jordan cd40cade89 Merge pull request #12460 from Matthew-nop/Slayer-Task-Fix 2020-09-08 23:39:42 -07:00
Matthew C e2f848fbbf slayer: Add black knights and pirates 2020-09-08 23:32:12 -07:00
Matthew C 6fd2eb5e63 slayer: Sort Task enum alphabetically 2020-09-08 23:31:50 -07:00
Matthew C 230bba0ea7 corp: Add toggle for dark energy core highlighting (#12462) 2020-09-09 03:30:41 +00:00
Jordan 2a3aede2ca Merge pull request #12464 from Matthew-nop/Timers-MageArenaTBs
timers: add Mage Arena 2 teleblock patterns.
2020-09-08 17:28:28 -07:00
Matthew C 3c920ead9a timers: Add Mage Arena 2 teleblock timers 2020-09-08 17:19:17 -07:00
ThatGamerBlue 018405b3f4 Merge pull request #2800 from ThatGamerBlue/master
project: upstream
2020-09-08 21:01:30 +01:00
ThatGamerBlue 83bdef6706 bump versions 2020-09-08 18:58:11 +01:00
ThatGamerBlue 06006bf7ae Merge remote-tracking branch 'runelite/master' 2020-09-08 18:50:27 +01:00
Kyle b544904ec8 Merge pull request #2798 from Macweese/image-capture
ImageCapture: udpate
2020-09-07 18:40:25 +01:00
Macweese f3a4ef3518 Update ImageCapture.java 2020-09-07 18:47:25 +02:00
Macweese af733b76b1 import worldtype maybe
ape
2020-09-06 19:49:15 +02:00
Macweese 5166e9921e PlayerManager: High risk world mechanics
Checkstyle
2020-09-06 19:39:30 +02:00
Macweese f93d7e8847 PlayerManager: High risk world mechanics
Update PlayerManager to work with the latest changes made to high risk worlds.

Protect item prayer is completely disabled on high risk worlds.

Also changed the ternary operator to only apply if the prayer level is less than 25, since players can use the prayer if they are 25 prayer.
2020-09-06 19:30:46 +02:00
Kyle 03f73e32ab Update WeaponMap.java 2020-09-04 19:52:40 +01:00
Kyle 304b79d7b0 weaponmap: add amys saw
weaponmap: add amys saw
2020-09-04 15:18:49 +01:00
arthur798 00fc1314f7 skillcalculator: Add Carpenter's outfit set bonus (#12412) 2020-09-04 07:30:43 +00:00
Michael Archer e388f5a0f7 timers: Update stunned Abyssal Sire ID (#12410)
A recent game update changed the NPC IDs used for sire's stunned state,
causing the stun timer to become applied and removed at the wrong time.
2020-09-04 07:28:59 +00:00
David 0a4cb9bf5a menuentryswapper: Add Island of Stone quick travel (#12422) 2020-09-04 07:23:12 +00:00
Broooklyn 1db0f66a98 clues: Fix Watchtower master emote step coordinates (#12429) 2020-09-04 07:04:02 +00:00
Jordan 94c1d14c78 Merge pull request #12441 from jmattdavenport/clue-scroll-emote-fairy-rings
cluescrolls: add fairy ring codes to emote clues
2020-09-03 23:49:30 -07:00
Matt Davenport 9beec30b3f cluescrolls: add fairy ring codes to emote clues 2020-09-02 17:57:23 -04:00
Adam b9b505acc4 scripts: fix privateMessage message skipping
This was incorrectly looping if the message was to be skipped
2020-09-02 10:25:21 -04:00
Max Weber 081253273b Merge branch 'itemid-090220' into master 2020-09-02 05:56:08 -06:00