Commit Graph

15363 Commits

Author SHA1 Message Date
TheRealNull
9268998910 bootstrap: prep for launcher update 2021-01-17 14:41:57 -08:00
Tyler Bochard
ae43499467 Merge pull request #2900 from open-osrs/upstream
client: upstream
2021-01-15 21:20:58 -08:00
TheRealNull
ca6b639ff9 Merge remote-tracking branch 'upstream/master' into runelite 2021-01-15 23:41:00 -08:00
Tyler Bochard
cb5b9d9f63 Merge pull request #2899 from open-osrs/work-the-first-build
client: fix npe during first build
2021-01-15 20:41:08 -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
Tyler Bochard
402c386060 Merge pull request #2898 from open-osrs/upstream
project: upstream, fix git history, extract some of our api
2021-01-14 15:10:28 -05:00
TheRealNull
45e14bb756 ci: remove upstreams template (sneaky) 2021-01-14 14:58:08 -05: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
Tyler Bochard
30a1d6b7fd Update README.md 2021-01-14 13:07:59 -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
Adam
92013816b8 Shorten many config names to fit into side panel 2021-01-13 21:48:12 -05:00
Tyler Bochard
6e001f59d6 Merge pull request #2896 from buracc/dialog-events
events: Add Dialog events
2021-01-13 16:30:38 -05:00
Burak
ab46bcabe4 Add DialogProcessed event 2021-01-13 21:14:03 +01:00
Burak
62f4f0edd2 Merge pull request #2 from open-osrs/runelite
Runelite
2021-01-13 21:09:05 +01:00
Broooklyn
80c9d82bdd worldmap: fix Crabclaw Caves Tunnel (quest) WorldPoint 2021-01-13 14:15:02 -05:00
Broooklyn
a90d91421a agility: Add Crabclaw Caves obstacles 2021-01-13 14:14:09 -05:00
Adam
8cc7448f58 runelite config: enable custom chrome only on Windows 2021-01-13 10:58:17 -05:00
Jordan
43fc59b905 Merge pull request #12986 from Broooklyn/rock-cake
menu entry swapper: add dwarven rock cake swap
2021-01-12 12:14:57 -08:00
Jordan
957fff2164 Merge pull request #13028 from Broooklyn/soul-wars-itemstats
itemstats: Add Soul Wars Potion of Power and Bandages
2021-01-12 11:55:40 -08:00
Broooklyn
a26908cb6d itemstats: Add Soul Wars Potion of Power and Bandages 2021-01-12 14:28:25 -05:00
JZomerlei
3a1784c236 Update Quest Enum to latest cache (#12999) 2021-01-12 19:01:39 +00:00
Nick Wolff
f69f1af9b0 clues: Allow Dragon scimitar (or) for Falo the bard step (#13032) 2021-01-12 07:43:27 +00:00
Jordan
bc4357f717 Merge pull request #13027 from Broooklyn/spoils-of-war
loot tracker: Add Spoils of war (Soul Wars)
2021-01-11 23:42:40 -08:00
Nick
b9ee906d91 CrypticClue: Include Varrock armour in Head chef clue solution (#13029) 2021-01-12 07:36:10 +00:00
Abex
5f20e71bce Merge pull request #13020 from Nightfirecat/chatbox-text-input-ctrl-a
ChatboxTextInput: Select full message on ctrl+a
2021-01-11 20:40:13 -07:00
Abex
bacb0db3a0 Merge pull request #13021 from Nightfirecat/chatbox-text-input-left-right-improvement
ChatboxTextInput: Improve open selection left/right handling
2021-01-11 20:37:42 -07:00
Jordan
67a13ad573 Merge pull request #12415 from Broooklyn/mahogany-homes 2021-01-11 19:37:29 -08:00
Broooklyn
4edf1e19db worldmap: add Soul Wars minigame and teleport locations 2021-01-11 21:31:26 -05:00
Broooklyn
1caaf920fe worldmap: add Mahogany Homes minigame locations 2021-01-11 21:19:45 -05:00
Jordan Atwood
e5ccde56ed HotColdLocation: Fix Pirates' Cove spot
Ref: #9601
2021-01-11 15:53:11 -08:00
Zach
75042fc2a3 itemstats: Fix Zamorak brew defence drain amount (#12921) 2021-01-11 23:44:38 +00:00
Max Weber
58d53d1a62 runelite-api: add Preferences::getHideUsername() 2021-01-11 10:00:14 -05:00
TheRealNull
20eb55c8ac client: fix bootstrapping 2021-01-10 13:20:04 -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
TheRealNull
9cc854c051 resources: upstream 2021-01-10 11:08:44 -05:00
Adam
359b909d8e gpu: fix camera position
The position returned by getCameraX/Y/Z are not yet updated when this is
called, causing it to be from the previous frame's camera position.

This was introduced in 0fc1a94088 when the
uniform code was copied from draw.
2021-01-09 21:47:13 -05:00
Adam
266fee2067 config service: handle fromJson() returning null
Treat it the same as handling a json syntax exception
2021-01-09 17:12:05 -05:00
Adam
fa43ca94db npc highlight: revert fill color behavior
Prior to ab4cf1afe9 this already accepted an alpha color and so this introduced a behavior change when picking a color with alpha
2021-01-08 17:53:12 -05:00
Adam
4a214f9807 spec counter: add spec threshold notifications
This allows configuring spec thresholds which a notification will be sent for
when reached. Additionally it colors the infobox text red or green based on if
the threshold has been reached.

Co-authored-by: Dylan <dylanhe@gmail.com>
Co-authored-by: jgozon <47003557+jgozon@users.noreply.github.com>
2021-01-08 16:20:40 -05:00