Commit Graph

555 Commits

Author SHA1 Message Date
sdburns1998
c85b2b1ebb Null check commits (#776) 2019-06-27 21:26:27 +01:00
Tyler Bochard
b3faba9edc Merge pull request #731 from f0rmatme/httplayout
Update http-service / API
2019-06-26 02:06:47 -04:00
James Munson
09939fc03f Change api base to runeliteplus
Signed-off-by: James Munson <jmunson@openpoll.io>
2019-06-25 23:01:15 -07:00
zeruth
5860d29351 Update XteaClient.java 2019-06-24 22:55:51 -04: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
ThatGamerBlue
0b0267b7ed Who needs tests anyway? 2019-06-24 21:58:42 +01:00
James Munson
26820175d9 removed http dumb test
Signed-off-by: James Munson <jmunson@openpoll.io>
2019-06-24 13:30:30 -07:00
James Munson
9ee4320482 Added !layout
Signed-off-by: James Munson <jmunson@openpoll.io>
2019-06-24 05:30:26 -07:00
ThatGamerBlue
f7aee1dfbf Fix HTTP API User-Agent (#729)
* Update RuneLiteAPI.java

* this is why you use an ide
2019-06-24 12:44:56 +01:00
ThatGamerBlue
32c791610a Auto-update RL api version (#725) 2019-06-24 03:36:54 -07:00
zeruth
30f5997d07 Update XteaClient.java 2019-06-23 18:37:32 -04:00
Ganom
8273420838 Fix Travis (#716) 2019-06-23 15:36:21 -07:00
zeruth
408071a6ae Fix API
yeah yeah yeah
2019-06-23 17:56:35 -04:00
zeruth
d0e3481bdf Revert "regression: fix api-reliant plugins (#715)"
This reverts commit 587f336938.
2019-06-23 17:45:12 -04:00
ThatGamerBlue
587f336938 regression: fix api-reliant plugins (#715) 2019-06-23 22:36:00 +02:00
Ganom
3388614767 Fix Travis (#714)
* Fix Travis

* Fix Travis

* Fix Travis

* Fix Travis
2019-06-23 21:01:25 +01:00
zeruth
3c02f5b9c8 Use our own http-service / http-api
Also starts scraping xtea keys :)
2019-06-23 05:51:52 -04:00
Lucas
9cc32a6307 Bump up version numbers 2019-06-20 19:05:13 +02:00
Runelite auto updater
9620a4fce6 [maven-release-plugin] prepare for next development iteration 2019-06-20 11:19:39 +00:00
Runelite auto updater
5b8d0e897f [maven-release-plugin] prepare release runelite-parent-1.5.27 2019-06-20 11:19:34 +00:00
PKLite
70f6d207ac Adds constructor for data retrieved from http api (just uses a blank username for now)
Signed-off-by: PKLite <stonewall@pklite.xyz>
2019-06-11 21:02:37 -04:00
PKLite
c5fd9e3a6d Merge branch 'master' into loot-tracker-update 2019-06-11 19:26:02 -04:00
PKLite
e7cffcc29c Merge branch 'master' of https://github.com/runelite-extended/runelite 2019-06-11 19:25:40 -04:00
Tyler Bochard
59ed075ddd Merge pull request #529 from runelite/master
bringup
2019-06-10 02:24:56 -04:00
PKLite
ede14db9b2 Automatically filters loot tracker loot to only show loot that the currently
logged in account has received and to show all loot from all accounts on
login screen

Signed-off-by: PKLite <stonewall@pklite.xyz>
2019-06-09 00:08:12 -04:00
PKLite
1af704c608 Revert to old project structure
Signed-off-by: PKLite <stonewall@pklite.xyz>
2019-06-08 01:08:58 -04:00
William Collishaw
462818aad7 Fix typo in 'sessionCheck' function name 2019-06-07 22:26:20 -06:00
zeruth
eafb024f16 Revert to old layout for refactor 2019-06-07 23:54:32 -04:00
zeruth
66cd539190 Various
Adds http-api for our session service
Also fixes HA values, for some reason GE values arent working, will look into.
2019-06-07 01:32:05 -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
Tyler Bochard
6567e4351d Merge pull request #476 from WilliamCollishaw/maven-plugin-upgrades
Maven plugin upgrades
2019-06-01 22:06:13 -04: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
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
zeruth
9c536ce939 Finished pre patch day merge 2019-05-23 01:39:15 -04:00
James Munson
7a2bd95f3b switch to our session endpoint 2019-05-20 20:40:04 -07:00
William Collishaw
ad8d2f00c4 Merge branch 'master' into maven-plugin-upgrades 2019-05-16 22:22:24 -06:00
Tomas Slusny
e4cd2bb0b9 Support specifying API endpoins via java props
- Add support fo specifying runelite.session.url java prop to be used
instead of RuneLite session base
- Add support fo specifying runelite.http-service.url java prop to be used
instead of RuneLite api base url
- Add support fo specifying runelite.ws.url java prop to be used
instead of RuneLite websocket url
- Add support for specifying runelite.static.url java prop to be used
instead of RuneLite s.r.n url

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2019-05-17 00:42:30 +02:00
Tomas Slusny
6071592e57 Change RuneLiteAPI#apiRoot to #sessionBase
- Rename apiRoot method to sessionBase method
- Move /session context path to sessionBase method

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2019-05-17 00:40:52 +02: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