Commit Graph
100 Commits
Author SHA1 Message Date
Jeroen Ketelaar ef9fe61304 Merge pull request #315 from Parabot/feature/int-array-values
[FEATURE] Added values view for int-array
2019-05-22 07:09:43 -05:00
Jeroen Ketelaar aab8d78d1e Merge pull request #311 from Parabot/bugfix/debug
[BUGFIX] Fixed null pointer on debug
2019-05-16 17:46:22 -05:00
Jeroen Ketelaar 93c9a9a3f2 Merge branch 'development' into bugfix/debug 2019-05-15 21:22:36 -05:00
Jeroen Ketelaar 97741d776c Merge pull request #313 from Parabot/master
[MERGE] Master into development
2019-05-15 21:22:25 -05:00
Jeroen Ketelaar 0b8d004ec0 Merge pull request #312 from Parabot/cleanup/script-selector
[TASK] Added link to Scripts page
2019-05-15 21:19:29 -05:00
Jeroen Ketelaar 14d8fc8a3c Merge branch 'master' into cleanup/script-selector 2019-05-15 19:25:39 -05:00
Jeroen Ketelaar eeb3aa4504 Merge branch 'development' into bugfix/debug 2019-05-15 19:25:37 -05:00
Jeroen Ketelaar 3dace1c148 Merge pull request #306 from Parabot/release/v2.8.1
[TASK] Updated to V2.8.1
2019-05-15 19:23:18 -05:00
Jeroen Ketelaar 4ae861154c Merge pull request #304 from Parabot/development
[RELEASE] Release of V2.8
2019-05-08 15:11:57 -05:00
Jeroen Ketelaar 87e38f51b8 Merge pull request #305 from Parabot/feature/hooks-authentication
[FEATURE] Added hooks authentication
2019-05-08 14:32:47 -05:00
Jeroen Ketelaar 10216349a6 Merge branch 'development' into feature/hooks-authentication 2019-05-08 14:29:13 -05:00
Jeroen Ketelaar 9c8b60e32e Merge branch 'master' into development 2019-05-08 13:00:32 -05:00
Jeroen Ketelaar 4f4e527a1c Merge pull request #303 from Parabot/task/thread-getId-redirect
[TASK] Added Thread#getId redirect
2019-05-08 09:11:08 -05:00
Jeroen Ketelaar e323628822 Merge pull request #302 from Parabot/task/default-argument-output
[TASK] Added System.err output if an unknown argument is given
2019-05-04 18:32:27 -05:00
Jeroen Ketelaar 4fa8d7c2b7 Merge branch 'development' into task/default-argument-output 2019-05-03 05:36:13 -05:00
Jeroen Ketelaar 18290760f8 Merge pull request #301 from Parabot/bugfix/thread-redirect-isInterrupted
[BUGFIX] Added Thread#isInterrupted redirect
2019-05-01 18:16:26 -05:00
Jeroen Ketelaar dd50834462 Merge pull request #300 from Parabot/bugfix/validity-check
[BUGFIX] Set to correct check
2019-05-01 12:50:58 -05:00
Jeroen Ketelaar 2b65c58b3c Merge branch 'development' into bugfix/validity-check 2019-05-01 04:50:52 -05:00
Jeroen Ketelaar 8ed6b96ac7 Merge pull request #296 from Parabot/release/v2.8
[RELEASE] Prepared for release of v2.8
2019-04-30 19:44:59 -05:00
Jeroen Ketelaar 795d228077 Merge branch 'development' into release/v2.8 2019-04-30 15:39:24 -05:00
Jeroen Ketelaar ee81e6f625 Merge pull request #299 from Parabot/feature/interface-map-getter
[FEATURE] Added InterfaceMap getter
2019-04-30 15:39:06 -05:00
Jeroen Ketelaar d0b6789bc7 Merge branch 'development' into release/v2.8 2019-04-30 13:33:19 -05:00
Jeroen Ketelaar ed0ad97cfc Merge branch 'development' into feature/interface-map-getter 2019-04-30 13:24:24 -05:00
Jeroen Ketelaar b7301969db Merge pull request #298 from Parabot/task/ping-faker
[TASK] Adjust Ping faker to use more believable results
2019-04-30 13:21:16 -05:00
Jeroen Ketelaar d2f2500c01 Merge pull request #292 from AlexanderBielen/issue-244/clear-cache-on-provider-update
Clear cache on provider update
2018-12-13 18:19:02 -06:00
Jeroen Ketelaar 0225997db8 Merge branch 'development' into issue-244/clear-cache-on-provider-update 2018-12-12 19:31:20 -06:00
Jeroen Ketelaar 3ac2a76b03 Merge pull request #295 from Shadowrs/bugfix/javafx-embed
Replace JavaFX-Application based UIs with FX-embedded-in-swing
2018-12-12 12:58:50 -06:00
Jeroen Ketelaar 1d57c1c67d Merge branch 'development' into issue-244/clear-cache-on-provider-update 2018-12-06 21:51:33 -06:00
Jeroen Ketelaar 930a23b558 Merge pull request #293 from AlexanderBielen/feature/add-hook-report-button
Add hook report button
2018-12-04 18:33:01 -06:00
Jeroen Ketelaar 3560d20101 Merge branch 'development' into issue-244/clear-cache-on-provider-update 2018-12-03 00:51:15 -06:00
Jeroen Ketelaar c5c920ba74 Merge pull request #291 from AlexanderBielen/issue-272/warn-wrong-version
Added bit version check at startup
2018-11-27 18:14:28 -06:00
Jeroen Ketelaar 8469746586 Merge pull request #290 from AlexanderBielen/issue-188/catch-hook-issues
Added catch for broken hooks - fix issue #188
2018-11-27 13:21:34 -06:00
Jeroen Ketelaar 33dda9aae5 Merge pull request #289 from AlexanderBielen/issue-288/fix-runtime-error
Fix for issue #288
2018-11-26 12:15:35 -06:00
Jeroen Ketelaar b699ee5806 Merge branch 'development' into issue-288/fix-runtime-error 2018-11-26 12:13:10 -06:00
Jeroen Ketelaar 34f62b956d Merge pull request #245 from PBLord/patch-1
Patch 1
2018-11-11 14:06:51 -06:00
Jeroen Ketelaar 3f199906e4 Merge pull request #285 from AlexanderBielen/feature/paint-utils
Added class with functions that are frequently used for making paints
2018-11-01 13:42:47 -05:00
Jeroen Ketelaar 2767b22707 Merge pull request #284 from AlexanderBielen/feature/minimum-conditional-sleep-time
Added conditional sleep with minimum timeout
2018-10-26 12:41:33 -05:00
Jeroen Ketelaar deb8dff696 Merge pull request #283 from Parabot/development
[RELEASE] v2.7
2018-10-24 17:48:42 -05:00
Jeroen Ketelaar aee0bff70b Merge branch 'master' into development 2018-10-22 22:22:17 -05:00
Jeroen Ketelaar d7f3e051a5 Merge pull request #282 from Shadowrs/docs
Docs for -debug
2018-10-17 23:38:52 -05:00
Jeroen Ketelaar 3624097a4c Merge pull request #266 from Shadowrs/various-fixes
Add optional flag for sending enter after sendKeys
2018-10-17 18:42:35 -05:00
Jeroen Ketelaar 7f13ea4406 Merge branch 'development' into various-fixes 2018-10-17 18:34:41 -05:00
Jeroen Ketelaar e9c307ec92 Merge pull request #280 from Parabot/cleanup/github
Cleanup/GitHub
2018-10-17 18:22:39 -05:00
Jeroen Ketelaar c7acf1dd41 Merge branch 'development' into cleanup/github 2018-10-17 18:18:51 -05:00
Jeroen Ketelaar c66306b4f9 Merge pull request #267 from Parabot/cleanup/context
[CLEANUP] Added comments to Context class
2018-10-17 18:18:36 -05:00
Jeroen Ketelaar 753234aff6 Merge branch 'development' into cleanup/github 2018-10-17 18:15:08 -05:00
Jeroen Ketelaar f7c87852b9 Merge branch 'development' into cleanup/context 2018-10-17 18:14:50 -05:00
Jeroen Ketelaar a85bc08c57 Merge pull request #255 from Shadowrs/feature/expand-progresslistener
Implements new internal api methods
2018-10-17 18:13:21 -05:00
Jeroen Ketelaar 99c30f7805 Merge branch 'development' into various-fixes 2018-10-16 18:29:30 -05:00
Jeroen Ketelaar dd2405a841 Merge branch 'development' into cleanup/context 2018-10-06 15:11:34 -05:00
Jeroen Ketelaar 6f8ea33338 Merge pull request #279 from Shadowrs/minor/getter
Add getter
2018-10-06 14:29:03 -05:00
Jeroen Ketelaar 341ef73378 Merge pull request #277 from Parabot/task/version-bump
[TASK] Version Bump
2018-09-24 13:34:32 -05:00
Jeroen Ketelaar 3f66d11bd9 Merge branch 'development' into various-fixes 2018-09-23 12:10:13 -05:00
Jeroen Ketelaar cf80bc781f Merge pull request #265 from Shadowrs/bugfix/server-desc-comparitor
[Bugfix] ServerDescription comparitor fix
2018-09-14 14:22:46 -05:00
Jeroen Ketelaar e9644c59dd Merge branch 'development' into feature/expand-progresslistener 2018-09-12 10:53:25 -05:00
Jeroen Ketelaar 788fe3e6c8 Merge pull request #254 from Shadowrs/feature/override-randoms
Feature/override randoms
2018-09-12 10:53:12 -05:00
Jeroen Ketelaar 5755dd454c Merge pull request #253 from Shadowrs/feature/launch-by-uuid
Feature/launch by UUID
2018-09-11 20:06:07 -05:00
Jeroen Ketelaar a20294075b Merge branch 'development' into feature/launch-by-uuid 2018-09-11 20:04:16 -05:00
Jeroen Ketelaar 990dc028af Merge pull request #234 from Parabot/cleanup/duplicated-class
[CLEANUP] Removed duplicated class
2018-09-11 10:50:01 -05:00
Jeroen Ketelaar 76c23801c2 Merge branch 'development' into cleanup/duplicated-class 2018-09-11 10:46:33 -05:00
Jeroen Ketelaar b520e8fe7c Merge branch 'development' into feature/launch-by-uuid 2018-09-11 10:41:52 -05:00
Jeroen Ketelaar 6d363f3107 Merge branch 'development' into feature/override-randoms 2018-09-11 10:41:39 -05:00
Jeroen Ketelaar 6a627f00c1 Merge pull request #260 from Shadowrs/bugfix/zeroarg-callbacks
Bugfix/zeroarg callbacks
2018-09-11 10:40:56 -05:00
Jeroen Ketelaar 7571d84f9e Merge branch 'development' into bugfix/zeroarg-callbacks 2018-09-09 18:26:48 -05:00
Jeroen Ketelaar 1c2c25e586 Merge branch 'development' into feature/override-randoms 2018-09-09 18:23:55 -05:00
Jeroen Ketelaar 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
Jeroen Ketelaar c53853d359 Merge branch 'development' into feature/override-randoms 2018-09-05 22:34:44 -05:00
Jeroen Ketelaar 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
Jeroen Ketelaar 69fc73ea97 Merge branch 'development' into feature/allow-dupe-config-names 2018-09-01 16:15:54 -05:00
Jeroen Ketelaar 1fcbae57e7 Merge branch 'development' into cleanup/duplicated-class 2018-09-01 12:02:24 -05:00
Jeroen Ketelaar 04bab209da Merge pull request #249 from Parabot/bugfix/labels
[BUGFIX] Fixed yaml file for labels
2018-09-01 11:52:46 -05:00
Jeroen Ketelaar 3eaa11c0ec Merge branch 'development' into bugfix/labels 2018-08-14 12:33:30 -05:00
Jeroen Ketelaar 82f3224c36 Merge pull request #246 from Parabot/bugfix/method-error
[BUGFIX] Added support for ImagePS
2018-07-02 15:12:11 +02:00
Jeroen Ketelaar 2b93a57774 Merge pull request #242 from Parabot/development
[MERGE] Development into master
2018-01-29 21:34:49 +00:00
Jeroen Ketelaar 2b9cde6cf8 Merge branch 'development' into cleanup/duplicated-class 2018-01-28 13:31:29 +00:00
Jeroen Ketelaar 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
Jeroen Ketelaar 9d1c4533ca Merge pull request #238 from Parabot/feature/timer-days
[Feature] Added days into Timer
2018-01-03 00:40:02 +01:00
Jeroen Ketelaar 4162d4b032 Merge pull request #232 from Parabot/feature/randoms
[FEATURE] Added Randoms to Script
2017-11-29 18:22:38 +01:00
Jeroen Ketelaar 04ea26e70c Merge pull request #230 from Parabot/bugfix/screenshots
[BUGFIX] Fixed height on screenshots
2017-11-21 13:25:23 +01:00
Jeroen Ketelaar 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
Jeroen Ketelaar 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
Jeroen Ketelaar f05226d32d Merge pull request #225 from Parabot/bugfix/protected-domain
[BUGFIX] Added getProtectionDomain to ClassRedirect
2017-09-12 00:06:23 +02:00
Jeroen Ketelaar 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 bf45dfb08d Merge pull request #223 from Parabot/bugfix/issue-222
[BUGFIX] Solving currentThread null return
2017-09-11 23:17:42 +02:00
Jeroen Ketelaar a51cd95aae Merge pull request #221 from Parabot/development
[MERGE] Development into master
2017-08-28 23:57:55 +02:00
Jeroen Ketelaar 2434c7f5ca Merge branch 'master' into development 2017-08-28 23:55:20 +02:00
Jeroen Ketelaar 9e7cabd1e3 Merge pull request #220 from Parabot/feature/automatic-maven-deployments
[FEATURE] Added integration for automatic deployment
2017-08-28 23:53:21 +02:00
Jeroen Ketelaar 7de1a7ea1a Merge pull request #216 from JMapfel/development
[BUGFIX] A bug where reflection method lookup did not work
2017-08-24 18:03:59 +02:00
Jeroen Ketelaar 071152d2f6 Merge pull request #214 from Parabot/development
[MERGE] Development into Master
2017-08-21 17:26:16 +02:00
Jeroen Ketelaar 703969bf56 Merge pull request #213 from Parabot/release/2.6.6
[RELEASE] Release of V2.6.6
2017-08-21 17:10:56 +02:00
Jeroen Ketelaar 68c16c592a Merge pull request #210 from Parabot/feature/alert-download
[FEATURE] Alert of new version
2017-06-01 01:23:57 +02:00
Jeroen Ketelaar 85c00e8880 Merge pull request #209 from Parabot/bugfix/screenshot-fix
[BUGFIX] Removed JFrame from screenshot
2017-05-16 23:19:14 +02:00
Jeroen Ketelaar 1337708a26 Merge pull request #208 from Parabot/bugfix/set-uncaught-exception-handler
[BUGFIX] Solves NoSuchMethodError for Thread
2017-05-13 01:32:09 +02:00
Jeroen Ketelaar 1bb3f1ae6c Merge pull request #207 from Parabot/bugfix/random-loop-run
[BUGFIX] Random loop run
2017-04-23 01:45:05 +02:00
Jeroen Ketelaar ed5b454260 Merge pull request #206 from Parabot/task/add-server-to-provider-download
Task/add server to provider download
2017-04-02 20:04:34 +02:00
Jeroen Ketelaar 16b05b7973 Merge pull request #199 from Parabot/bugfix/issue-198
[BUGFIX] Added desiredAssertionStatus
2017-03-05 21:02:44 +01:00
Jeroen Ketelaar 7ff3d9f8ab Merge pull request #192 from Parabot/bugfix/toolkitredirect-createimage
[BUGFIX] Avoiding screenshot creation
2017-02-22 23:35:21 +01:00
Jeroen Ketelaar e6c0219497 Merge pull request #187 from Parabot/bugfix/issue-185
[BUGFIX] Logger#addMessage
2017-02-18 13:30:35 +01:00
Jeroen Ketelaar abf4cbf25a Merge pull request #182 from Parabot/bugfix/getsystemprop
[BUGFIX] Replaced the output to verbose only
2017-02-17 14:23:37 +01:00
Jeroen Ketelaar 260eaa5491 Merge branch 'development' into bugfix/getsystemprop 2017-02-17 12:37:59 +01:00