Commit Graph
472 Commits
Author SHA1 Message Date
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
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