Commit Graph

6496 Commits

Author SHA1 Message Date
Lucwousin
8bdb204019 gradle: injected-client things
Move injector goal to injected-client(ish)
Keep injected-client classes in the correct package
Remove placeholder class/duplicate vanilla jar
2019-07-28 14:00:18 +02:00
ST0NEWALL
81e99a2d9b loottracker: fix tob not being recorded
* Hopefully fixes tob loot not showing. haven't been able to test it because me no good pvm

Signed-off-by: PKLite <stonewall@pklite.xyz>

* take out old import

Signed-off-by: PKLite <stonewall@pklite.xyz>

* implement Blue's change

* Update LootTrackerPlugin.java

* add missing import

Signed-off-by: PKLite <stonewall@pklite.xyz>
2019-07-28 10:31:51 +01:00
Ganom
0023196ca1 aoewarnings: Update, refactor, and clean up. (#1164)
* aoewarnings: Update, refactor, and clean up.

* Various Code Style Fixes
2019-07-28 09:36:56 +01:00
ST0NEWALL
4df5bdcd0a wildernesslocations: Add support for PvP world locations, add location names to world map (#1126)
* Locations will now work in Pvp worlds. Started mapping some of the main ones, still need to map some more

Signed-off-by: PKLite <stonewall@pklite.xyz>

* Add the locations provided by the beast Kyle!!

Signed-off-by: PKLite <stonewall@pklite.xyz>

* Add more locations

Signed-off-by: PKLite <stonewall@pklite.xyz>

* remove stupid extra comma

Signed-off-by: PKLite <stonewall@pklite.xyz>

* Refactor WildernessLocation to WorldLocation and move it to the game package
also removed duplicate entry

Signed-off-by: PKLite <stonewall@pklite.xyz>

* Adds an overlay that draws wilderness location names on the World Map

Signed-off-by: PKLite <stonewall@pklite.xyz>

* Removes area outline because the areas need to be fixed

Signed-off-by: PKLite <stonewall@pklite.xyz>

* Fixes outlines

Signed-off-by: PKLite <stonewall@pklite.xyz>

* merge conflicts

Signed-off-by: PKLite <stonewall@pklite.xyz>

* Sort world locs a-z, and fix whitespace
2019-07-27 20:08:55 -04:00
Ganom
6ab7640266 Add Missing hally animation (#1159) 2019-07-27 23:06:11 +01:00
Lucwousin
22f6146ea7 project: Fix upstream merge (#1157)
* Fix upstream merge

* Update RSItemContainerMixin.java
2019-07-27 23:05:55 +01:00
Ganom
9ed6f586dd Update and refactor PlayerScouter (#1158) 2019-07-27 17:58:30 -04:00
Tyler Bochard
95174f1520 Merge pull request #1156 from Ganom/gauntlet-update
gauntlet: add player attack counter.
2019-07-27 17:48:16 -04:00
ThatGamerBlue
2ba1c7f80b gradle: add properties and modify injected-client (#1145)
* add implementation for getItemCount

* Ignore build directory in project root

* save injector results as class files

* package injected-client for shading into client

* auto-updating properties

* fix run task

* shade injected-client into jar
2019-07-27 15:02:57 -04:00
Ganom
4f228da3f3 Update Gauntlet to include player attack counter. 2019-07-27 14:48:30 -04:00
Owain van Brakel
3fd16bbea1 gradle: update mockito
Mockito-all is discontinued
2019-07-27 08:04:55 +02:00
Chris Johnson
d8ddfa9110 Fix labels for agility threshold configs (#1146) 2019-07-26 22:45:09 -04:00
Crystalknoct
83cd44e336 menuentryswapperplugin: Added Sarachnis crypt swap (#1122)
* menuentryswapperplugin: Added Sarachnis crypt swap

Added quick swap to sarachnis crypt.

* remove duplicate swapQuick option.equals("enter")

remove duplicate this.swapQuick && option.equals("enter")

* Menuentryswapperplugin: cleaned up Sarachnis Swap

Deleted duplicate entry
2019-07-26 21:47:18 +01: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
fa0bf2b0d2 gauntlet boss helper : add corrupted projectiles (#1143) 2019-07-26 19:59:53 +01:00
Kyleeld
36f52232c8 MenuEntrySwapper: Crystal Impling Jar (#1138)
MenuEntrySwapper: Crystal Impling Jar
2019-07-26 19:59:09 +01:00
OnlyHereToPlayOsrs
604e034a9a gauntlet: add boss helper (#1141)
* Gauntlet Boss Helper

* xd
2019-07-26 10:04:43 -04:00
Rune-King
c89e9541ff Fix mining plugin not showing
GameTick event was missing from subscriptions
2019-07-26 13:14:40 +10:00
Tyler Bochard
8233e82374 Merge pull request #1136 from runelite-extended/discord-presence
discord: enforce runeliteplus presence
2019-07-25 22:22:00 -04:00
Zeruth
6eed74dfb1 runeliteplus: fix plugin 2019-07-25 22:17:06 -04:00
Zeruth
f48b6b4f4f discord: enforce runeliteplus presence 2019-07-25 22:06:56 -04:00
Owain van Brakel
3c5c5f1996 Merge remote-tracking branch 'upstream/master' into slayer-v2 2019-07-26 00:59:39 +02:00
Tyler Bochard
dbb00b482c Merge pull request #1132 from runelite-extended/presence
properties: fix presence config
2019-07-25 18:56:27 -04:00
Justin
4b71f300c0 slayerplugin: fixed Slayer Tracker not tracking
fixed tests, made slayer tracker actually track kills
2019-07-26 00:56:03 +02:00
Owain van Brakel
bbe287e2aa slayer: weakness overlay 2019-07-26 00:53:19 +02:00
Zeruth
80ed5c4327 properties: fix presence config 2019-07-25 18:50:18 -04:00
Ganom
c7d6c6ce42 Refactor PLAYER_INTERFACE_CONTAINER_OPENED and add documentation. 2019-07-25 18:14:31 -04:00
Tyler Bochard
ebc8294590 Merge pull request #1121 from Owain94/checkstyle-gradle
gradle: checkstyle changes
2019-07-25 16:44:20 -04:00
Tyler Bochard
40d4428e8c Merge pull request #1130 from Owain94/slayer-weakness
slayer: Fix weakness
2019-07-25 16:43:31 -04:00
Owain van Brakel
11e9528cf3 slayer: Fix weakness 2019-07-25 20:47:28 +02:00
Owain van Brakel
17b35205fd project: Fix deprecations and supress unchecked warnings 2019-07-25 20:34:09 +02:00
Zeruth
5de903304e runeliteplus: merge upstream 2019-07-25 14:30:56 -04:00
Zeruth
51e1ae5aaf Merge remote-tracking branch 'Upstream/master'
# Conflicts:
#	runelite-api/src/main/java/net/runelite/api/Client.java
#	runelite-api/src/main/java/net/runelite/api/TileItem.java
#	runelite-api/src/main/java/net/runelite/api/events/ItemDespawned.java
#	runelite-api/src/main/java/net/runelite/api/events/ItemQuantityChanged.java
#	runelite-api/src/main/java/net/runelite/api/events/ItemSpawned.java
#	runelite-client/src/main/java/net/runelite/client/game/ItemManager.java
#	runelite-client/src/main/java/net/runelite/client/plugins/banktags/tabs/TabInterface.java
#	runelite-client/src/main/java/net/runelite/client/plugins/chatboxperformance/ChatboxPerformancePlugin.java
#	runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemsPlugin.java
#	runelite-client/src/main/java/net/runelite/client/plugins/groundmarkers/GroundMarkerPlugin.java
#	runelite-client/src/main/java/net/runelite/client/plugins/interfacestyles/InterfaceStylesPlugin.java
#	runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerPlugin.java
#	runelite-client/src/main/java/net/runelite/client/plugins/mta/enchantment/EnchantmentRoom.java
#	runelite-client/src/main/java/net/runelite/client/plugins/npchighlight/NpcIndicatorsPlugin.java
#	runelite-client/src/main/java/net/runelite/client/plugins/objectindicators/ObjectIndicatorsPlugin.java
2019-07-25 14:14:20 -04:00
Tomas Slusny
d7d9bef1e0 Merge pull request #9415 from Nightfirecat/fix-teleblock-timer-patterns
timersplugin: Escape periods in teleblock patterns
2019-07-25 18:18:34 +02:00
dekvall
e550fca3c9 Add gnome stronghold fishing spots to fishing plugin (#9444) 2019-07-25 15:31:15 +02:00
Tomas Slusny
75d1999731 Merge pull request #9323 from Decorth/patch-5
Adding Hespori to loot tracker
2019-07-25 14:18:40 +02:00
Tyler Bochard
f0b715ee6a Merge pull request #1120 from Ganom/add-graphic-swaps-to-tmorph
tmorph: Add graphic swaps
2019-07-24 23:44:22 -04:00
Ganom
2ccd3da5b0 Add new configs for graphic swap. 2019-07-24 22:40:46 -04:00
Ganom
83775a63c6 Add graphic swaps to tmorph 2019-07-24 22:40:18 -04:00
15987632
e741770083 hot cold clues: center kandarin outpost dig location 2019-07-24 20:40:14 -04:00
Owain van Brakel
af4c2ad6ae gradle: Update all deps 2019-07-25 01:37:17 +02:00
William Collishaw
87ec3f0bea emoji plugin: support nbsp in messages 2019-07-24 15:06:31 -04:00
Sander de Groot
b59405eec0 chat filter: fix filtering messages containing nbsp
The chat history plugin replays messages by replacing spaces with nbsp to avoid triggering notifications and chat commands, and this was preventing the chat filter from filtering replayed messages. censorMessage already does a nbsp to space replacement.
2019-07-24 15:01:47 -04:00
Decorth
5969a2d972 loottracker: Add Hespori loot tracking
Closes runelite/runelite#9249
2019-07-24 08:44:21 -07:00
xDemoN
4f71fb91f0 clue scrolls: Use consistent label for "Location" (#9421) 2019-07-24 17:25:41 +02:00
Adam
6d3f1208a0 Merge pull request #9389 from Nightfirecat/tag-to-untag
Use "Un-tag" and "Unmark" menu options for tagged NPCs and marked objects/tiles
2019-07-24 10:48:01 -04:00
Lucwousin
ea061fd473 hydra: optimize eventbus subscriptions 2019-07-24 09:00:03 +02:00
Tyler Bochard
2029123098 Merge pull request #1093 from Kyleeld/fallinremove
PvPTools: Remove fallinhelper
2019-07-24 01:20:12 -04:00
Tyler Bochard
866a9e3fc6 Merge pull request #1098 from Owain94/jadzuksuck
slayerplugin: Correct Jad and Zuk task tracking
2019-07-24 01:18:40 -04:00
Tyler Bochard
6a458ff8b5 Merge pull request #1103 from Owain94/timetrackingnpe
timetracking: Null check panel
2019-07-24 01:18:03 -04:00