Commit Graph
17932 Commits
Author SHA1 Message Date
Owain van Brakel 2054d65a83 Merge remote-tracking branch 'origin/master' 2022-05-01 23:40:53 +02:00
Owain van Brakel c48047217c project(mixins): More loginscreen mixins 2022-05-01 23:40:36 +02:00
Owain van Brakel 375fe7597f Merge pull request #3187 from open-osrs/login-screen 2022-05-01 15:12:48 +02:00
Owain van Brakel 284ff537b8 project(mixins): Ignore clicks outside login screen 2022-05-01 12:47:37 +02:00
Owain van Brakel 5d86065d25 project(bootstrap): Add back AA flags 2022-05-01 02:50:21 +02:00
Owain van Brakel de7aae5315 project: Oops v2 🤭 2022-05-01 01:45:45 +02:00
Owain van Brakel 07815c3d38 project: Oops? 2022-05-01 01:33:18 +02:00
Owain van Brakel dda9639976 Merge pull request #3183 from pure-sb/features/silent-annotation-adder 2022-04-30 23:15:22 +02:00
Owain van Brakel 85fb311096 Merge pull request #3186 from open-osrs/upstream-3004 2022-04-30 23:13:41 +02:00
Owain van Brakel 3e8e30a046 Merge pull request #3185 from open-osrs/shift-click 2022-04-30 23:11:36 +02:00
Owain van Brakel e0ef602c89 Merge remote-tracking branch 'runelite/master' 2022-04-30 23:07:22 +02:00
Owain van Brakel 67080d2174 project(mixins): Shiftclick drop 2022-04-30 23:06:24 +02:00
Owain van Brakel ea27e14d75 Merge pull request #3184 from open-osrs/rebuild-plugin-list 2022-04-30 22:55:30 +02:00
Burak 0e640d1415 externalmanager: temp fix hotswapping 2022-04-30 22:50:38 +02:00
EliasLahhamandAdam 1f5ca21546 menu entry swapper: add house teleport swap
This used to use the shift-click teleport spells option, but now that
there are 4 different teleport spells, a dedicated swap config is best.

Co-authored-by: Adam <Adam@sigterm.info>
2022-04-30 12:50:53 -04:00
Adam 1c99cce336 loottracker: fix tracking imp jars
event.getItemId() is not valid after the next tick, so can't be called in the inv change callback
2022-04-30 12:16:28 -04:00
Adam d04a261630 maven: update surefire plugin to 2.22.2 2022-04-30 10:03:43 -04:00
Adam cb20644145 script assembler: remove runelite-api dependency 2022-04-29 22:02:33 -04:00
Owain van Brakel a857e82b4d Merge remote-tracking branch 'runelite/master' 2022-04-30 02:03:53 +02:00
Owain van Brakel ba8811628b project(checkstyle): Oops 2022-04-30 02:01:04 +02:00
Owain van Brakel 7df799e173 project(externals): Make the external manager more robust 2022-04-30 01:58:56 +02:00
Owain van Brakel f41b93d94d project(ClientUI): Fix NPE 2022-04-30 01:58:27 +02:00
Pure ba6fade5ee project: Silent Annotation Adder 2022-04-29 22:59:17 +01:00
Owain van Brakel a159ab4a55 Merge remote-tracking branch 'origin/master' 2022-04-29 20:46:11 +02:00
Owain van Brakel 730f867b3e project(ui): Null check frame 2022-04-29 20:45:55 +02:00
Jordan Atwood a7c45ae401 HotColdLocation: Add South-east of Ruins of Ullek spot 2022-04-29 11:45:08 -07:00
Owain van Brakel 508dfbe0c3 Revert "project(mixins): Simplify this"
This reverts commit b34b708f66.
2022-04-29 20:43:16 +02:00
Owain van Brakel c7e8cabc4c Merge pull request #3180 from open-osrs/old-but-gold 2022-04-29 20:22:20 +02:00
Owain van Brakel 6c8454a5a1 project(version): Bump OpenOSRS version 2022-04-29 20:17:03 +02:00
Owain van Brakel 92779b5b35 project: ik haat smurfen en checkstyle 😠 2022-04-29 20:16:39 +02:00
Adam 62c0af064d crowdsourcing: don't include menuoptionclicked event in movementdata
Serializing the event no longer works as expected, but is also not a good idea in general
2022-04-29 14:16:02 -04:00
Owain van Brakel 6368c810b9 Merge remote-tracking branch 'origin/master' 2022-04-29 20:11:55 +02:00
Owain van Brakel 5d66d68ee5 Merge pull request #3181 from open-osrs/skippy-bal 2022-04-29 20:11:13 +02:00
Owain van Brakel 83a6992824 project: Checkstyle 2022-04-29 20:08:19 +02:00
Owain van Brakel 2b57952eb1 Merge pull request #3179 from Owain94/interpolation-blacklist 2022-04-29 20:07:48 +02:00
Owain van Brakel 1dd779cc29 Merge pull request #3178 from open-osrs/ehhh 2022-04-29 20:07:24 +02:00
Owain van Brakel 60d90a58d5 bootstrap: Skip injection-annotations 2022-04-29 20:06:43 +02:00
Owain van Brakel 8301be4d07 project(config): Add back a couple old config features 2022-04-29 19:51:35 +02:00
ThatGamerBlue ab891b425e fuck it 2022-04-29 16:20:39 +01:00
ThatGamerBlue 7488cc09fc Merge pull request #3176 from open-osrs/boostrap-fk
project(bootstrap): Update bootstrap task
2022-04-29 15:56:06 +01:00
Owain van Brakel 011027bc69 project(mixins): Update interpolation blacklist 2022-04-29 11:27:08 +02:00
Owain van Brakel b34b708f66 project(mixins): Simplify this 2022-04-29 09:17:46 +02:00
Owain van Brakel cc906918b9 Merge pull request #3177 from open-osrs/upstream-2904 2022-04-29 08:52:31 +02:00
Owain van Brakel a2cfd7b7dc project(mixins): Mixins 2022-04-29 08:31:49 +02:00
Owain van Brakel 96a5e68c15 project(mixins): Fix formatting 2022-04-29 08:28:57 +02:00
Owain van Brakel 936f83793d project: Fix merge 2022-04-29 08:28:20 +02:00
Owain van Brakel 53a4025245 Merge remote-tracking branch 'runelite/master' 2022-04-29 08:11:02 +02:00
Owain van Brakel 47d6286891 project: Force new launcher 2022-04-29 03:58:28 +02:00
Owain van Brakel ff6c8fee6c project: Update injection annotation version 2022-04-29 03:51:33 +02:00
Adam c40b33a1e9 Don't overwrite okhttp ua if already set
If the request has its own UA set, don't overwrite it with the default
RuneLite one. This has to be an interceptor and not a network
interceptor so that it runs prior to the okhttp BridgeInteceptor, which
is what sets the default okhttp ua.
2022-04-28 18:56:02 -04:00