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
parent 415248ae61 529570d91a
commit 2e2c25843d
49 changed files with 611 additions and 663 deletions
--- a/runelite-client/src/main/resources/net/runelite/client/plugins/skybox/skybox.txt
+++ b/runelite-client/src/main/resources/net/runelite/client/plugins/skybox/skybox.txt
@@ -56,7 +56,7 @@
 // 		C <chunk X 1> <chunk Y 1> <chunk X 2> <chunk Y 2>
 // Sets the chunks relative to the last region/region1 to the current color and blending

-bounds 18 19 60 162
+bounds 18 19 60 196

 b 8

@@ -392,6 +392,9 @@ r 47 70
 r 53 78
 r 55 90
 r 57 154
+R 42 94 45 96
+R 49 93 52 96
+r 52 92

 #b2b595
 r 40 67
@@ -948,4 +951,13 @@ R 19 19 21 20

 // Cosmic entity's plane
 #040404
-r 32 75
+r 32 75
+
+b 0
+#000000
+// Song of the elves boss area
+R 49 92 51 92
+
+// Iorwerth dungeon
+#030A0A
+R 49 193 51 194
--- a/runelite-client/src/main/resources/net/runelite/client/plugins/worldmap/teleport_crystal_icon.png
+++ b/runelite-client/src/main/resources/net/runelite/client/plugins/worldmap/teleport_crystal_icon.png