Commit Graph

480 Commits

Author SHA1 Message Date
Owain van Brakel
8dc54eb554 Merge remote-tracking branch 'runelite/master' 2019-07-19 00:27:10 +02:00
Runelite auto updater
44cf040cac [maven-release-plugin] prepare for next development iteration 2019-07-18 11:58:35 +00:00
Runelite auto updater
2d9b0204b2 [maven-release-plugin] prepare release runelite-parent-1.5.29 2019-07-18 11:58:29 +00:00
Jordan Atwood
41968c725f Remove unused Slf4j annotations and imports 2019-07-11 00:33:00 -07:00
sdburns1998
6db57328ef maven: dep update 2019-07-10 03:54:22 +02:00
Zeruth
f4b024804e Merge remote-tracking branch 'upstream/master' into runelite-master-1
# Conflicts:
#	runelite-api/src/main/java/net/runelite/api/Varbits.java
#	runelite-client/src/test/java/net/runelite/client/plugins/cluescrolls/clues/hotcold/HotColdTemperatureTest.java
2019-07-05 00:59:14 -04:00
Runelite auto updater
d7a1e51041 [maven-release-plugin] prepare for next development iteration 2019-07-04 13:01:18 +00:00
Runelite auto updater
4fd0fcab0f [maven-release-plugin] prepare release runelite-parent-1.5.28 2019-07-04 13:01:12 +00:00
Zeruth
e111b3aeae Revert "bringup to current runelite-master"
This reverts commit 74da8a883f.
2019-07-02 18:39:36 -04:00
Zeruth
74da8a883f bringup to current runelite-master 2019-07-01 18:10:13 -04:00
sdburns1998
8d77971c83 Merge remote-tracking branch 'runelite/master' into ihategitandihatethisihatemergingupstream 2019-06-29 01:08:56 +02:00
Kyleeld
c2f405cf8f Revert "Upstreamyboy" 2019-06-28 23:58:38 +01:00
sdburns1998
63664fbac7 chat commands: add ba high gamble command 2019-06-29 00:28:22 +02:00
Tyler Bochard
bebb8d8264 Update AnimationEndpoint.java
Test
2019-06-27 21:39:46 -04:00
Robert Alexander
8ee3e483f4 chat commands: add duel arena chat command 2019-06-27 21:38:55 -04:00
zeruth
219a25f3c3 Small DB fix 2019-06-27 18:01:32 -04:00
Jacob McElroy
8757d25bd3 chat commands: add ba high gamble command 2019-06-27 17:27:09 -04:00
zeruth
8543e13908 Adds animation endpoint 2019-06-27 17:14:30 -04:00
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
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
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