Owain van Brakel
d9bdab87fe
Merge remote-tracking branch 'runelite/master' into 2310-merge
2019-10-30 04:30:39 +01:00
Owain van Brakel
2655654c9f
project: merge upstream
2019-10-30 04:22:38 +01:00
Joel
b123ad667a
Add item mapping for Berserker Necklace (or) ( #10158 )
2019-10-29 23:01:20 +01:00
Adam
f518ff5c1e
Merge pull request #10122 from dekvall/split-pm-timestamps
...
chat timestamps: add timestamps to split private chat
2019-10-29 16:18:51 -04:00
Adam
e37575e769
Merge pull request #10125 from Hydrox6/clues-sherlock-shayzien
...
clues: fix Shayzien supply armour Sherlock clue
2019-10-29 11:31:59 -04:00
Adam
869c215cb9
Merge pull request #10141 from Hydrox6/clues-inventory-quantity-grouping
...
clues: fix MultipleOfItemRequirement not working with non-stacking items
2019-10-29 09:16:55 -04:00
Max Weber
66e7acd86f
music: check parent and siblings for null
2019-10-28 18:23:55 -04:00
Adam
a2166f1215
http-api: centralize json mediatype
2019-10-28 18:05:35 -04:00
Harry Freeborough
6beddcb1e9
Correct capitalisations of "RuneScape" ( #10142 )
2019-10-28 10:44:17 +01:00
trimbe
897cfffa01
tabinterface: remember search after clicking deposit-x
2019-10-28 10:43:39 +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
Adam
5344cd6ddb
menu swapper: add pyramid plunder start-minigame and quick-leave
...
Co-authored-by: MrH4mm3r <emil629b@edu.easj.dk >
2019-10-27 17:49:00 -04:00
Tomas Slusny
53e56720fc
raids plugin: add option to manually broadcast layout
...
Closes #9541
Signed-off-by: Tomas Slusny <slusnucky@gmail.com >
2019-10-27 16:08:34 -04: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
Adam
423d16fa8e
http-service: make mongo database configurable
2019-10-26 21:58:50 -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
Adam
7980094401
music plugin: add option to mute other players area sounds
2019-10-26 13:07:48 -04:00
Adam
9f9205e65d
devtools: add source to sound effect overlay
2019-10-26 13:02:17 -04:00
Adam
7eda41452b
api: add source to sound effect events
2019-10-26 13:02:15 -04:00
Adam
c2e7b61a68
cache: update npc definition and loader
2019-10-26 12:45:49 -04:00
Hydrox6
f715c9f48d
clues: fix MultipleOfItemRequirement not working with non-stacking items
2019-10-26 08:48:05 +01: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
SebastiaanVanspauwen
7bb95ef7c7
Worldmap: Fix incorrect Zeah quest start locations ( #10135 )
2019-10-25 11:02:12 +02:00
ln
25c81187df
GPU: Floating point screen coordinates to eliminate vertex snapping
2019-10-24 21:34:28 -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
Nathaniel Pather
d56951e6d7
npc health: add lvl 44 zombie health ( #10121 )
2019-10-24 11:04:33 +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
Alex
fcbd26bbc9
menu entry swapper: add shift click teleport spell swap
...
Co-authored-by: Adam <Adam@sigterm.info >
2019-10-23 13:19:55 -04:00