Owain van Brakel
2655654c9f
project: merge upstream
2019-10-30 04:22:38 +01:00
Owain van Brakel
13fc1f6554
Merge remote-tracking branch 'upstream/master' into 2310-merge
2019-10-28 09:44:51 +01:00
Owain van Brakel
ac3782d54a
project: Update gradle wrapper ( #1849 )
...
project: Update gradle wrapper
2019-10-28 09:42:36 +01:00
ReeeMan
b4346cf5f1
Sanitize the Regex matcher since it still has nbsp in it ( #1850 )
2019-10-27 21:20:40 -04:00
JHPinto
f3feebdf1c
gauntlet: add resource tracker ( #1813 )
...
* Adde resource tracker to Gauntlet Plugin.
Isolate XpDrops into a separate entity that produces XpDropEvents, and
adjust the XpDropPlugin to work with the new events.
Add gauntlet creature death animations to the LootManage.
* Indentation and format adjustments
2019-10-27 21:08:07 -04:00
ReeeMan
449e990a75
contributing: update file. ( #1851 )
...
confused me for way too long.......
2019-10-27 20:29:48 -04:00
OpenOSRS
b02009d6e1
project: Update gradle wrapper
2019-10-28 00:13:16 +00:00
Owain van Brakel
b859cec91a
gradle: kts dsl ( #1845 )
...
* gradle: kts dsl
* deob: Fix tests
* gradle: Convert fernflower plugin to kotlin
2019-10-27 14:35:25 -04:00
Lucwousin
a3667f10e3
deathindicator: add permabones ( #1829 )
...
* Add api support for faking ground items and add permabones
* Remove unused method
* fixed loading/keeping loaded, fixed calendar thingy, probably forgot something
* Actually commit the calendar tsuff
2019-10-26 15:31:00 -04:00
Owain van Brakel
8214e9456d
Client: Update NPC stats ( #1843 )
...
Client: Update NPC stats
Co-authored-by: Owain van Brakel <owain.vanbrakel@gmail.com >
2019-10-26 20:31:58 +02:00
Owain van Brakel
9ef56edfa0
Merge branch 'master' into NPC-UPDATE-0cbfb2e4d
2019-10-26 20:09:28 +02:00
Owain van Brakel
08fb4abee2
actions: fix ( #1846 )
...
actions: fix
2019-10-26 20:06:04 +02:00
Owain van Brakel
0ef426ef48
actions: fix
2019-10-26 19:56:38 +02:00
Alexander
4a3a6a1de4
inferno: attack timers, piano tiles, safespots, indicators, etc ( #1783 )
...
* update to new RS version, fix safespot bug on 2nd run
* fix wave mapping 64-66, add npc name display mode, cleanup
* fix duplicate config key
* refactor
* refactor #2
* remove unused import
* refactor 3
* fix descending box bug, optimize prayer indicator
* remove unused import
* refactor 4
* Delete dependencies.txt
2019-10-26 02:45:39 -04:00
OpenOSRS
256348fda9
Client: Update NPC stats
2019-10-26 00:40:04 +00:00
Ganom
0cbfb2e4df
project: add yourkit references to readme. ( #1840 )
2019-10-25 08:32:03 -04:00
Lucwousin
a57caf17f8
Merge pull request #1835 from Lucwousin/opponent_info_hp_menu
...
OpponentInfo: Show hp in menu
2019-10-24 14:37:51 +02:00
Owain van Brakel
2c469f2213
Merge branch 'master' into 2310-merge
2019-10-24 13:30:09 +02:00
Lucwousin
e2f8f0af32
Show opponents hp in menu, your target colored, targeting you *
2019-10-24 12:01:46 +02:00
Lucwousin
6a8fbf9868
Narrow down onVolumeChanged to only volume changed's
2019-10-24 10:10:08 +02:00
Owain van Brakel
45c0774093
project: volumes support
2019-10-24 08:19:38 +02:00
Lucwousin
e5d259d56e
Merge pull request #1832 from tha23rd/fix-stoned-loot-json-reading
...
stonedloottracker: correctly read JSON
2019-10-24 04:23:56 +02:00
Lucwousin
2848ca033f
Merge branch 'master' into fix-stoned-loot-json-reading
2019-10-24 04:11:09 +02:00
Ganom
83f31b87b7
itemskeptondeath: add true risk handling. ( #1807 )
...
* itemskeptondeath: add true risk handling.
* itemmanager: ensure itemManager is grabbing true break value.
* itemskeptondeath: update test.
* itemskeptondeath: fix test this time.
* itemskeptondeath: i hate tests.
* itemskeptondeath: kms.
* itemreclaimcost: refactor.
2019-10-23 21:24:39 -04:00
Ganom
45c9f71d59
Merge branch 'master' into fix-stoned-loot-json-reading
2019-10-23 21:09:24 -04:00
Owain van Brakel
1569b8af03
Client: Update NPC stats ( #1831 )
...
Client: Update NPC stats
2019-10-24 03:09:01 +02:00
tha23rd
7639bfffb8
empty commit to restart ci
2019-10-23 21:05:41 -04:00
tha23rd
0cb7b30e29
correctly read pretty printed json
2019-10-23 20:45:43 -04:00
OpenOSRS
90fbd21bd7
Client: Update NPC stats
2019-10-24 00:37:42 +00:00
Owain van Brakel
90b7775965
Merge remote-tracking branch 'runelite/master'
2019-10-23 18:33:58 +02:00
Owain van Brakel
945391073b
Merge remote-tracking branch 'runelite/master'
2019-10-23 18:21:03 +02:00
Adam
37e025ed79
client: update mockito
...
Remove various unused stubbing detected by the newer Mockito version
Update references to deprecated Matchers and MockitoJUnitRunner classes
2019-10-23 10:52:14 -04:00
Owain van Brakel
a996fdc092
project: Update gradle dependencies ( #1824 )
...
project: Update gradle dependencies
2019-10-23 05:29:00 +02:00
OpenOSRS
60dee97b02
project: Update gradle dependencies
2019-10-23 00:11:59 +00:00
Adam
524f10bfe1
Merge pull request #10123 from dekvall/random-event-npe
...
random events: fix npe on login
2019-10-22 20:11:03 -04:00
Adam
65fb897846
Merge pull request #10077 from devLotto/customize-fishing-colors
...
fishing: make overlay colors configurable
2019-10-22 20:01:00 -04:00
Adam
a8ddd19597
Merge pull request #10095 from dekvall/unselect-on-skill-change
...
skill calc: clear combined action slot on skill change
2019-10-22 19:49:37 -04:00
dekvall
f025082676
examine plugin: add pricecheck for trade interface
2019-10-22 19:48:41 -04:00
dekvall
1b60dbb575
random events: fix npe on login
...
on login, interactingChanged fires once with both player and target
set to null.
2019-10-23 01:47:04 +02:00
ST0NEWALL
af0d5de96f
itemcharge: Add basket/fix sack ( #1815 )
...
itemcharge: Add basket/fix sack
2019-10-22 18:17:26 -04:00
ST0NEWALL
aed3c7b529
Merge branch 'master' into master
2019-10-22 17:54:07 -04:00
ST0NEWALL
13f1e3dcfb
slayermusiq: updated Animal Magnetism link ( #1823 )
...
slayermusiq: updated Animal Magnetism link
2019-10-22 17:41:44 -04:00
ST0NEWALL
0db9326776
Merge branch 'master' into patch-11
2019-10-22 17:26:18 -04:00
ST0NEWALL
3078e02deb
pluginsorter: Merge into OpenOSRS config and pull methods to th… ( #1820 )
...
pluginsorter: Merge into OpenOSRS config and pull methods to the client
2019-10-22 17:25:50 -04:00
Adam
bfe21fa6a2
Merge pull request #10103 from dekvall/loottracker-confirm-reset
...
loottracker: add confirm dialog to reset all
2019-10-22 15:43:05 -04:00
Kyle
2ed11064f0
Merge branch 'master' into pluginsorter
2019-10-22 20:43:01 +01:00
dekvall
fbe9f71e70
loottracker: add confirm dialog to reset all
2019-10-22 21:18:33 +02:00
Elpan
def32e5bfb
world map: fix Prifddinas farming patch tooltip
...
There is no herb patch in Prifddinas
2019-10-22 14:52:26 -04:00
Abex
a94637d3be
wiki: support wiki-casting on non-inventory items
2019-10-22 14:49:01 -04:00
ST0NEWALL
d1164c6cdd
Merge branch 'master' into patch-11
2019-10-22 05:59:22 -04:00