ThatGamerBlue
f4580f37e0
Merge remote-tracking branch 'upstream/master' into runelite
...
# 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/Client.java
# runelite-api/src/main/java/net/runelite/api/FarmingTrackerTest.java
# runelite-client/pom.xml
# runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperConfig.java
# runelite-client/src/test/java/net/runelite/client/chat/ChatMessageManagerTest.java
# runelite-client/src/test/java/net/runelite/client/plugins/cluescrolls/ClueScrollPluginTest.java
# runelite-client/src/test/java/net/runelite/client/plugins/emojis/EmojiPluginTest.java
# runelite-client/src/test/java/net/runelite/client/plugins/grounditems/GroundItemsPluginTest.java
# runelite-client/src/test/java/net/runelite/client/plugins/idlenotifier/IdleNotifierPluginTest.java
# runelite-script-assembler-plugin/pom.xml
2021-02-14 00:31:56 +00:00
Max Weber
5de258310a
http-api: allow gsoning classes outside of net.runelite
...
This broke plugin hub plugins using our gson, which is valid since you
can reflect into any unnamed module.
2021-02-06 16:39:33 -05:00
zeruth
0c1f321473
Merge branch 'upstream-master' into runelite
...
# Conflicts:
# deobfuscator/src/test/java/net/runelite/deob/deobfuscators/gson/ColorTypeAdapterTest.java
# deobfuscator/src/test/java/net/runelite/deob/deobfuscators/gson/InstantTypeAdapterTest.java
# runelite-client/src/main/java/net/runelite/client/RuneLiteModule.java
2021-02-01 12:06:49 -05:00
Max Weber
2b3ce15516
don't use gson's reflection serialization on non RuneLite classes
...
java >=16 disallows access to most private fields which makes these
fail with the reflection type adapter
2021-01-30 11:24:18 -05:00
TheRealNull
5830575dcc
various: upstream and version bump
2021-01-10 12:20:13 -05:00
TheRealNull
e440cad52f
client: upstream
2021-01-10 12:08:49 -05:00
Adam
0f17ecdaea
http-api: add soul wars hiscores
2021-01-06 15:27:07 -05:00
TheRealNull
d57d190ef0
project: upstream to d314c0ecee
2020-12-28 16:09:17 -05:00
Adam
e3b75c8b7a
ge: submit buy limit reset time
2020-12-25 19:58:22 -05:00
Adam
9a322c70d0
ge: add trade seq number
...
Occasionally the trades are delivered out of order, this allows us to reassemble them in the correct order
2020-12-25 19:19:41 -05:00
therealunull
b54ff7f7db
openrune: just about finish rework, gets to login
2020-12-13 15:12:37 -05:00
Max Weber
e769ee0a7b
http-api, http-service, rl-client: bulk upload configuration changes
2020-11-25 22:29:35 -07:00
ImNoOSRS
0990182ac4
HTTP-API: Ignore snapshots for the runelite API.
...
As of now runelite doesnt support this link:
https://api.runelite.net/runelite-1.6.33-SNAPSHOT/worlds.js
When ignoring the SNAPSHOT version it takes the heighest version which isnt a snapshot.
2020-11-11 18:46:31 +01:00
Owain van Brakel
1cf50d54b1
project: Merge upstream
2020-10-21 12:57:38 +02:00
Adam
1799c9e593
loottracker: submit loot when not logged in
...
This is to aid the wiki drop log project. The data is not otherwise
stored.
2020-10-01 18:31:39 -04:00
ThatGamerBlue
06006bf7ae
Merge remote-tracking branch 'runelite/master'
2020-09-08 18:50:27 +01:00
Max Weber
431e09588b
specify utf8 encoding
...
this should fix the following known bugs:
- putting a U+2019 in the config causes it to become corrupted and
~double in size every launch
- scripts become assembled incorrectly and the nbsp after your name in
the chatbox becomes incorrect
- the feed panel doesn't show emoji
2020-08-28 21:58:08 -04:00
Owain van Brakel
6d342d7abc
Merge remote-tracking branch 'runelite/master' into master
2020-08-28 03:17:10 +02:00
Adam
30516b0bc3
Add Leagues hiscores and update icons for Trailblazer League
2020-08-25 10:44:53 -04:00
Adam
c9859f36b6
hiscore panel: fix lookup to run on edt
...
It modifies various fields in the ui and should be running on edt.
Additionally add a clear listener to reset the search state when the
input is cleared.
This requires changing the hiscore client to be async so that the
response can be properly applied on the edt
2020-08-23 11:54:36 -04:00
Hydrox
549dd89f8a
loottrackerclient: log when submitting loot isn't successful
2020-08-15 18:47:52 -04:00
Owain van Brakel
f7a055fa5a
Merge remote-tracking branch 'runelite/master'
2020-08-11 01:16:03 +02:00
leejt and Adam
18087ca9cc
loot tracker: add metadata field to loot record
...
This is for tracking miscellaneous data with the loot records, such as
npc id and skill levels, for the wiki drop log project.
Co-authored-by: Adam <Adam@sigterm.info >
2020-08-07 18:50:18 -04:00
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
ThatGamerBlue