ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity
10,600 Commits 1 Branch 0 Tags
93b1258080d46cdb731fe2c2eb48b6d8f3df0a86
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Owain van Brakel 93b1258080 Merge remote-tracking branch 'runelite/master' into 1508-merge 2019-08-15 19:49:55 +02:00
Owain van Brakel 8a2142242d Merge pull request #1341 from tomcylke/WHILST 
WHILST
 2019-08-15 11:14:24 +02:00
Owain van Brakel 2d654f9839 xptracker: Fix adding skill to canvas from skill tab (#1340) 2019-08-15 09:06:34 +01:00
Owain van Brakel 2c5fceb70f barrows: Remove chest value option (#1337) 2019-08-14 23:14:19 -04:00
Owain van Brakel 4903d04d6e config: Save textareas on debounce instead of on focus lost (#1317) 2019-08-13 21:35:54 -04:00
Owain van Brakel 2a248c3374 timetracking: Use localized time format (#1301) 
* 12 Hour Clocks AM/PM

* Added a 12 hour clock option instead of military time as this is a more common clock format.
* Added a config option to the time tracking plugin for the 12 hour clock for those that want 24 hour time.

* Update runelite-client/src/main/java/net/runelite/client/plugins/timetracking/TimeTrackingConfig.java

Verbage

Co-Authored-By: DropsOfSerenity <AmbientRevolution@gmail.com>

* Update runelite-client/src/main/java/net/runelite/client/plugins/timetracking/TimeTrackingConfig.java

Verbage

Co-Authored-By: DropsOfSerenity <AmbientRevolution@gmail.com>

* 12 Hour Clocks AM/PM

* Added a 12 hour clock option instead of military time as this is a more common clock format.
* Added a config option to the RuneLite config for the 12 hour clock for those that want 24 hour time.

* Don't change positions in timetrackingconfig.

* Fix Style Check

* Use Locale Default instead of a toggle for time formatting.

* Remove some imports

* Remove whitespace

* remove unused imports.

* Don't use * import

* Fix imports use ENGLISH for day name.

* Change to what was there before.

* Fix Import

* rename to getLocalizedDateTimeFormatter

* interim commit

* Initial working version.

* Bit of cleanup

* Checkstyle errors fixed.

* Don't do hacky char[] parsing.
 2019-08-13 21:04:50 -04:00
Owain van Brakel bd621269a6 gradle: Update deps, format files (#1316) 
* gradle: Update dependencies

Also made the version numbers global to make updating easier, also this
way we can't have mismatches where different projects use diffrent
versions of a dep

* cache: Fix TitleDumper test

* gradle: Format build files

* httpserviceplus: Remove unneeded deps
 2019-08-13 21:02:45 -04:00
Owain van Brakel 83717e76ed Merge remote-tracking branch 'runelite/master' into 1308-merge 2019-08-13 03:40:32 +02:00
Owain van Brakel 59ea9aa9c7 Merge remote-tracking branch 'Twiglet1022/bring-client-to-front' into bring-client-to-front 2019-08-11 21:33:31 +02:00
Owain van Brakel ff9933b5ea Merge remote-tracking branch 'upstream/master' into idlelele 2019-08-11 21:32:14 +02:00
Owain van Brakel d5c2ec5e42 idlenotifier: Refactor switch fallthrough and abstractions 2019-08-11 21:31:59 +02:00
Owain van Brakel 5a63dea300 Merge pull request #1298 from Owain94/scripts 
client/api: fix runscript
 2019-08-11 19:52:08 +02:00
Owain van Brakel 02cf62b881 client/api: fix runscript 2019-08-11 19:40:16 +02:00
Owain van Brakel 66f0c6aeb8 Merge remote-tracking branch 'origin/0908-merge' into 0908-merge 2019-08-11 05:19:59 +02:00
Owain van Brakel 8db4f83fa3 client: update splashscreen 2019-08-11 05:13:14 +02:00
Owain van Brakel 7777a5ff72 client: Change Maven string to Gradle 2019-08-11 02:33:28 +02:00
Owain van Brakel 8a8ece3c7a Merge remote-tracking branch 'runelite/master' into 0908-merge 2019-08-11 02:20:12 +02:00
Owain van Brakel b94f810962 Merge remote-tracking branch 'runelite/master' into 0908-merge 2019-08-10 03:37:36 +02:00
Owain van Brakel 08f84b5181 Merge remote-tracking branch 'runelite/master' into 0908-merge 
Conflicts:
	runelite-client/src/main/java/net/runelite/client/plugins/attackstyles/AttackStylesPlugin.java
	runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/item/AllRequirementsCollection.java
 2019-08-09 19:06:39 +02:00
Owain van Brakel b70140193a Merge remote-tracking branch 'runelite/master' into 0908-merge 2019-08-09 15:37:40 +02:00
Owain van Brakel 02c81a2a75 http-service: Add mapstruct annotation processor 2019-08-09 06:15:56 +02:00
Owain van Brakel 88fed77ba9 Merge remote-tracking branch 'upstream/master' into 0908-merge 2019-08-09 05:26:12 +02:00
Owain van Brakel a8ce254a7e ge_limits: Remove duplicate keys 2019-08-09 05:25:45 +02:00
Owain van Brakel 3a92e3b008 http-services(-pro): Add back http-service and move custom http-service 2019-08-09 05:22:26 +02:00
Owain van Brakel f85b1254cd Merge remote-tracking branch 'runelite/master' into 0908-merge 2019-08-09 04:40:35 +02:00
Owain van Brakel 8666de938c Merge remote-tracking branch 'runelite/master' into merge080802 2019-08-09 04:34:36 +02:00
Owain van Brakel b06ea47011 client: Remove images that were used for presence switching (#1269) 
* client: Remove images that were used for presence switching

* Update ClientUI.java

* Update FeedPanel.java

* Update Notifier.java
 2019-08-08 10:18:24 +01:00
Owain van Brakel 5f51d784c1 Merge remote-tracking branch 'runelite/master' 2019-08-08 05:10:53 +02:00
Owain van Brakel 45c691f845 Menus: Make comparable entries abstract for more specific .matc… (#1268) 
Menus: Make comparable entries abstract for more specific .matches()'s
 2019-08-05 19:36:27 +02:00
Owain van Brakel 5b52bbe8d4 theatre: Fix sote projectiles. (#1264) 
theatre: Fix sote projectiles.
 2019-08-05 19:33:26 +02:00
Owain van Brakel a23cb15ec6 blackjack: Swap blackjack back to priority system. (#1265) 
blackjack: Swap blackjack back to priority system.
 2019-08-05 19:32:58 +02:00
Owain van Brakel 769ed02ba4 config: Fix size issue on sliders (#1253) 2019-08-04 15:08:40 -04:00
Owain van Brakel 3307b8e767 (stoned)loottracker: Added missing bosses, skilling bosses and chests (#1248) 2019-08-04 15:08:11 -04:00
Owain van Brakel 59826b36d2 client: fix and enable tests (#1257) 
client: fix and enable tests

Co-authored-by: Owain van Brakel <owain.vanbrakel@gmail.com>
 2019-08-04 12:07:58 +02:00
Owain van Brakel 18144af1d2 pluginsorter: pastel colorscheme (#1255) 
pluginsorter: pastel colorscheme
 2019-08-04 12:07:46 +02:00
Owain van Brakel 0a17bc9574 slayer: Font Fix (#1249) 
slayer: Font Fix
 2019-08-04 11:48:10 +02:00
Owain van Brakel 1bc4ab5e52 gradle: Test build cache 2019-08-04 04:16:00 +02:00
Owain van Brakel 891218f94c Merge remote-tracking branch 'upstream/master' into plugin-manager-test 2019-08-04 04:06:15 +02:00
Owain van Brakel cbbacc6030 travis: gradle cache 2019-08-04 04:05:52 +02:00
Owain van Brakel 64b5c5b3a0 rs-client: Fix project for deob test (#1258) 
rs-client: Fix project for deob test
 2019-08-04 04:05:15 +02:00
Owain van Brakel c2b0a6ae56 travis: enable tests 2019-08-04 03:50:56 +02:00
Owain van Brakel 9650b8064b injector-plugin: Fix and run tests 2019-08-04 03:44:15 +02:00
Owain van Brakel 856146d4a5 chatfilterplugin: Fix tests 2019-08-04 03:32:39 +02:00
Owain van Brakel 8243a959d8 client-tets: Remove Ignore annotation 2019-08-04 03:29:46 +02:00
Owain van Brakel c5494b9aa1 itemskeptondeath: Fix tests 2019-08-04 03:16:02 +02:00
Owain van BrakelTheStonedTurtlenullTomas SlusnyAdamDaniel Bolink
 		445b1fb2a5 project: fix upstream merge (#1247) 
project: fix upstream merge

Co-authored-by: TheStonedTurtle <mgoodwin559@gmail.com>
Co-authored-by: null <ikada@protonmail.ch>
Co-authored-by: Tomas Slusny <slusnucky@gmail.com>
Co-authored-by: Adam <Adam@sigterm.info>
Co-authored-by: Daniel Bolink <dabolink@uvic.ca>
 2019-08-03 13:35:10 +02:00
Owain van Brakel 2358f76b5b raids thieving: update and fix (#1243) 
raids thieving: update and fix
 2019-08-03 13:34:35 +02:00
Owain van Brakel 990dcca9aa Merge remote-tracking branch 'runelite/master' 2019-08-03 13:20:01 +02:00
Owain van Brakel 2057fdfd41 statusorbs: Remove migrate code (#1237) 2019-08-02 21:00:36 +01:00
Owain van Brakel a62c485570 lootrecordwriter: Fix reading appended objects with new GSON version (#1239) 
* lootrecordwriter: Fix reading appended objects with new GSON version

* Add The Gauntlet boss tab

* Remove name from list upon deleting file

* Add hydra heads to boss tab

* Fix loot panel total value calculation
 2019-08-02 21:00:12 +01:00
Owain van Brakel 878e6a1fe6 menuentryswapper: move menuentryadded swaps to priority. (#1190) 
menuentryswapper: move menuentryadded swaps to priority.

Co-authored-by: Owain van Brakel <owain.vanbrakel@gmail.com>
 2019-08-02 14:11:39 +02:00
Owain van Brakel 2b1ad48fb6 Merge remote-tracking branch 'upstream/master' into priority-swaps 
Conflicts:
	runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperPlugin.java
 2019-08-02 14:02:00 +02:00
Owain van Brakel e2b7d1b9e0 Merge pull request #1214 from Ganom/projectile-update 
events: reduce projectilemoved usage as much as possible
 2019-08-02 13:46:38 +02:00
Owain van Brakel 9f0b678232 linecomponent: Fix items not being positioned correctly (#1219) 
* linecomponent: Fix items not being positioned correctly

* Revert "boosts: Separate icons so they aren't stacked (#1211)"

This reverts commit bcc75c1e94.
 2019-08-01 17:00:54 +01:00
Owain van Brakel 320862e96f http-api: fix api going down after runelite update (#1218) 
http-api: fix api going down after runelite update
 2019-08-01 16:02:59 +02:00
Owain van BrakelnullAbexRunelite auto updater
 		d44f12a5fd project: merge upstream and fix properties (#1217) 
project: merge upstream and fix properties

Co-authored-by: null <ikada@protonmail.ch>
Co-authored-by: Abex <mii7303@gmail.com>
Co-authored-by: Runelite auto updater <runelite@runelite.net>
 2019-08-01 15:09:18 +02:00
Owain van Brakel 0b51226f72 project: RL: 1.5.31-SNAPSHOT, RL+: 2.1.2.0 2019-08-01 14:57:13 +02:00
Owain van Brakel 69d3258e7b Merge remote-tracking branch 'runelite/master' into 0108-merge 2019-08-01 12:46:19 +02:00
Owain van BrakelandJordan Atwood e09eeb5748 rogues den plugin: Improve Rogue's Den overlay (#1212) 
This patch changes the Rogue's Den plugin to have a more guide-like
overlay, displaying the location of tiles to stand on, obstacles to
interact with, etc.

Co-authored-by: Jordan Atwood <jordan.atwood423@gmail.com>
 2019-07-31 23:29:54 -04:00
Owain van Brakel 8e47d9a48e Merge remote-tracking branch 'runelite/master' into 3107-merge 2019-07-31 16:19:02 +02:00
Owain van Brakel 9070f6c5ef Merge remote-tracking branch 'runelite/master' into 3107-merge 2019-07-31 08:03:28 +02:00
Owain van Brakel 9bbf160bab Apply suggestions from code review 
upstream: Merge suggested changes
 2019-07-29 09:13:57 +02:00
Owain van Brakel f55d36414e gradle: Close URLClassLoader to prevent leaking file locks 2019-07-28 22:16:53 +02:00
Owain van Brakel 75ef43cc0e client: Add back item tests (#1160) 
* Fix upstream merge

* mixins: Fix checkstyle

* client: Add back item tests

* discord: builder default
 2019-07-27 23:45:27 +01:00
Owain van Brakel eaf747ab66 eventbus: Add event interface 2019-07-27 22:30:04 +02:00
Owain van Brakel f7f539e245 eventbus: Subbing twice shouldn't be possible 2019-07-27 21:40:32 +02:00
Owain van Brakel 3fd16bbea1 gradle: update mockito 
Mockito-all is discontinued
 2019-07-27 08:04:55 +02:00
Owain van Brakel ff50dc5272 gradle: Skip specific tests 2019-07-27 08:04:27 +02:00
Owain van Brakel 0a4daac223 gradle: processTestResources 2019-07-27 08:04:19 +02:00
Owain van Brakel 8d1489254f gradle: Remove deprecated methods 2019-07-27 07:20:48 +02:00
Owain van Brakel 3c5c5f1996 Merge remote-tracking branch 'upstream/master' into slayer-v2 2019-07-26 00:59:39 +02:00
Owain van Brakel bbe287e2aa slayer: weakness overlay 2019-07-26 00:53:19 +02:00
Owain van Brakel 11e9528cf3 slayer: Fix weakness 2019-07-25 20:47:28 +02:00
Owain van Brakel 17b35205fd project: Fix deprecations and supress unchecked warnings 2019-07-25 20:34:09 +02:00
Owain van Brakel 481831359b Merge remote-tracking branch 'upstream/master' into checkstyle-gradle 2019-07-25 06:16:58 +02:00
Owain van Brakel 3249fe9e8c gradle: checkstyle changes 2019-07-25 06:16:30 +02:00
Owain van Brakel 1534ca47dd gradle: Enable deamon 
This does not work in intellij only when running from command line, it
only disabled the deamon on travis

This reverts commit 220e150ca1.
 2019-07-25 05:07:49 +02:00
Owain van Brakel 220e150ca1 gradle: Disable deamon 2019-07-25 04:26:59 +02:00
Owain van Brakel 9dbda2fff2 gradle: Parallel build 2019-07-25 03:03:43 +02:00
Owain van Brakel 55c8a8e0ee gradle: Some more build changes 2019-07-25 02:30:53 +02:00
Owain van Brakel af4c2ad6ae gradle: Update all deps 2019-07-25 01:37:17 +02:00
Owain van Brakel 17a8fae48c gradle: Versions Plugin 2019-07-24 23:55:04 +02:00
Owain van Brakel e911effeed gradle: Format build files 2019-07-24 23:51:35 +02:00
Owain van Brakel da159fd765 gradle: Update default jvm options 2019-07-24 22:46:27 +02:00
Owain van Brakel 0935b5f836 gradle: Remove default memory sizes 2019-07-24 22:28:16 +02:00
Owain van Brakel 89be222b31 gradle: Shaded jar 2019-07-24 22:27:27 +02:00
Owain van Brakel ec9c355ac1 travis: Don't chmod 2019-07-24 21:45:53 +02:00
Owain van Brakel f3a696a7d3 Merge remote-tracking branch 'upstream/master' into gradlelelelelelele 2019-07-24 21:45:27 +02:00
Owain van Brakel c3568cbe26 gradle: Add back gradlew 2019-07-24 21:45:12 +02:00
Owain van Brakel 50ffd80c02 travis: Update scripts 2019-07-24 21:35:25 +02:00
Owain van Brakel b94b9422cd gradle: Update to version 5.5.1 2019-07-24 21:05:41 +02:00
Owain van Brakel 442df22f4c gradle: TaskInternal.execute() has been deprecated 2019-07-24 20:46:55 +02:00
Owain van Brakel a0ecf6371a gradle: annotationProcessors 2019-07-24 19:40:34 +02:00
Owain van Brakel 92ac422b67 discord: builder default 2019-07-24 18:59:09 +02:00
Owain van Brakel f9b548bfbf slayer: dmm multiplier 2019-07-24 06:44:09 +02:00
Owain van Brakel 39e204307b timetracking: Null check panel 2019-07-24 06:22:03 +02:00
Owain van Brakel 7afe4f4db3 slayerplugin: Correct Jad and Zuk task tracking 2019-07-24 00:50:01 +02:00
Owain van Brakel b5124659bc stonedloottracker: Update plugin 
And fix that ugly reset icon in the regular loot tracker
 2019-07-23 23:10:35 +02:00
Owain van Brakel cb6eecfa29 Merge remote-tracking branch 'runelite/master' into rl-update 2019-07-23 21:52:16 +02:00
Owain van Brakel 678a45d1ce eventbus: Print stacktrace 2019-07-23 21:22:13 +02:00