Commit Graph

449 Commits

Author SHA1 Message Date
Lucas
9cc32a6307 Bump up version numbers 2019-06-20 19:05:13 +02:00
zeruth
eafb024f16 Revert to old layout for refactor 2019-06-07 23:54:32 -04:00
zeruth
882be3cb71 Merges Injector
Welcome to the new world boys.
2019-06-06 20:47:41 -04:00
sdburns1998
b85e5f6df7 Merge remote-tracking branch 'runelite/master' 2019-06-06 16:07:12 +02:00
Runelite auto updater
72468f251c [maven-release-plugin] prepare for next development iteration 2019-06-06 11:28:55 +00:00
Runelite auto updater
7f70523f80 [maven-release-plugin] prepare release runelite-parent-1.5.26 2019-06-06 11:28:49 +00:00
Owain van Brakel
96cf696cee Merge remote-tracking branch 'runelite/master' 2019-06-05 19:51:04 +02:00
Tyler Bochard
6567e4351d Merge pull request #476 from WilliamCollishaw/maven-plugin-upgrades
Maven plugin upgrades
2019-06-01 22:06:13 -04:00
William Collishaw
f1c8f380d9 Replace redundant StringBuilder append String.subString with append CharSequence 2019-06-01 13:46:56 -06:00
Ganom
f79543acfe Merge branch 'master' of https://github.com/runelite/runelite
# Conflicts:
#	runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java
#	runelite-client/src/main/java/net/runelite/client/game/ItemMapping.java
#	runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/EmoteClue.java
#	runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/MapClue.java
#	runelite-client/src/main/java/net/runelite/client/plugins/config/ConfigPanel.java
#	runelite-client/src/main/java/net/runelite/client/plugins/config/PluginListItem.java
#	runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperConfig.java
#	runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperPlugin.java
#	runelite-client/src/main/java/net/runelite/client/plugins/opponentinfo/HitpointsDisplayStyle.java
#	runelite-client/src/main/java/net/runelite/client/plugins/questlist/QuestListPlugin.java
#	runelite-client/src/main/java/net/runelite/client/plugins/timetracking/farming/FarmingTracker.java
#	runelite-client/src/main/java/net/runelite/client/ui/overlay/components/ProgressBarComponent.java
2019-05-30 13:26:28 -04:00
Runelite auto updater
ac19fd56b7 [maven-release-plugin] prepare for next development iteration 2019-05-30 11:09:43 +00:00
Runelite auto updater
0d3e7049cc [maven-release-plugin] prepare release runelite-parent-1.5.25 2019-05-30 11:09:37 +00:00
William Collishaw
3dbbbc1a37 Merge remote-tracking branch 'upstream/master' into maven-plugin-upgrades 2019-05-26 14:52:16 -06:00
Adam
4f82be9691 xtea service: fix bulk query returning duplicates
Some rows have backfilled times that are duplicates, causing the join to
join multiple rows. Assume ids only increment and fetch the row with the
highest id instead, and join on id.
2019-05-25 18:02:56 -04:00
Lucas
1a2be0c2b5 Merge remote-tracking branch 'orig_upstream/master' into master2
# Conflicts:
#	pom.xml
#	runelite-client/src/main/java/net/runelite/client/plugins/agility/Obstacles.java
2019-05-23 14:03:13 +02:00
Runelite auto updater
46f5a51477 [maven-release-plugin] prepare for next development iteration 2019-05-23 11:52:51 +00:00
Runelite auto updater
8be5d2c595 [maven-release-plugin] prepare release runelite-parent-1.5.24 2019-05-23 11:52:45 +00:00
William Collishaw
ad8d2f00c4 Merge branch 'master' into maven-plugin-upgrades 2019-05-16 22:22:24 -06:00
ThatGamerBlue
464f783da1 Merge branch 'master' of https://github.com/runelite/runelite into upstream 2019-05-16 13:20:11 +01:00
Runelite auto updater
5075547a8c [maven-release-plugin] prepare for next development iteration 2019-05-16 11:46:35 +00:00
Runelite auto updater
2e0050c644 [maven-release-plugin] prepare release runelite-parent-1.5.23 2019-05-16 11:46:29 +00:00
Lucwousin
6a3afa085b Use runeliteplus.properties for settings instead of runelite.properties (#240) 2019-05-13 10:46:41 +01:00
James
b69578d93d Update (#233)
* xp tracker: display >1m exp with thousandths precision

* fishing plugin: fix trawler timer with one tick left

* Remove gray pixel from Dragon Scimitar cursor (#8725)

* ui: add SplitComponent

SplitComponent is a component containing two other components, with the area split between the two, either horizontally or vertically.


Co-authored-by: Jasper Ketelaar <Jasperketelaar@kpnmail.nl>

* client: add smelting plugin

Co-authored-by: Adam <Adam@sigterm.info>

* constants: add GAME_TICK_LENGTH and use where needed

Also update many usages of 20ms to CLIENT_TICK_LENGTH

* regenmeter: add option to notify before next hp regen

* barrows plugin: add prayer drain timer

* chat: ensure queued messages are always cleared after adding

Mark queued message type as non null because addChatMessage will throw
if it is. This was causing the client to get stuck trying to add the
same broken message each loop.

* xp tracker: show on canvas

Co-authored-by: Jasper Ketelaar <Jasperketelaar@kpnmail.nl>

* party plugin: add partyinfo debug command

* xp tracker: add start and goal levels to on-canvas tracker

* xp tracker (onscreen): add toggle between displaying XP Left/XP Gained

* xp tracker: add right-click configure on on-screen trackers

* party service: check joins are for the current party

The server can resume party membership on handshake to parties other
than the current client party (eg. if the client is restarted or for any
other reason the current party changes). This desyncs otherwise if the
joins aren't checked to be in the current party.

* Add options for actions left and done for on screen XP

Add configurable option for on screen XP display mode, what now
includes:
- Actions done
- Actions left
- Xp gained
- Xp left

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>

* Update Merge branch

# Conflicts:
#	README.md
#	runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java
#	runelite-client/src/main/java/net/runelite/client/plugins/antidrag/AntiDragConfig.java
#	runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/BarbarianAssaultOverlay.java
#	runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/BarbarianAssaultPlugin.java
#	runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/Calls.java
#	runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/Game.java
#	runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/Wave.java
#	runelite-client/src/main/java/net/runelite/client/plugins/blastmine/BlastMineOreCountOverlay.java
#	runelite-client/src/main/java/net/runelite/client/plugins/inventoryviewer/InventoryViewerOverlay.java
#	runelite-client/src/main/java/net/runelite/client/plugins/smelting/SmeltingConfig.java
#	runelite-client/src/main/java/net/runelite/client/plugins/smelting/SmeltingOverlay.java
#	runelite-client/src/main/java/net/runelite/client/plugins/smelting/SmeltingPlugin.java
#	runelite-client/src/main/java/net/runelite/client/plugins/smelting/SmeltingSession.java
#	runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpInfoBoxOverlay.java
#	runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpTrackerPlugin.java
#	runelite-client/src/main/java/net/runelite/client/ui/overlay/components/ComponentOrientation.java
#	runelite-client/src/main/java/net/runelite/client/ui/overlay/components/SplitComponent.java

* client: use immutablemap for maps built in class initializers

* Merge branch 'master' of https://github.com/runelite/runelite into updateee

* Fix
2019-05-12 18:32:18 -06:00
William Collishaw
06ab54300a Merge branch 'master' into maven-plugin-upgrades 2019-05-02 17:49:41 -06:00
Runelite auto updater
412d97716e [maven-release-plugin] prepare for next development iteration 2019-05-02 11:37:15 +00:00
Runelite auto updater
8608484acc [maven-release-plugin] prepare release runelite-parent-1.5.22 2019-05-02 11:37:08 +00:00
William Collishaw
ffdea9835e Put all dependency versions shared over multiple modules into dependency management in the parent pom 2019-05-01 20:03:00 -06:00
William Collishaw
b4ed5f0da5 Upgrade Maven Plugin packages
Set maven package versions to variables and defining the variables in the parent pom when the package is used in multiple modules
Upgrade maven packages
Prevent trimming stack trace to maven surefire which caused newer versions to not display stacktrace in Netbeans.

Upgrade Maven jar plugin from 3.0.2 to 3.1.1
Upgrade Maven compiler plugin version from 3.6.1 to 3.8.0
Upgrade Maven checkstyle plugin version from 2.17 to 3.0.0
Upgrade Maven javadoc plugin from 3.0.0-M1 to 3.1.0
Upgrade Maven surefire plugin from 2.18 to 2.22
Upgrade Maven plugin api from 3.0.5 to 3.6.1
Upgrade Maven plugin annotations from 3.4 to 3.6.0
Upgrade Maven plugin plugin from 3.4 to 3.6.0
Upgrade Maven git commit id plugin from 2.2.5 to 2.2.6
Upgrade Maven jarsigner plugin from 1.4 to 3.0.0
Upgrade Maven resource plugin from 3.0.2 to 3.1.0
2019-05-01 13:36:11 -06:00
Runelite auto updater
6f6832df7e [maven-release-plugin] prepare for next development iteration 2019-04-25 11:41:28 +00:00
Runelite auto updater
c0d1a94bca [maven-release-plugin] prepare release runelite-parent-1.5.21 2019-04-25 11:41:22 +00:00
Jordan Atwood
5bebd34bbf WorldType: Fix HIGH_RISK world type name
This world type is not specifically a PVP world type; at the time of
this commit, world 365 is a non-PVP high-risk world, where the world is
the same as a regular members' world, except that the Protect Item
prayer is disabled.
2019-04-23 13:03:41 -07:00
Runelite auto updater
cf425ff105 [maven-release-plugin] prepare for next development iteration 2019-04-18 11:36:15 +00:00
Runelite auto updater
6ef9203bfb [maven-release-plugin] prepare release runelite-parent-1.5.20 2019-04-18 11:36:10 +00:00
Adam
412505a10f config service: fix not upserting documents when setting config keys 2019-04-14 18:09:44 -04:00
Adam
dd766b8700 config service: remove writing to sql 2019-04-13 11:32:09 -04:00
Adam
ee216e0c43 http api: update for beginner clues
Co-authored-by: Robin Rijkeboer <robin.rijkeboer@itonomy.nl>
2019-04-11 20:54:39 -04:00
Runelite auto updater
cced26ac24 [maven-release-plugin] prepare for next development iteration 2019-04-11 11:18:43 +00:00
Runelite auto updater
21a99a6e84 [maven-release-plugin] prepare release runelite-parent-1.5.19 2019-04-11 11:18:38 +00:00
Runelite auto updater
dc7bf8cf67 [maven-release-plugin] prepare for next development iteration 2019-03-28 12:02:46 +00:00
Runelite auto updater
b1c18fd18a [maven-release-plugin] prepare release runelite-parent-1.5.18 2019-03-28 12:02:40 +00:00
Adam
69c3341467 http-service: update mysql driver to mariadb 2.2.3 2019-03-24 11:44:54 -04:00
Tomas Slusny
d3c12157b0 Add development configuration for Spring http-service
- Remove spring boot test (no longer necessary)
- Move test development configuration to main package

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2019-03-24 11:44:54 -04:00
Tomas Slusny
b367e34202 Migrate OAuth callback to Spring configuration property
Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2019-03-24 11:44:54 -04:00
Adam
b50b3fc07b config service: return an empty config if no config is found
Returning an empty body breaks the client as it deserializes the
response to null.
2019-03-21 21:27:07 -04:00
Runelite auto updater
7af89342b4 [maven-release-plugin] prepare for next development iteration 2019-03-21 12:40:20 +00:00
Runelite auto updater
9979cf6818 [maven-release-plugin] prepare release runelite-parent-1.5.17 2019-03-21 12:40:14 +00:00
Adam
4ccefd23a4 config service: convert backing database to use mongodb
This is a much more natural fit for the config service which is really a
key value store, and has been abusing SQL. This will let us expand the
config stuff later to support profiles and per-account config values.

I have left in the SQL code for now so config changes are still being
sent there in the event of catastrophic mongodb failure.
2019-03-20 18:45:31 -04:00
Nathaniel Ngo
84009901cb Log whole HTTP response instead of just message (#8126)
Response message is usually either empty or not useful.

Closes #8042
2019-03-19 01:58:46 +01:00
Adam
11993150b3 news service: load news over https
https was not supported before, but it seems to be working now.
2019-03-17 15:33:51 -04:00
Adam
b98b7aebb9 travis: add openjdk11
Fix build for Java 11
2019-03-15 22:05:31 -04:00