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
Max Weber
911893b710
cache/FrameDumperTest: Don't get the wrong framemaps for a frame
2019-07-03 08:45:24 -06: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
William Collishaw
83d2a7e58b
Clean up some instances of double white space
2019-06-30 10:19:49 -06: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
William Collishaw
8f302a1532
Replace use of deprecated Guava Files write method
2019-06-29 00:25:46 +02:00
William Collishaw
5025b6d5af
Replace use of deprecated Guava Files write method
2019-06-27 01:51:27 -06: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
Tyler Bochard
59ed075ddd
Merge pull request #529 from runelite/master
...
bringup
2019-06-10 02:24:56 -04:00
Lucas
9a4d37d7bb
Merge remote-tracking branch 'ext_upstream/master' into master3
...
# Conflicts:
# deobfuscator/pom.xml
# deobfuscator/src/main/java/net/runelite/asm/attributes/Exceptions.java
# deobfuscator/src/main/java/net/runelite/asm/attributes/annotation/Element.java
# deobfuscator/src/main/java/net/runelite/asm/attributes/code/InstructionType.java
# deobfuscator/src/main/java/net/runelite/asm/attributes/code/instruction/types/FieldInstruction.java
# deobfuscator/src/main/java/net/runelite/asm/attributes/code/instruction/types/LVTInstruction.java
# deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/PutField.java
# deobfuscator/src/main/java/net/runelite/asm/pool/Class.java
# deobfuscator/src/main/java/net/runelite/asm/pool/Field.java
# deobfuscator/src/main/java/net/runelite/deob/Deob.java
# deobfuscator/src/main/java/net/runelite/deob/DeobProperties.java
# deobfuscator/src/main/java/net/runelite/deob/clientver/VersionClassVisitor.java
# deobfuscator/src/main/java/net/runelite/deob/deobfuscators/lvt/LVTType.java
# deobfuscator/src/main/java/net/runelite/deob/deobfuscators/lvt/MapKey.java
# deobfuscator/src/main/java/net/runelite/deob/deobfuscators/mapping/ConstructorMapper.java
# deobfuscator/src/main/java/net/runelite/deob/deobfuscators/mapping/ExecutionMapper.java
# deobfuscator/src/main/java/net/runelite/deob/deobfuscators/mapping/Mapper.java
# deobfuscator/src/main/java/net/runelite/deob/deobfuscators/mapping/ParallelExecutorMapping.java
# deobfuscator/src/main/java/net/runelite/deob/updater/ParameterRenamer.java
# deobfuscator/src/test/java/net/runelite/asm/annotations/MyAnnotation.java
# deobfuscator/src/test/java/net/runelite/asm/execution/mapper/StaticStepTest.java
# deobfuscator/src/test/java/net/runelite/asm/execution/tests/TableSwitch.java
# deobfuscator/src/test/java/net/runelite/asm/signature/SignatureTest.java
# deobfuscator/src/test/java/net/runelite/asm/visitors/ClassFileVisitorTest.java
# deobfuscator/src/test/java/net/runelite/deob/TemporyFolderLocation.java
# deobfuscator/src/test/java/net/runelite/deob/clientver/ClientVersionTest.java
# deobfuscator/src/test/java/net/runelite/deob/deobfuscators/transformers/buffer/RuneliteBufferTest.java
# deobfuscator/src/test/java/net/runelite/deob/deobfuscators/unusedclass/ClassA.java
# deobfuscator/src/test/java/net/runelite/deob/deobfuscators/unusedclass/EmptyClass.java
# deobfuscator/src/test/java/net/runelite/deob/deobfuscators/unusedclass/EmptyInterface.java
# deobfuscator/src/test/java/net/runelite/osb/inject/FieldHook.java
# injected-client/pom.xml
# injector-plugin/pom.xml
# injector-plugin/src/main/java/net/runelite/injector/Inject.java
# injector-plugin/src/main/java/net/runelite/injector/InjectMojo.java
# injector-plugin/src/main/java/net/runelite/injector/InjectionException.java
# injector-plugin/src/main/java/net/runelite/injector/MixinInjector.java
# injector-plugin/src/main/java/net/runelite/injector/raw/ClearColorBuffer.java
# injector-plugin/src/main/java/net/runelite/injector/raw/DrawAfterWidgets.java
# injector-plugin/src/main/java/net/runelite/injector/raw/RasterizerHook.java
# pom.xml
# runelite-api/src/main/java/net/runelite/api/Actor.java
# runelite-api/src/main/java/net/runelite/api/Client.java
# runelite-api/src/main/java/net/runelite/api/CollisionData.java
# runelite-api/src/main/java/net/runelite/api/EquipmentInventorySlot.java
# runelite-api/src/main/java/net/runelite/api/NPCDefinition.java
# runelite-api/src/main/java/net/runelite/api/Perspective.java
# runelite-api/src/main/java/net/runelite/api/coords/WorldArea.java
# runelite-api/src/main/java/net/runelite/api/coords/WorldPoint.java
# runelite-api/src/main/java/net/runelite/api/events/GraphicChanged.java
# runelite-api/src/main/java/net/runelite/api/events/MenuOptionClicked.java
# runelite-api/src/main/java/net/runelite/api/events/NpcActionChanged.java
# runelite-api/src/main/java/net/runelite/api/events/PostItemDefinition.java
# runelite-api/src/main/java/net/runelite/api/events/SpotAnimationChanged.java
# runelite-api/src/main/java/net/runelite/api/vars/AccountType.java
# runelite-api/src/main/java/net/runelite/mapping/Construct.java
# runelite-api/src/main/java/net/runelite/mapping/Hook.java
# runelite-api/src/main/java/net/runelite/mapping/Implements.java
# runelite-api/src/main/java/net/runelite/mapping/ObfuscatedSignature.java
# runelite-client/src/main/java/net/runelite/client/game/ItemManager.java
# runelite-client/src/main/java/net/runelite/client/plugins/banktags/BankTagsPlugin.java
# runelite-client/src/main/java/net/runelite/client/plugins/barrows/BarrowsOverlay.java
# runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/ClueScrollPlugin.java
# runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/CrypticClue.java
# runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/MapClue.java
# runelite-client/src/main/java/net/runelite/client/plugins/cooking/CookingPlugin.java
# runelite-client/src/main/java/net/runelite/client/plugins/equipmentinspector/EquipmentInspectorPlugin.java
# runelite-client/src/main/java/net/runelite/client/plugins/examine/ExaminePlugin.java
# runelite-client/src/main/java/net/runelite/client/plugins/highalchemy/HighAlchemyOverlay.java
# runelite-client/src/main/java/net/runelite/client/plugins/instancemap/InstanceMapOverlay.java
# runelite-client/src/main/java/net/runelite/client/plugins/interfacestyles/InterfaceStylesPlugin.java
# runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/InventorySetupPlugin.java
# runelite-client/src/main/java/net/runelite/client/plugins/inventoryviewer/InventoryViewerOverlay.java
# runelite-client/src/main/java/net/runelite/client/plugins/loginscreen/LoginScreenPlugin.java
# runelite-client/src/main/java/net/runelite/client/plugins/multiindicators/MultiIndicatorsPlugin.java
# runelite-client/src/main/java/net/runelite/client/plugins/objectindicators/ObjectIndicatorsPlugin.java
# runelite-client/src/main/java/net/runelite/client/plugins/pvptools/PvpToolsPlugin.java
# runelite-client/src/main/java/net/runelite/client/plugins/pyramidplunder/PyramidPlunderOverlay.java
# runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/banked/CriticalItem.java
# runelite-client/src/main/java/net/runelite/client/plugins/wiki/WikiPlugin.java
# runelite-client/src/main/java/net/runelite/client/rs/ClientLoader.java
# runelite-client/src/main/java/net/runelite/client/ui/overlay/arrow/ArrowUtil.java
# runelite-client/src/main/java/net/runelite/client/util/PvPUtil.java
# runelite-client/src/test/java/net/runelite/client/plugins/cooking/CookingPluginTest.java
# runelite-mixins/src/main/java/net/runelite/mixins/RSAbstractIndexCacheMixin.java
# runelite-mixins/src/main/java/net/runelite/mixins/RSActorMixin.java
# runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java
# runelite-mixins/src/main/java/net/runelite/mixins/RSMessageMixin.java
# runelite-mixins/src/main/java/net/runelite/mixins/RSPlayerCompositionMixin.java
# runelite-mixins/src/main/java/net/runelite/mixins/RSTileMixin.java
# runescape-api/src/main/java/net/runelite/mapping/Implements.java
# runescape-api/src/main/java/net/runelite/mapping/ObfuscatedSignature.java
# runescape-api/src/main/java/net/runelite/rs/api/RSBufferProvider.java
# runescape-api/src/main/java/net/runelite/rs/api/RSClient.java
# runescape-api/src/main/java/net/runelite/rs/api/RSCollisionData.java
# runescape-api/src/main/java/net/runelite/rs/api/RSCombatInfo1.java
# runescape-api/src/main/java/net/runelite/rs/api/RSCombatInfoListHolder.java
# runescape-api/src/main/java/net/runelite/rs/api/RSDecorativeObject.java
# runescape-api/src/main/java/net/runelite/rs/api/RSFriendContainer.java
# runescape-api/src/main/java/net/runelite/rs/api/RSGameShell.java
# runescape-api/src/main/java/net/runelite/rs/api/RSGroundObject.java
# runescape-api/src/main/java/net/runelite/rs/api/RSItem.java
# runescape-api/src/main/java/net/runelite/rs/api/RSItemLayer.java
# runescape-api/src/main/java/net/runelite/rs/api/RSIterableNodeDeque.java
# runescape-api/src/main/java/net/runelite/rs/api/RSJagexLoginType.java
# runescape-api/src/main/java/net/runelite/rs/api/RSKeyHandler.java
# runescape-api/src/main/java/net/runelite/rs/api/RSMainBufferProvider.java
# runescape-api/src/main/java/net/runelite/rs/api/RSMapElementConfig.java
# runescape-api/src/main/java/net/runelite/rs/api/RSMessage.java
# runescape-api/src/main/java/net/runelite/rs/api/RSMessageNode.java
# runescape-api/src/main/java/net/runelite/rs/api/RSModel.java
# runescape-api/src/main/java/net/runelite/rs/api/RSPlayerComposition.java
# runescape-api/src/main/java/net/runelite/rs/api/RSRasterProvider.java
# runescape-api/src/main/java/net/runelite/rs/api/RSSequenceDefinition.java
# runescape-api/src/main/java/net/runelite/rs/api/RSSpritePixels.java
# runescape-api/src/main/java/net/runelite/rs/api/RSWallObject.java
# runescape-api/src/main/java/net/runelite/rs/api/RSWorldMap.java
2019-06-08 23:06:59 +02:00
Tomas Slusny
1eb68559e4
Merge pull request #9057 from WilliamCollishaw/fix-getProperties-typo
...
Fix typo in 'getProperties' function name
2019-06-08 22:52:51 +02:00
zeruth
e4d6e9fe13
Port Injector to main layout
...
Adds deobfuscator
Adds injected-client
Adds injector-plugin
Adds runescape-client
Replaces RL's apis
Small bug with sprites atm, will be resolved soon. tired af.
Builds, probably
2019-06-08 05:43:03 -04:00
William Collishaw
1733147195
Fix typo in 'getProperties' function name
2019-06-07 22:26:50 -06:00
William Collishaw
e88e2cdf85
Fix typo in 'dumpJson' function name
2019-06-07 22:24:15 -06: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
531546e3a0
Remove redundant subString endindex .length() calls
2019-06-01 13:19:15 -06: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
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
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
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
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
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
Adam
ed8a24b069
cache: datafile: simplify next sector calculation
2019-04-06 13:43:11 -04: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
Zeruth