6d363f3107
Merge branch 'development' into feature/override-randoms
2018-09-11 10:41:39 -05:00
6a627f00c1
Merge pull request #260 from Shadowrs/bugfix/zeroarg-callbacks
...
Bugfix/zeroarg callbacks
2018-09-11 10:40:56 -05:00
aec6196e01
Merge branch 'bugfix/zeroarg-callbacks' of github.com:shadowrs/Parabot into bugfix/zeroarg-callbacks
2018-09-10 12:21:09 +01:00
295a096fa4
[BUGFIX] Fix print message naming inconsistency
2018-09-10 12:20:43 +01:00
7571d84f9e
Merge branch 'development' into bugfix/zeroarg-callbacks
2018-09-09 18:26:48 -05:00
1c2c25e586
Merge branch 'development' into feature/override-randoms
2018-09-09 18:23:55 -05:00
8d9239c300
Merge pull request #252 from Shadowrs/feature/allow-dupe-config-names
...
Fix ServerDesc comparitor to allow duplicate server names
2018-09-09 18:22:32 -05:00
dfd5dca089
Merge branch 'development' into feature/allow-dupe-config-names
2018-09-07 18:17:32 +01:00
3a91763a57
Code style fix
2018-09-07 17:59:27 +01:00
32a3a013aa
Improve comments
2018-09-07 13:51:59 +01:00
c53853d359
Merge branch 'development' into feature/override-randoms
2018-09-05 22:34:44 -05:00
4b99935706
Merge pull request #258 from Shadowrs/feature/applet-waypoints
...
Add waypoint methods for Applet pre init and post start
2018-09-05 22:33:29 -05:00
d98bab9c0c
Restore previous constructor to ensure backwards compat
2018-09-05 13:15:10 +01:00
ca0d68ed08
Add an NPE catch wtih useful message
2018-09-05 10:40:58 +01:00
d609d7d8bb
Add support for zero-arg callbacks
2018-09-05 10:06:37 +01:00
beeaebf323
Add waypoint methods for Applet pre init and post start
2018-09-04 22:21:07 +01:00
c60f808d12
NPE fix for getRandoms
2018-09-03 04:45:37 +01:00
ff788b4309
Add support for customizable URL for randoms
2018-09-03 04:45:32 +01:00
69fc73ea97
Merge branch 'development' into feature/allow-dupe-config-names
2018-09-01 16:15:54 -05:00
b4ba5efb49
Brackets
2018-09-01 20:11:12 +01:00
04bab209da
Merge pull request #249 from Parabot/bugfix/labels
...
[BUGFIX] Fixed yaml file for labels
2018-09-01 11:52:46 -05:00
097a0bdf7b
Fix ServerDesc comparitor to allow duplicate server names
2018-08-24 03:10:51 +01:00
3eaa11c0ec
Merge branch 'development' into bugfix/labels
2018-08-14 12:33:30 -05:00
0c79df81eb
[BUGFIX] Fixed yaml file for labels
2018-08-14 12:32:48 -05:00
82f3224c36
Merge pull request #246 from Parabot/bugfix/method-error
...
[BUGFIX] Added support for ImagePS
2018-07-02 15:12:11 +02:00
e6605c4a75
[TASK] Added verbose line
2018-07-02 15:08:24 +02:00
a2c94f9267
[BUGFIX] Added support for ImagePS
2018-07-02 15:06:39 +02:00
52b758e9cb
Merge pull request #239 from Parabot/task/timer-unit-test
...
[TASK] Added unit tests for the Timer class
2018-01-03 22:28:45 +01:00
5d612762e9
[TASK] Added start parameter to docs
2018-01-03 11:06:53 +01:00
3f0d8d64fe
[TASK] Added unit tests for the Timer class
2018-01-03 11:05:00 +01:00
9d1c4533ca
Merge pull request #238 from Parabot/feature/timer-days
...
[Feature] Added days into Timer
2018-01-03 00:40:02 +01:00
2e1817d254
Merge branch 'feature/timer-days' of https://github.com/Parabot/Parabot into feature/timer-days
2018-01-02 23:28:05 +00:00
cc360f59e7
[TASK] Removed append
2018-01-02 23:27:53 +00:00
c24f03cfe6
Merge branch 'development' into feature/timer-days
2018-01-02 17:46:50 +00:00
6a6b7cd7da
[TASK] Moved to openjdk7
...
For some reason it was using oracle's jdk.
2018-01-02 17:41:22 +00:00
58d9e23094
[FEATURE] Added days into Timer
...
Credits to @parnassian
2018-01-02 17:32:45 +00:00
4162d4b032
Merge pull request #232 from Parabot/feature/randoms
...
[FEATURE] Added Randoms to Script
2017-11-29 18:22:38 +01:00
84816acd27
[FEATURE] Added Randoms to Script
...
Allows users to add randoms though scripts.
2017-11-28 21:42:06 +00:00
04ea26e70c
Merge pull request #230 from Parabot/bugfix/screenshots
...
[BUGFIX] Fixed height on screenshots
2017-11-21 13:25:23 +01:00
47570cbce0
[TASK] Removed random number
...
Also bumped version
2017-11-21 10:41:49 +00:00
610778597f
[BUGFIX] Fixed heigh on screenshots
2017-11-21 08:59:52 +00:00
6bb9dd32ec
Merge pull request #229 from JMapfel/development
...
[BUGFIX] A bug where the method node lookup didn't work
2017-09-26 23:56:38 +02:00
44625f7280
[BUGFIX] A bug where the method node lookup didn't work
...
The 'getMethod' method in the Invoker wrapper did only check the
descriptor of the parameters. To ensure that the right method is
returned, the full method desc must be used.
The return desc (the 'desc' element in the hooks file) is still optional,
but should be used to avoid conflicts.
2017-09-26 23:37:07 +02:00
4da3756f3e
Merge pull request #226 from Parabot/release/2.6.7
...
[MERGE] Release V2.6.7 into Development
2017-09-12 00:21:04 +02:00
7d9d2a2ea1
Merge branch 'development' of github.com:Parabot/Parabot into release/2.6.7
...
# Conflicts:
# src/main/java/org/parabot/core/asm/redirect/ThreadRedirect.java
# src/main/java/org/parabot/core/asm/redirect/ToolkitRedirect.java
2017-09-12 00:11:53 +02:00
f05226d32d
Merge pull request #225 from Parabot/bugfix/protected-domain
...
[BUGFIX] Added getProtectionDomain to ClassRedirect
2017-09-12 00:06:23 +02:00
a6b444572d
[BUGFIX] Added createImage with ImageProducer
2017-09-12 00:04:17 +02:00
bbe7496ecb
[BUGFIX] Granting access instead of blocking it
2017-09-12 00:00:07 +02:00
a7debba54b
[BUGFIX] Added getProtectionDomain to ClassRedirect
2017-09-11 23:57:24 +02:00
e335cfa835
Merge pull request #224 from Parabot/bugfix/travis-openjdk7
...
[BUGFIX] Set deployment requirement to openjdk7
2017-09-11 23:38:00 +02:00
Jeroen Ketelaar