Commit Graph

6932 Commits

Author SHA1 Message Date
Adam
33988a72e1 Revert "Merge pull request #5890 from Nightfirecat/colored-ground-markers"
This reverts commit 72b3e4560d, reversing
changes made to 5a5de3d33f.
2019-03-06 14:53:59 -05:00
Adam
66bce610db Revert "Merge pull request #8070 from Nightfirecat/fix-ground-markers-bug"
This reverts commit b6cd739e61, reversing
changes made to 5bf4b37d17.
2019-03-06 14:53:45 -05:00
Adam
21bc06a13c Merge pull request #8088 from Adam-/xptracker-overall
xptracker: correct total xp per hour calculation
2019-03-05 20:15:50 -05:00
Adam
39a2272396 Merge pull request #8110 from trimbe/remove-on-leave
clanchat: remove activity in buffer in ClanMemberLeft as well
2019-03-05 20:15:13 -05:00
Tomas Slusny
274e5954d4 Merge pull request #8115 from WoneTooPhree/MediumClueEmoteLocation
Move Tai Bwo Wannai Emote location closer to STASH
2019-03-05 17:52:08 +00:00
WoneTooPhree
c3c090e76e Move Tai Bwo Wannai Emote location closer to STASH 2019-03-05 14:20:07 +01:00
trimbe
d9e3549923 clanchat: remove activity in buffer in ClanMemberLeft as well 2019-03-04 21:29:20 -05:00
Adam
259dc2b7d2 Merge pull request #8073 from chivesrs/master
Remove Monkey Madness I requirement from Kourend Diary.
2019-03-04 17:05:19 -05:00
Adam
ed4bea9bca Merge pull request #8051 from ShaunDreclin/daily-task-indicator-fix
Daily Task Indicator: Fix plugin not checking tasks when first enabled
2019-03-04 15:51:10 -05:00
Adam
5af01093bf Merge pull request #8077 from ShaunDreclin/rogues-den-update
Update Rogues' Den plugin to use ItemContainerChanged event
2019-03-04 15:25:06 -05:00
Adam
913fa30c84 Merge pull request #8080 from chivesrs/fix-checkstyle-errors
Fix CheckStyle issues and enable CheckStyle in test code.
2019-03-04 15:17:12 -05:00
chivesrs
2427f61f37 Enable checkstyle on test sources 2019-03-04 14:56:46 -05:00
Adam
2cf177688f Merge pull request #7904 from deathbeam/cleanup-spring-profiles
Properly use Spring profiles in http-service tests and main implementation
2019-03-04 14:01:34 -05:00
Tomas Slusny
f91412b33e Migrate Spring unit tests to spring profiles
Instead of replacing configuration with test configuration on classpath,
create test profile and use that.

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2019-03-04 19:25:54 +01:00
Tomas Slusny
52a862c43b Migrate SpringBootWebApplicationTest to spring profiles
- Instead of replacing configuration with dev configuration on classpath,
create dev profile and use that
- Move common properties to application.yaml

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2019-03-04 19:25:23 +01:00
Tomas Slusny
9838ae7e0f Fix SpringBootWebApplication auto-configuration annotation
The exclude is supposed to be on SpringBootApplication annotation,
otherwise IntelliJ Spring plugin errors, and also SpringBootApplication
already contains EnableAutoConfiguration.

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2019-03-04 16:13:39 +00:00
SebastiaanVanspauwen
e6d0e5e29c Clanchat: clear counter on login/connection lost instead of loading (#8068) 2019-03-04 10:01:07 +00:00
Adam
03db31de2f Merge pull request #8095 from trimbe/joinleave-rank-visibility
clanchat: respect rank icon config for join/leave messages
2019-03-03 21:00:56 -05:00
Adam
1da6dfef44 Merge pull request #8092 from trimbe/fix-joinleave-ranks
clanchat: retrieve rank from ClanMember rather than ClanManager
2019-03-03 21:00:41 -05:00
Adam
24bda9265a Merge pull request #6943 from TheStonedTurtle/PM-CC-Icons
Add CC icons to Public Chat & Private Messages
2019-03-03 20:58:29 -05:00
TheStonedTurtle
acb840cffb clanchat plugin: add CC rank icons to oublic and private messages 2019-03-03 20:53:56 -05:00
trimbe
9919cf5a76 clanchat: respect rank icon config for join/leave messages 2019-03-03 20:52:37 -05:00
trimbe
bb770a72b0 clanchat: retrieve rank from ClanMember rather than ClanManager
Ranks would be cached at the time of join/leave which was incorrect. Using the rank from ClanMember will always be correct and won't require the user to have spoken recently to cache their rank.
2019-03-03 20:17:19 -05:00
Adam
fff48acaac Merge pull request #8081 from chivesrs/use-junit-assert
Replace Java asserts in test code with JUnit asserts.
2019-03-03 20:17:14 -05:00
trimbe
e9597e85d8 mixins: use a ClanMember for ClanMemberJoined/Left 2019-03-03 20:17:03 -05:00
Chives
2d66f86ca0 Replace assert keyword with JUnit assert functions 2019-03-03 17:09:36 -08:00
Adam
5104b39758 Merge pull request #8064 from trimbe/clan-join-leave
clan chat: add temporary join/leave messages
2019-03-03 15:17:38 -05:00
Adam
fdbe75a486 clanchat plugin: add join/leave messages
Co-authored-by: trimbe <benno.tremback@gmail.com>
2019-03-03 15:05:28 -05:00
Adam
e5f9db4fb4 api: add methods to get clan owner and chat name
Co-authored-by: trimbe <benno.tremback@gmail.com>
2019-03-03 15:03:43 -05:00
Adam
facf438b50 api: add clan member join and leave events
Co-authored-by: trimbe <benno.tremback@gmail.com>
2019-03-03 15:03:43 -05:00
Adam
24003c69a7 api: add method to remove MessageNodes
Co-authored-by: trimbe <benno.tremback@gmail.com>
2019-03-03 15:03:43 -05:00
Adam
188bb70417 xptracker: use long for tracking overall xp 2019-03-03 14:41:17 -05:00
Adam
319ccb68e4 xptracker: use tracked overall xpstate to calculate total xp 2019-03-03 14:29:14 -05:00
Adam
615a9db968 xptracker: remove unused exception 2019-03-03 14:29:08 -05:00
Tomas Slusny
c44d8a96b7 Merge pull request #8082 from deathbeam/fix-supressions-xml
Update suppressions.xml dtd link to one that exists
2019-03-03 16:58:07 +00:00
Tomas Slusny
efa141cf86 Update suppressions.xml dtd link to one that exists
Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2019-03-03 11:05:27 +01:00
Tomas Slusny
ea61c75a07 Merge pull request #8066 from SebastiaanVanspauwen/clanchat-clanchanged
Clanchat: count players already in scene
2019-03-03 09:53:42 +00:00
chivesrs
ed764bd3be Update CheckStyle XML dtd link to one that exists (#8079) 2019-03-03 09:36:18 +00:00
Shaun Dreclin
616b604adf rogues den: Update plugin to use ItemContainerChanged event 2019-03-02 22:41:07 -05:00
Chives
ff43e3954a Remove Monkey Madness I requirement from Kourend Diary.
Creating the tablet does not require quest completion.
2019-03-02 15:59:59 -08:00
Adam
9b0bb2b732 runescape-api: make RSNameableContainer a generic type 2019-03-02 18:37:08 -05:00
Adam
cbd36ff379 Merge pull request #8049 from ShaunDreclin/music-track-indicator
Add Music Track Indicator plugin
2019-03-02 16:06:57 -05:00
Shaun Dreclin
f6e5ef1f3d client: Add Music Track Indicator plugin 2019-03-02 15:44:01 -05:00
Shaun Dreclin
cc210a3035 api: Add unlocked music tracks to VarPlayer 2019-03-02 15:44:00 -05:00
Shaun Dreclin
923c3bcd26 api: Add getKeys() to EnumComposition 2019-03-02 15:44:00 -05:00
Tomas Slusny
b6cd739e61 Merge pull request #8070 from Nightfirecat/fix-ground-markers-bug
ground markers: Fix marking non-marked tiles
2019-03-02 20:40:04 +00:00
Shaun Dreclin
6dec25aee4 api: Add EnumID class 2019-03-02 15:39:36 -05:00
Adam
5bf4b37d17 Merge pull request #8046 from Nightfirecat/fix-poh-groundmarkers
worldpoint: Fix plane value in toLocalInstance
2019-03-02 14:22:54 -05:00
Jordan Atwood
7e02694652 ground markers: Fix marking non-marked tiles
This fixes the bug introduced in runelite/runelite#5890 where attempting
to mark a non-marked tile while having the "Remember color per tile"
config disabled would prevent new tiles from being marked. Instead, it
properly ensures that unmarking tiles with that config disabled will not
re-mark it with an updated color, causing a second unmark to be needed.
2019-03-02 09:27:54 -08:00
Sebastiaan Vanspauwen
a4977abbf2 Clanchat: added onClanChanged event to count players already in scene 2019-03-02 14:08:43 +01:00