Commit Graph
240 Commits
Author SHA1 Message Date
James Munson 8c045dcb0f unused import
Signed-off-by: James Munson <jmunson@openpoll.io>
2019-06-25 22:01:49 -07:00
James Munson 847eb30d1f Removed useless mongo db
Signed-off-by: James Munson <jmunson@openpoll.io>
2019-06-25 21:19:21 -07:00
James Munson 87fdcee6f7 Update
Signed-off-by: James Munson <jmunson@openpoll.io>
2019-06-25 01:34:28 -07:00
James Munson f15068f448 Checkstyle?
Signed-off-by: James Munson <jmunson@openpoll.io>
2019-06-24 16:53:36 -07:00
James Munson 34cb26d29b Added house host to api
Signed-off-by: James Munson <jmunson@openpoll.io>
2019-06-24 14:24:34 -07:00
James Munson 9c9ce65ed8 Added cache control filter for later use
Signed-off-by: James Munson <jmunson@openpoll.io>
2019-06-24 12:01:16 -07:00
James Munson 64874e9e98 Fix travis
Signed-off-by: James Munson <jmunson@openpoll.io>
2019-06-24 11:39:36 -07:00
James Munson 9ee4320482 Added !layout
Signed-off-by: James Munson <jmunson@openpoll.io>
2019-06-24 05:30:26 -07:00
James Munson cd77f9b513 Update
Signed-off-by: James Munson <jmunson@openpoll.io>
2019-06-24 04:58:08 -07:00
James Munson 1754508b26 Update
Signed-off-by: James Munson <jmunson@openpoll.io>
2019-06-24 04:45:03 -07:00
James Munson b0c884eda1 Update http-service
Signed-off-by: James Munson <jmunson@openpoll.io>
2019-06-24 04:39:33 -07: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
Owain van Brakel 96cf696cee Merge remote-tracking branch 'runelite/master' 2019-06-05 19:51:04 +02: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
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
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
James Munson f6f1a4b7d0 Update 2019-04-24 17:22:23 -07: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
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
AdamandRobin Rijkeboer ee216e0c43 http api: update for beginner clues
Co-authored-by: Robin Rijkeboer <robin.rijkeboer@itonomy.nl>
2019-04-11 20:54:39 -04: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
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 5ba8f71b48 Merge pull request #7847 from deathbeam/swagger-static
Add Swagger static document generation
2019-03-14 16:07:17 -04:00
Lotto 046bdcc3e3 http-service: fix twitter feed links not working with newer theme
When using Twitter's new theme, https://twitter.com/statuses/[tweet_id] style links don't redirect to the tweet in question.

Urls before this change:
https://twitter.com/statuses/1102962117509087234

After this change:
https://twitter.com/OldSchoolRS/status/1102962117509087234
2019-03-05 18:59:04 +01:00
chivesrs 2427f61f37 Enable checkstyle on test sources 2019-03-04 14:56:46 -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
Tomas Slusny 29da9ecdc9 Merge pull request #8027 from deathbeam/redir-https
Change logged-in redir to redirect to HTTPS
2019-03-01 07:03:28 +00:00
Tomas Slusny 4a63f50abc Change logged-in redir to redirect to HTTPS
Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2019-02-27 20:06:29 +01:00
Tomas Slusny d92f1ccab8 Fix RequestMapping annotations in http-service
Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2019-02-26 16:22:08 +01:00
Tomas Slusny dc3b89a807 Add Swagger static document generation
Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2019-02-26 16:21:25 +01:00
Hydrox6 d92db797c3 Add account prompt to the OAuth URL 2019-02-26 15:04:13 +00:00
Adam b86061dc80 http service: remove ws service
This has been unused now for a few releases
2019-02-25 17:38:01 -05:00
Adam e4250c5d3b xptracker service: only update last_updated after hiscores are saved 2019-02-24 17:44:30 -05:00
Adam 3c1da4bb1e http service: disable spring jmx
Multiple api deployments is causing Spring to try to register the
datasources multiple times and is erroring
2019-02-21 08:51:39 -05:00
Adam 6186314dbc http service: fix overwriting all default message converters
The previous change to try and force GSON for serialization broke
default message converters such as text/plain. Change to use
extendMessageConverters and remove the Jackson converter instead.
2019-02-18 16:39:34 -05:00
Adam f62e7e3f14 config controller: add test 2019-02-18 16:39:01 -05:00
Adam aa5789b843 config service: split into service and controller 2019-02-18 16:38:36 -05:00
Adam c379e631d5 Merge branch 'spring-datasource' 2019-02-17 18:01:27 -05:00
Adam 38cdbfcb6b http service: use http-api gson instance 2019-02-17 17:59:54 -05:00