ThatGamerBlue
|
7b261b0cc7
|
Merge remote-tracking branch 'runelite/master' into 23072020
# Conflicts:
# cache-client/pom.xml
# cache-updater/pom.xml
# cache/pom.xml
# http-api/pom.xml
# http-service/pom.xml
# pom.xml
# runelite-api/pom.xml
# runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java
# runelite-client/pom.xml
# runelite-client/src/main/java/net/runelite/client/config/RuneLiteConfig.java
# runelite-client/src/main/java/net/runelite/client/plugins/bank/BankPlugin.java
# runelite-client/src/main/java/net/runelite/client/plugins/banktags/BankTagsConfig.java
# runelite-client/src/main/java/net/runelite/client/plugins/banktags/BankTagsPlugin.java
# runelite-client/src/main/java/net/runelite/client/plugins/banktags/tabs/TabInterface.java
# runelite-client/src/main/java/net/runelite/client/plugins/cannon/CannonSpots.java
# runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/BeginnerMapClue.java
# runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/EmoteClue.java
# runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/FaloTheBardClue.java
# runelite-client/src/main/java/net/runelite/client/plugins/dpscounter/DpsCounterPlugin.java
# runelite-client/src/main/java/net/runelite/client/plugins/experiencedrop/XpDropPlugin.java
# runelite-client/src/main/java/net/runelite/client/plugins/itemstats/ItemStatOverlay.java
# runelite-client/src/main/java/net/runelite/client/plugins/slayer/Task.java
# runelite-client/src/test/java/net/runelite/client/plugins/itemstats/ItemStatOverlayTest.java
# runelite-script-assembler-plugin/pom.xml
|
2020-07-23 15:07:56 +01:00 |
|
Cyborger1
|
4362adb876
|
itemstats: check for two handed interactions (#12168)
|
2020-07-21 02:13:11 -06:00 |
|
ThatGamerBlue
|
ea056d0604
|
Merge remote-tracking branch 'runelite/master' into rl-upstream-16072020
# Conflicts:
# cache/src/main/java/net/runelite/cache/util/XteaKeyManager.java
# http-api/pom.xml
# http-api/src/main/java/net/runelite/http/api/account/AccountClient.java
# http-api/src/main/java/net/runelite/http/api/chat/ChatClient.java
# http-api/src/main/java/net/runelite/http/api/item/ItemClient.java
# http-api/src/main/java/net/runelite/http/api/osbuddy/OSBGrandExchangeClient.java
# http-api/src/main/java/net/runelite/http/api/xtea/XteaClient.java
# http-service/src/main/java/net/runelite/http/service/hiscore/HiscoreService.java
# runelite-api/src/main/java/net/runelite/api/Client.java
# runelite-api/src/main/java/net/runelite/api/EnumID.java
# runelite-api/src/main/java/net/runelite/api/IndexDataBase.java
# runelite-api/src/main/java/net/runelite/api/ItemComposition.java
# runelite-api/src/main/java/net/runelite/api/PlayerComposition.java
# runelite-api/src/main/java/net/runelite/api/ScriptID.java
# runelite-api/src/main/java/net/runelite/api/VarbitComposition.java
# runelite-api/src/main/java/net/runelite/api/events/ActorDeath.java
# runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java
# runelite-api/src/main/java/net/runelite/api/widgets/WidgetInfo.java
# runelite-client/src/main/java/net/runelite/client/ClientSessionManager.java
# runelite-client/src/main/java/net/runelite/client/RuneLite.java
# runelite-client/src/main/java/net/runelite/client/RuneLiteModule.java
# runelite-client/src/main/java/net/runelite/client/RuneLiteProperties.java
# runelite-client/src/main/java/net/runelite/client/SessionClient.java
# runelite-client/src/main/java/net/runelite/client/account/SessionManager.java
# runelite-client/src/main/java/net/runelite/client/config/ConfigManager.java
# runelite-client/src/main/java/net/runelite/client/externalplugins/ExternalPluginManager.java
# runelite-client/src/main/java/net/runelite/client/game/ItemManager.java
# runelite-client/src/main/java/net/runelite/client/game/WorldService.java
# runelite-client/src/main/java/net/runelite/client/input/KeyListener.java
# runelite-client/src/main/java/net/runelite/client/plugins/agility/AgilityConfig.java
# runelite-client/src/main/java/net/runelite/client/plugins/agility/AgilityOverlay.java
# runelite-client/src/main/java/net/runelite/client/plugins/agility/AgilityPlugin.java
# runelite-client/src/main/java/net/runelite/client/plugins/agility/Obstacles.java
# runelite-client/src/main/java/net/runelite/client/plugins/bank/BankPlugin.java
# runelite-client/src/main/java/net/runelite/client/plugins/banktags/tabs/TabInterface.java
# runelite-client/src/main/java/net/runelite/client/plugins/chatcommands/ChatCommandsPlugin.java
# runelite-client/src/main/java/net/runelite/client/plugins/chatfilter/ChatFilterConfig.java
# runelite-client/src/main/java/net/runelite/client/plugins/chatnotifications/ChatNotificationsConfig.java
# runelite-client/src/main/java/net/runelite/client/plugins/chatnotifications/ChatNotificationsPlugin.java
# runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/CrypticClue.java
# runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/SkillChallengeClue.java
# runelite-client/src/main/java/net/runelite/client/plugins/config/PluginListItem.java
# runelite-client/src/main/java/net/runelite/client/plugins/config/PluginListPanel.java
# runelite-client/src/main/java/net/runelite/client/plugins/devtools/VarInspector.java
# runelite-client/src/main/java/net/runelite/client/plugins/discord/DiscordGameEventType.java
# runelite-client/src/main/java/net/runelite/client/plugins/discord/DiscordPlugin.java
# runelite-client/src/main/java/net/runelite/client/plugins/examine/ExaminePlugin.java
# runelite-client/src/main/java/net/runelite/client/plugins/experiencedrop/XpDropPlugin.java
# runelite-client/src/main/java/net/runelite/client/plugins/feed/FeedPanel.java
# runelite-client/src/main/java/net/runelite/client/plugins/feed/FeedPlugin.java
# runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangeItemPanel.java
# runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangeOfferSlot.java
# runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangePlugin.java
# runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemsPlugin.java
# runelite-client/src/main/java/net/runelite/client/plugins/hiscore/HiscorePanel.java
# runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemChargeConfig.java
# runelite-client/src/main/java/net/runelite/client/plugins/itemprices/ItemPricesOverlay.java
# runelite-client/src/main/java/net/runelite/client/plugins/keyremapping/KeyRemappingListener.java
# runelite-client/src/main/java/net/runelite/client/plugins/loginscreen/LoginScreenPlugin.java
# runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerConfig.java
# runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerPlugin.java
# runelite-client/src/main/java/net/runelite/client/plugins/npchighlight/NpcIndicatorsConfig.java
# runelite-client/src/main/java/net/runelite/client/plugins/npchighlight/NpcIndicatorsPlugin.java
# runelite-client/src/main/java/net/runelite/client/plugins/raids/Raid.java
# runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidRoom.java
# runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsConfig.java
# runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsPlugin.java
# runelite-client/src/main/java/net/runelite/client/plugins/raids/RoomType.java
# runelite-client/src/main/java/net/runelite/client/plugins/randomevents/RandomEventConfig.java
# runelite-client/src/main/java/net/runelite/client/plugins/randomevents/RandomEventPlugin.java
# runelite-client/src/main/java/net/runelite/client/plugins/screenshot/ScreenshotPlugin.java
# runelite-client/src/main/java/net/runelite/client/plugins/slayer/SlayerPlugin.java
# runelite-client/src/main/java/net/runelite/client/plugins/timers/TimersPlugin.java
# runelite-client/src/main/java/net/runelite/client/plugins/wiki/WikiSearchChatboxTextInput.java
# runelite-client/src/main/java/net/runelite/client/plugins/worldmap/MinigameLocation.java
# runelite-client/src/main/java/net/runelite/client/plugins/worldmap/MiningSiteLocation.java
# runelite-client/src/main/java/net/runelite/client/plugins/worldmap/TeleportLocationData.java
# runelite-client/src/main/java/net/runelite/client/plugins/worldmap/TransportationPointLocation.java
# runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpTrackerPlugin.java
# runelite-client/src/main/java/net/runelite/client/plugins/xpupdater/XpUpdaterPlugin.java
# runelite-client/src/main/java/net/runelite/client/plugins/xtea/XteaPlugin.java
# runelite-client/src/main/java/net/runelite/client/rs/ClientConfigLoader.java
# runelite-client/src/main/java/net/runelite/client/rs/ClientLoader.java
# runelite-client/src/main/resources/net/runelite/client/plugins/skillcalculator/skill_fletching.json
# runelite-client/src/test/java/net/runelite/client/plugins/PluginManagerTest.java
# runelite-client/src/test/java/net/runelite/client/plugins/bank/BankPluginTest.java
# runelite-client/src/test/java/net/runelite/client/plugins/chatcommands/ChatCommandsPluginTest.java
# runelite-client/src/test/java/net/runelite/client/plugins/examine/ExaminePluginTest.java
# runelite-client/src/test/java/net/runelite/client/plugins/grandexchange/GrandExchangePluginTest.java
# runelite-client/src/test/java/net/runelite/client/plugins/hiscore/HiscorePanelTest.java
# runelite-client/src/test/java/net/runelite/client/plugins/keyremapping/KeyRemappingListenerTest.java
# runelite-client/src/test/java/net/runelite/client/plugins/loottracker/LootTrackerPluginTest.java
# runelite-client/src/test/java/net/runelite/client/plugins/npchighlight/NpcIndicatorsPluginTest.java
# runelite-client/src/test/java/net/runelite/client/plugins/raids/RaidsPluginTest.java
# runelite-client/src/test/java/net/runelite/client/plugins/slayer/SlayerPluginTest.java
# runelite-client/src/test/java/net/runelite/client/plugins/xptracker/XpTrackerPluginTest.java
# runelite-client/src/test/java/net/runelite/client/rs/ClientConfigLoaderTest.java
# runelite-client/src/test/java/net/runelite/client/ui/overlay/infobox/InfoBoxManagerTest.java
|
2020-07-16 18:32:30 +01:00 |
|
ThatGamerBlue
|
236215b616
|
client: re-add xtea keys
|
2020-07-13 00:43:52 +01:00 |
|
Adam
|
47c375cb03
|
client: use guice provided http client everywhere
|
2020-06-27 23:21:28 -04:00 |
|
Owain van Brakel
|
ae9de3928f
|
Merge remote-tracking branch 'runelite/master'
|
2020-06-12 11:47:08 +02:00 |
|
Adam
|
a1122ba141
|
ge: fix computing bought/sold amount
Use the total spent price instead of the delta spent price, as it is
being divided by the total quantity
|
2020-06-06 10:35:20 -04:00 |
|
Owain van Brakel
|
8627076955
|
Merge remote-tracking branch 'runelite/master'
|
2020-06-04 16:48:25 +02:00 |
|
Adam
|
2dd6fa41e9
|
ge: include both delta qty and qty
|
2020-06-04 10:14:01 -04:00 |
|
Owain van Brakel
|
5b45c860ec
|
Merge remote-tracking branch 'runelite/master'
|
2020-06-04 11:33:43 +02:00 |
|
Adam
|
a803ba567b
|
ge: include slot id
|
2020-06-03 20:44:45 -04:00 |
|
Owain van Brakel
|
9bd0d91b4d
|
Merge remote-tracking branch 'runelite/master'
|
2020-06-03 07:07:04 +02:00 |
|
Adam
|
c67378c09e
|
ge plugin: include if trade is synced on login
|
2020-06-01 09:56:09 -04:00 |
|
Adam
|
83756e8722
|
ge: submit spent price instead of computed per-item price
|
2020-06-01 09:56:09 -04:00 |
|
Owain van Brakel
|
3c370f992a
|
Merge remote-tracking branch 'runelite/master'
|
2020-05-31 05:35:48 +02:00 |
|
Adam
|
6a2e15643f
|
ge plugin: include world type in trades
|
2020-05-30 20:06:33 -04:00 |
|
Adam
|
17d6921a4a
|
ge plugin: submit partially completed trades
|
2020-05-30 19:26:43 -04:00 |
|
Adam
|
6d46bb09c4
|
ge plugin: submit trades even when not logged in
|
2020-05-30 19:26:43 -04:00 |
|
Adam
|
2622cc2ac6
|
http-api: use separate class for ge trade history
|
2020-05-30 19:26:43 -04:00 |
|
swazrgb
|
66db2c7986
|
Remove SoundsClient
|
2020-05-26 23:36:27 +02:00 |
|
swazrgb
|
87e4cbc921
|
Remove AnimationsClient
|
2020-05-26 23:35:24 +02:00 |
|
swazrgb
|
411680e98a
|
Remove XteaClient
|
2020-05-26 23:34:48 +02:00 |
|
swazrgb
|
4769802524
|
Switch repo.runelite.net url to https
|
2020-05-26 23:33:42 +02:00 |
|
Owain van Brakel
|
04188f2d82
|
Merge remote-tracking branch 'runelite/master'
|
2020-05-01 20:08:11 +02:00 |
|
Adam
|
d25546f5db
|
Add dmmt world type and tournament hiscore endpoint
|
2020-05-01 10:25:50 -04:00 |
|
Owain van Brakel
|
1debe8a99b
|
Merge remote-tracking branch 'runelite/master'
|
2020-04-18 23:38:58 +02:00 |
|
Trevor
|
fae69d4fd2
|
loot tracker plugin: submit loot on client shutdown (#11243)
|
2020-04-10 15:51:09 -06:00 |
|
kyle-escobar
|
3e2da6c375
|
Merge branch 'master' of https://github.com/runelite/runelite into upstream-4-9-2020
Conflicts:
runelite-client/src/main/java/net/runelite/client/RuneLite.java
runelite-client/src/main/java/net/runelite/client/plugins/camera/CameraConfig.java
runelite-client/src/main/java/net/runelite/client/plugins/camera/CameraPlugin.java
runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/EmoteClue.java
runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/hotcold/HotColdLocation.java
runelite-client/src/main/java/net/runelite/client/plugins/combatlevel/CombatLevelConfig.java
runelite-client/src/main/java/net/runelite/client/plugins/combatlevel/CombatLevelPlugin.java
runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemsPlugin.java
runelite-client/src/main/java/net/runelite/client/plugins/screenshot/ScreenshotPlugin.java
runelite-client/src/main/java/net/runelite/client/ui/overlay/WidgetOverlay.java
runelite-client/src/test/java/net/runelite/client/plugins/itemstats/ItemStatOverlayTest.java
|
2020-04-09 20:57:21 -04:00 |
|
Max Weber
|
e83d1e6b72
|
runelite-client: add ClientShutdown event
This should hopefully make the client not corrupt it's cache randomly,
and prevents the config sets from racing shutdown
|
2020-04-09 16:04:39 -06:00 |
|
Abex
|
165bbbb622
|
Merge pull request #11195 from abextm/rm-npc-names
http-api: remove unused fields from NPCInfo
|
2020-04-09 11:43:29 -06:00 |
|
kyle-escobar
|
bb3133f6d8
|
Fix checkstyle
|
2020-04-07 21:36:27 -04:00 |
|
kyle-escobar
|
bb9a55b39f
|
Update: Upstream runelite/runelite
|
2020-04-07 21:33:29 -04:00 |
|
kyle-escobar
|
8a00bd3ece
|
Merge branch 'master' of https://github.com/runelite/runelite into upstream-4-7-2020
Conflicts:
http-api/src/main/java/net/runelite/http/api/item/ItemClient.java
http-service/src/main/java/net/runelite/http/service/item/ItemController.java
http-service/src/main/java/net/runelite/http/service/item/ItemEntry.java
http-service/src/main/java/net/runelite/http/service/item/ItemService.java
http-service/src/main/java/net/runelite/http/service/item/RSItem.java
http-service/src/main/java/net/runelite/http/service/item/RSItemResponse.java
runelite-api/src/main/java/net/runelite/api/ScriptID.java
runelite-api/src/main/java/net/runelite/api/Varbits.java
runelite-api/src/main/java/net/runelite/api/widgets/WidgetInfo.java
runelite-client/src/main/java/net/runelite/client/callback/Hooks.java
runelite-client/src/main/java/net/runelite/client/plugins/antidrag/AntiDragConfig.java
runelite-client/src/main/java/net/runelite/client/plugins/antidrag/AntiDragPlugin.java
runelite-client/src/main/java/net/runelite/client/plugins/camera/CameraPlugin.java
runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/hotcold/HotColdLocation.java
runelite-client/src/main/java/net/runelite/client/plugins/config/PluginHubPanel.java
runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/BookPanel.java
runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/KourendLibraryConfig.java
runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/KourendLibraryPanel.java
runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/KourendLibraryPlugin.java
runelite-client/src/main/java/net/runelite/client/plugins/music/MusicPlugin.java
runelite-client/src/main/java/net/runelite/client/plugins/party/PartyPlugin.java
runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldHopperPlugin.java
|
2020-04-07 21:16:50 -04:00 |
|
Adam
|
670e62b6b9
|
item service: remove old item searching and item lookup methods
We haven't used this code in awhile. Additionally modify the price
crawler to re-fetch known items in the event the name or examine
changes.
|
2020-04-07 16:09:30 -04:00 |
|
Max Weber
|
6a0fd2a0d0
|
http-api: remove unused fields from NPCInfo
These fields are never used. If we need this information we can get it
from the client's cache
|
2020-04-04 05:21:19 -06:00 |
|
Owain van Brakel
|
f79d5ede89
|
party: Revert botches and fix party support
|
2020-03-29 16:27:28 +02:00 |
|
xKylee
|
118beeb92e
|
Merge branch 'pr/1' into upstream-gpack
|
2020-03-25 22:19:33 +00:00 |
|
Adam
|
c930a5d261
|
http-api: add world region to World
Add a WorldRegion to convert from location id to region
Co-authored-by: melkypie <melkypie@users.noreply.github.com>
|
2020-03-24 11:54:54 -04:00 |
|
Owain van Brakel
|
cb0995f037
|
project: Update to RxJava 3
|
2020-03-11 11:20:21 +01:00 |
|
Kyle
|
17a2213fec
|
api: who even thought this was a good idea???? (#2396)
* Update RuneLiteAPI.java
* Update ChatClient.java
* Update RuneLiteAPI.java
* Update ChatClient.java
|
2020-03-01 23:18:20 +00:00 |
|
Owain van Brakel
|
4ddfe9fae7
|
project: Merge upstream
|
2020-02-26 07:22:56 +01:00 |
|
Adam
|
5a46abddc5
|
Use GE limits from item stats
|
2020-02-24 15:02:47 -05:00 |
|
Owain van Brakel
|
d64d9b848d
|
Merge remote-tracking branch 'runelite/master'
|
2020-02-15 02:32:15 +01:00 |
|
dekvall
|
976ecd8f6b
|
hiscores: add nightmare boss
|
2020-02-13 07:13:12 +01:00 |
|
Owain van Brakel
|
491a7e76c4
|
Merge remote-tracking branch 'runelite/master'
|
2020-02-11 20:01:42 +01:00 |
|
Adam
|
4d5857214e
|
loot tracker: add pickpocket events
Co-authored-by: Daniel Cimento <daniel.cimento@mail.mcgill.ca>
|
2020-02-10 18:27:01 -05:00 |
|
Jason
|
5b0f6fe89d
|
Force WorldClient Http Rquests to ignore local OkHttp cache
|
2020-02-03 12:10:29 -05:00 |
|
Owain van Brakel
|
6d4e1ddf85
|
Merge remote-tracking branch 'runelite/master'
|
2020-01-23 12:57:53 +01:00 |
|
Adam
|
f6640844b5
|
Use wiki scraped npcs for npc healths
|
2020-01-22 09:18:29 -05:00 |
|
TheRealNull
|
d8a4196c76
|
plugins: add sounds service plugin
|
2020-01-20 23:48:48 -05:00 |
|