zeruth
c68e4b2a47
api: develop
2021-01-25 15:18:43 -05:00
zeruth
d61c6b91a7
api: develop
2021-01-25 13:06:20 -05:00
zeruth
769e1aa342
Merge branch 'upstream-master' into runelite
...
# Conflicts:
# runelite-client/src/main/java/net/runelite/client/plugins/tearsofguthix/TearsOfGuthixOverlay.java
# runelite-client/src/main/java/net/runelite/client/plugins/tearsofguthix/TearsOfGuthixPlugin.java
2021-01-25 00:21:50 -05:00
wrightmalone
49138527f8
xp globes: add option to show virtual level in tooltip
...
Co-authored-by: Adam <Adam@sigterm.info >
2021-01-24 19:30:19 -05:00
Psikoi
d0bf05ddd9
hiscore panel: update boss icons
...
This uses a new boss icon set from Psikoi he made for wiseoldman
2021-01-24 16:39:01 -05:00
Adam
f6953f3bef
inventory tags: add fill tag option
...
This changes the display mode selector to be several separate options so
that users can select multiple, such as outline and fill.
Co-authored-by: Jordan <Nightfirecat@users.noreply.github.com >
Co-authored-by: 1jz <philipgolovin@gmail.com >
2021-01-24 16:23:57 -05:00
Adam
46434c304c
image util: simplify fillImage alpha check
2021-01-24 16:23:57 -05:00
Adam
8541ce6667
teamcapes: rewrite to use events
2021-01-24 15:11:58 -05:00
Christian Gati
68aacfa0bb
tears of guthix: add config for tears color
...
Add the ability to toggle green tears off and allow for both tear
colors to be changed
2021-01-24 10:43:23 -05:00
Adam
c9cd33a8dd
spec counter: add bone dagger, crossbow, and anchor
...
Co-authored-by: sdc6 <sdc6@aber.ac.uk >
2021-01-24 00:26:44 -05:00
zeruth
e2787027bd
Merge branch 'upstream-master' into runelite
2021-01-22 20:19:52 -05:00
Adam
5360bfd121
ground items: add despawn time for gwd instances
2021-01-22 14:42:42 -05:00
Adam
2653c7fada
plugin list panel: remove unused executor
2021-01-22 12:25:23 -05:00
Adam
321b976cf1
plugin hub panel: sort plugins by usercount
2021-01-22 12:25:23 -05:00
Jordan
e4e7d228d0
Merge pull request #12979 from akhtar-u/cooking
...
cooking: change sinceCut to sinceCooked to match plugin
2021-01-22 05:54:13 +00:00
Usman Akhtar
e0d258a6eb
plugins: Fix copied variable names
2021-01-21 21:45:09 -08:00
zeruth
9de8f81c42
Merge 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-client/pom.xml
# runelite-script-assembler-plugin/pom.xml
2021-01-22 00:41:31 -05:00
David
532ab45399
menu entry swapper: Add Spria to NPC Contact swap ( #13070 )
...
This commit also reformats the NPC Contact swap list to match the ingame
dialog.
2021-01-21 22:54:29 +00:00
Adam
857ac274ff
client: rename jogl/gluegen osx natives artifacts
...
gradle does not look at classifiers when doing dependency conflict
resolution, causing it to not correctly handle having multiple
dependencies of differing versions and classifiers. It picks the highest
version of any of the dependencies with the same groupId and artifactId
and uses that for every other dependency regardless of classifier.
This renames the osx natives artifacts to have a unique artifact name to
workaround this issue
2021-01-20 18:25:40 -05:00
Adam
97343fbd09
client: update discord dependency version
...
The osx native has been rebuilt to support older osx versions
2021-01-20 18:02:01 -05:00
TheRealNull
0147abf768
project: upstream
2021-01-20 12:04:14 -08:00
Runelite auto updater
bc3a95d7ab
Bump for 1.6.38-SNAPSHOT
2021-01-20 15:44:45 +00:00
Runelite auto updater
83790baf41
Release 1.6.37
2021-01-20 15:44:34 +00:00
Adam
48262fdc19
Merge remote-tracking branch 'abex/cache-code-pre-2021-1-20'
2021-01-20 10:21:39 -05:00
Max Weber
1bec513137
Update widget ids to 2021-1-20
2021-01-19 23:10:35 -07:00
Broooklyn
087da07648
chatcommands: Add Soul Wars Zeal command
2021-01-19 23:20:20 -05:00
Adam
19122e71c3
Use delomboked sources for javadoc generation
2021-01-19 21:28:51 -05:00
Adam
b12860b52d
chat notifier: restore original color when highlighting own name
2021-01-19 13:04:01 -05:00
Adam
239d58df72
client: update discord dependency version
...
The osx native has been rebuilt to be a universal library for both x64 and arm64
2021-01-18 19:08:52 -05:00
Adam
6d42e7ba42
client: update gluegen and jogl osx natives
...
The natives have been rebuilt to be universal libraries for both x64 and arm64
2021-01-18 17:00:28 -05:00
Joshua Kahn
3c7a638079
bank: Fix item container NPE ( #13082 )
2021-01-18 05:33:18 +00:00
Jordan
1b87f2153b
Merge pull request #13083 from Hydrox6/moveable-multicombat-2-revenge-of-classic
...
WidgetOverlay: Make Classic Resizeable Multicombat Indicator moveable
2021-01-17 21:30:07 -08:00
Jordan
8c8f92f1e9
Merge pull request #13019 from Nightfirecat/trailblazer-rewards
2021-01-17 17:42:37 -08:00
Hydrox6
0030306f4f
WidgetOverlay: Make Classic Resizeable Multicombat Indicator moveable
2021-01-18 01:40:43 +00:00
TheRealNull
0b54af2deb
client: add NPCStats
2021-01-16 20:05:31 -08:00
Patrick Pollock
703f06e154
loottracker: Track boosted hunter level for birdhouse loot ( #13068 )
2021-01-16 07:32:22 +00:00
TheRealNull
ca6b639ff9
Merge remote-tracking branch 'upstream/master' into runelite
2021-01-15 23:41:00 -08:00
TheRealNull
97481a5623
client: fix npe during first build
2021-01-15 22:47:41 -08:00
Abex
451012fb88
Merge pull request #13063 from MESLewis/farming-stages-fix
...
Fix growth stages of sweetcorn and watermelon
2021-01-15 13:26:18 -07:00
Adam
c997e175a5
world map: consolidate world map points into one
2021-01-15 14:00:36 -05:00
Morgan Lewis
6c50e7cb37
Fix growth stages of sweetcorn and watermelon
2021-01-15 11:57:37 -07:00
Usman Akhtar
4b87a08610
worldmap: Fix copper ore amount at battlefield mine ( #12802 )
2021-01-15 09:10:49 +00:00
Cyborger1
7835f27d6a
clues: Update Yanille anvil map clue description ( #12825 )
2021-01-15 07:22:43 +00:00
Kevin
9492f982ad
loottracker: Add opened bird nest ID to loot metadata ( #12936 )
2021-01-15 07:04:52 +00:00
Jordan
289f531e36
Merge pull request #12926 from Broooklyn/teleport-scroll-map
...
worldmap: add Watson teleport scroll location
2021-01-14 18:41:25 -08:00
jamesahhh
c81390fb75
menu swapper: Add Skull sceptre invoke swap ( #12944 )
2021-01-15 02:04:41 +00:00
Jordan
b205e8da1a
Merge pull request #13050 from Broooklyn/crabclaw-caves
2021-01-14 17:40:14 -08:00
TheRealNull
a2a295a054
Merge remote-tracking branch 'upstream/master' into runelite
...
Also pulled out a couple of our merged apis into our own classes. Getting much easier to keep up to date with their data
# Conflicts:
# .github/FUNDING.yml
# .github/workflows/CI.yml
# cache-client/pom.xml
# cache-updater/pom.xml
# cache/pom.xml
# cache/src/main/java/net/runelite/cache/fs/jagex/DiskStorage.java
# ci/build.sh
# http-api/pom.xml
# http-service/pom.xml
# http-service/src/main/java/net/runelite/http/service/chat/ChatController.java
# http-service/src/main/java/net/runelite/http/service/config/ConfigController.java
# http-service/src/main/java/net/runelite/http/service/config/ConfigService.java
# http-service/src/main/java/net/runelite/http/service/ge/GrandExchangeController.java
# http-service/src/main/java/net/runelite/http/service/ge/Trade.java
# http-service/src/test/java/net/runelite/http/service/config/ConfigServiceTest.java
# http-service/src/test/java/net/runelite/http/service/hiscore/HiscoreServiceTest.java
# pom.xml
# runelite-api/pom.xml
# runelite-api/src/main/java/net/runelite/api/Client.java
# runelite-api/src/main/java/net/runelite/api/ObjectID.java
# runelite-api/src/main/java/net/runelite/api/ParamHolder.java
# runelite-api/src/main/java/net/runelite/api/ParamID.java
# runelite-api/src/main/java/net/runelite/api/Preferences.java
# runelite-api/src/main/java/net/runelite/api/ScriptEvent.java
# runelite-api/src/main/java/net/runelite/api/ScriptID.java
# runelite-api/src/main/java/net/runelite/api/SettingID.java
# runelite-api/src/main/java/net/runelite/api/StructComposition.java
# runelite-api/src/main/java/net/runelite/api/StructID.java
# runelite-api/src/main/java/net/runelite/api/Varbits.java
# runelite-api/src/main/java/net/runelite/api/events/PlayerChanged.java
# runelite-api/src/main/java/net/runelite/api/events/PostStructComposition.java
# runelite-api/src/main/java/net/runelite/api/events/WidgetClosed.java
# runelite-api/src/main/java/net/runelite/api/events/WidgetHiddenChanged.java
# runelite-api/src/main/java/net/runelite/api/events/WidgetPositioned.java
# runelite-api/src/main/java/net/runelite/api/events/WorldChanged.java
# runelite-api/src/main/java/net/runelite/api/widgets/Widget.java
# runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java
# runelite-api/src/main/java/net/runelite/api/widgets/WidgetInfo.java
# runelite-api/src/main/java/net/runelite/api/widgets/WidgetModalMode.java
# runelite-api/src/test/java/net/runelite/api/plugins/combatlevel/CombatLevelOverlayTest.java
# runelite-client/pom.xml
# runelite-client/src/main/java/net/runelite/client/RuneLiteModule.java
# runelite-client/src/main/java/net/runelite/client/callback/Hooks.java
# runelite-client/src/main/java/net/runelite/client/plugins/config/PluginToggleButton.java
# runelite-client/src/main/java/net/runelite/client/plugins/customcursor/CustomCursor.java
# runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperConfig.java
# runelite-client/src/main/java/net/runelite/client/plugins/mta/alchemy/AlchemyRoomTimer.java
# runelite-client/src/main/java/net/runelite/client/plugins/tearsofguthix/TearsOfGuthixOverlay.java
# runelite-client/src/main/java/net/runelite/client/plugins/tearsofguthix/TearsOfGuthixPlugin.java
# runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldTableHeader.java
# runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldTableRow.java
# runelite-client/src/main/java/net/runelite/client/ui/ClientUI.java
# runelite-client/src/main/resources/net/runelite/client/runelite.properties
# runelite-client/src/main/scripts/OptionsPanelZoomUpdater.hash
# runelite-client/src/test/java/net/runelite/client/config/ConfigManagerTest.java
# runelite-client/src/test/java/net/runelite/client/plugins/chatcommands/ChatCommandsPluginTest.java
# runelite-client/src/test/java/net/runelite/client/plugins/chatfilter/ChatFilterPluginTest.java
# runelite-client/src/test/java/net/runelite/client/plugins/chatnotifications/ChatNotificationsPluginTest.java
# runelite-client/src/test/java/net/runelite/client/plugins/discord/DiscordStateTest.java
# runelite-client/src/test/java/net/runelite/client/plugins/grandexchange/GrandExchangePluginTest.java
# runelite-client/src/test/java/net/runelite/client/plugins/screenshot/ScreenshotPluginTest.java
# runelite-client/src/test/java/net/runelite/client/plugins/specialcounter/SpecialCounterPluginTest.java
# runelite-client/src/test/java/net/runelite/client/plugins/timers/TimersPluginTest.java
# runelite-client/src/test/java/net/runelite/client/util/ColorUtilTest.java
# runelite-script-assembler-plugin/pom.xml
2021-01-14 14:41:17 -05:00
Adam
7dae40daef
custom cursor: use cursor name for combobox labels
2021-01-13 22:02:20 -05:00
Adam
524ebee67d
config panel: fix combobox displayed size
...
The size was being computed from the enum names during the getPreferredSize() call due to not having the renderer set yet. Additionally the old prototype display value was not being used during this as it was not set yet, either.
2021-01-13 22:02:19 -05:00
