Owain van Brakel
0b51226f72
project: RL: 1.5.31-SNAPSHOT, RL+: 2.1.2.0
2019-08-01 14:57:13 +02:00
Owain van Brakel
9070f6c5ef
Merge remote-tracking branch 'runelite/master' into 3107-merge
2019-07-31 08:03:28 +02:00
Tomas Slusny
72d7a88014
Merge pull request #9473 from Alexsuperfly/Prifddinas-agility-course-calc
...
skill calc: SotE additions
2019-07-31 00:42:50 +02:00
Alexsuperfly
e52f8fbfd3
skill calc: add crystal tree
2019-07-30 13:42:16 -04:00
Alexsuperfly
35fe719e57
skill calc: add Prifddinas agility course
2019-07-30 13:42:10 -04:00
Zeruth
2e2c25843d
Merge remote-tracking branch 'Upstream/master'
...
# Conflicts:
# http-api/src/main/java/net/runelite/http/api/ws/messages/party/PartyChatMessage.java
# runelite-api/src/main/java/net/runelite/api/Quest.java
# runelite-client/src/main/java/net/runelite/client/RuneLite.java
# runelite-client/src/main/java/net/runelite/client/game/AgilityShortcut.java
# runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItem.java
# runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemsConfig.java
# runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemsOverlay.java
# runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemsPlugin.java
# runelite-client/src/main/java/net/runelite/client/plugins/itemprices/ItemPricesOverlay.java
# runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerPlugin.java
# runelite-client/src/main/java/net/runelite/client/plugins/questlist/QuestListPlugin.java
# runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsPlugin.java
# runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpTrackerPlugin.java
# runelite-client/src/main/java/net/runelite/client/plugins/zoom/ZoomPlugin.java
# runelite-client/src/main/java/net/runelite/client/rs/ClientLoader.java
# runelite-client/src/main/java/net/runelite/client/ws/PartyService.java
# runelite-client/src/test/java/net/runelite/client/plugins/chatcommands/ChatCommandsPluginTest.java
2019-07-29 01:44:57 -04:00
Ganom
22e15fc3d2
resources: Wiki scrape latest ItemStats/NpcStats ( #1165 )
2019-07-28 09:02:53 +01:00
Adam
633b7de527
Merge pull request #9472 from Alexsuperfly/sote-world-map-updates
...
Prifddinas world map icon updates
2019-07-27 23:15:36 -04:00
Max Weber
e5154893a4
Skybox: Add Prifddinas and Iorwerth dungeon
2019-07-26 21:01:15 -06:00
Alexsuperfly
5cec969715
world map: add teleport crytal icon
2019-07-26 18:21:25 -04:00
Chris Johnson
39fd5f6bac
Show agility level overhead (either as icons or text) ( #1100 )
...
As well as some general player indicator improvements around multiple conflicting options
2019-07-26 20:01:38 +01:00
OnlyHereToPlayOsrs
604e034a9a
gauntlet: add boss helper ( #1141 )
...
* Gauntlet Boss Helper
* xd
2019-07-26 10:04:43 -04:00
David
c0cc1a9fc4
Add GE limit for Drift net ( #9411 )
2019-07-25 15:32:05 +02:00
RuneLite Cache-Code Autoupdater
04a27556ae
Update Item variations to 2019-07-25-rev181
2019-07-25 09:33:31 +00:00
Ganom
af45df8ac6
Merge pull request #1095 from Owain94/stonedloottracker
...
stonedloottracker: Update plugin
2019-07-23 18:55:14 -04:00
Owain van Brakel
b5124659bc
stonedloottracker: Update plugin
...
And fix that ugly reset icon in the regular loot tracker
2019-07-23 23:10:35 +02:00
Owain van Brakel
cb6eecfa29
Merge remote-tracking branch 'runelite/master' into rl-update
2019-07-23 21:52:16 +02:00
Sander de Groot
2ca03ece48
interface styles: add sprite override for 2005 friend/ignore list toggle
2019-07-22 19:30:15 -04:00
Alexander
5f9f554bce
Freezetimers: add immunity timer, fix freeze durations ( #1064 )
...
* freezetimers: add immunity timer, fix freeze durations
* freezetimers: refactoring
* freezetimers: fix tb removal
* freezetimers: make travis happy
* freezetimers: add immunity timer
* freezetimers: add immune images
* freezetimers: fix logic, add tb immunity
2019-07-22 08:40:58 +01:00
Ganom
a4acccd68b
Update Item Stats
2019-07-20 00:28:19 -04:00
Ganom
edd0dfd8fc
Add missing GE Limits / update them
2019-07-20 00:23:04 -04:00
Owain van Brakel
8dc54eb554
Merge remote-tracking branch 'runelite/master'
2019-07-19 00:27:10 +02:00
RuneLite Cache-Code Autoupdater
8516f15b3a
Update Item variations to 2019-07-18-rev181
2019-07-18 10:32:35 +00:00
Abex
249f8db6a6
Merge pull request #9363 from Quasindro/skybox-cosmic-plane
...
skybox: fix color at Cosmic Entity's Plane region
2019-07-16 23:34:06 -06:00
Owain van Brakel
c6a8450619
project: Merge upstream
2019-07-16 17:42:01 +02:00
David
ded702b11f
Add GE limit for Golovanova fruit top ( #9385 )
2019-07-16 10:37:11 +02:00
Ganom
41b7bd7207
itemmanager: updated to use local resources for stats, also addding discord client service. ( #1000 )
...
* Add Discord Client
* Add Discord message and embed utilities
* Add plugin config base
* Add base plugin and NPC Loot Log
* Fixes
Removes duplicated code
Add local player death events
* Add getIcon method
* Remove unused Import
* Move Item Stats from ItemManager to local resources.
Add & Update Discord Embed Service.
Remove DiscordWebHook plugin, it was pretty bad, can do better.
* Fix lombok @NonNull tag.
* Remove old imports.
* Fix travis.
2019-07-14 20:09:44 +01:00
Quasindro
7baa1c4509
skybox: fix color at Cosmic Entity's Plane region
2019-07-13 21:45:36 +02:00
Owain van Brakel
a026eb0521
statusorbsplugin: Merge regenmeter and runenergy plugins
...
Add dynamic heart to status orbs plugin based on poison / disease
vars
Add run enery regen
Add smoothing over the regen
2019-07-10 21:37:42 +02:00
Ganom
befd32ec32
Add latest wiki data to npc_stats ( #956 )
2019-07-09 20:57:32 +01:00
Tyler Bochard
1a47f8e4b1
Merge branch 'master' into loot-tracker-reset
2019-07-08 19:36:32 -04:00
sdburns1998
e8256a330a
Merge remote-tracking branch 'runelite/master' into upstreamememememe
2019-07-08 18:21:26 +02:00
RuneLite Cache-Code Autoupdater
0944c0a4e6
Update Item variations to 2019-07-04-rev180
2019-07-08 11:38:55 -04:00
sdburns1998
f8003f1d03
'Globalize' RL+ config ( #908 )
...
* Fix tabs in Runelite config
* Move RL+ config
* Move some items to runelite.properties
* 'Globalize' RL+ config
* Move enabling external plugins to RL+ config
* Fix default presence
* Fix master branch errors
* Fix guicing in test
* Remove non final discordAppID
2019-07-06 16:38:57 +02:00
sdburns1998
a8cf657e4c
Add a button to the info panel to open the log dir (and fix the discord ( #894 )
...
* Add a button to the info panel to open the log dir (and fix the discord
invite link)
* Use user defined font
* Fix versionPanel layout
* Checkstyle
2019-07-05 20:27:51 +02:00
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
JavaBlah
6193c08aad
cursors plugin: add dragon dagger (p) cursor
2019-07-03 18:34:26 -04:00
PKLite
1e80b0ef14
Merge branch 'master' into loot-tracker-reset
2019-07-03 11:30:28 -04:00
Tyler Bochard
236ccaf33f
Merge pull request #864 from runelite/master
...
bringup to upstream
2019-07-02 18:59:16 -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
PKLite
805cb27566
Merge branch 'master' into loot-tracker-reset
2019-07-02 02:00:39 -04:00
sdburns1998
8d77971c83
Merge remote-tracking branch 'runelite/master' into ihategitandihatethisihatemergingupstream
2019-06-29 01:08:56 +02:00
Kyleeld
c2f405cf8f
Revert "Upstreamyboy"
2019-06-28 23:58:38 +01:00
sdburns1998
94b35239b8
interface styles: add RuneScape cross sprites option
2019-06-29 00:25:41 +02:00
Sander de Groot
6c9af71445
Adjust alignment of icons in fixed 2005 interface style and fix inventory icon
2019-06-29 00:24:59 +02:00
PKLite
20b0035828
Merge branch 'master' into loot-tracker-reset
2019-06-28 02:35:03 -04:00
Ganom
7a7db495d4
Overhaul of the Tick Timers plugin. ( #757 )
...
* Overhaul of the Tick Timers plugin.
Added new OverlayUtils that are commonly found.
Added Attack Speed to npcManager. (Thanks wiki <3)
Updated Prayer API to contain widget info as well.
* Remove unnecessary code.
* Add Dag King animations.
* Update NPCManager to use int instead of Integer.
* Add Waterbith Region check for DKs
* Make valid region check happen only during game state change event.
* Renaming and other misc.
* Renaming and other misc.
2019-06-26 20:08:21 -07:00
se7enAte9
24a6357baf
Barbarianassault merge ( #579 )
...
* widgets: update name to more accurately represent widget
* BarbarianAssault: WIP batools/barbarianassult merge
* widgetinfo: add weapon name widget
* healer codes: semi-fixed
* menu prioritization: walk here here now takes priority over incorrect
eggs and any type of bait if enabled in config
* add cntl healer
* add slider config option for prayer metronome volume, and fix some more
menu options
* add shift overstock and cleanup imports/config
* add death timers and update copyrights and config
* Remove unused class
* add mode class
* add ProjectileSpawn event
* add tagging
* add reset before wave starts
* improve end of wave handling and disabling/enabling plugin mid game
* fix horn of glory pt. 1
* fix horn of glory pt. 2
* fix call timer and finish horn of glory
* fix 🙏 healer codes
* cleanup and move certain methods to client thread
* cleanup
2019-06-27 01:50:39 +01:00
Lotto
8d4fff459c
interface styles: add RuneScape cross sprites option
2019-06-26 18:45:30 -04:00
Adam
86ddedd507
Merge pull request #9110 from sadegr/interfacestyles-2005-icon-alignment
...
Adjust alignment of icons in 2005 interface style and fix inventory icon
2019-06-26 15:51:01 -04:00