Commit Graph

893 Commits

Author SHA1 Message Date
Jeroen Ketelaar 47747f374d [CLEANUP] Added comments to Context class 2018-09-18 20:56:19 -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
Shadowrs 8a2255ac90 [Bugfix] Fix ServerDescription to use proper compare() to prevent conflict with matching names, authors and versions 2018-09-14 13:16:30 +01:00
Jeroen Ketelaar 788fe3e6c8 Merge pull request #254 from Shadowrs/feature/override-randoms
Feature/override randoms
2018-09-12 10:53:12 -05:00
Jak b50b0b3669 Merge branch 'development' into feature/override-randoms 2018-09-12 12:21:33 +01: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
Shadowrs e8af65335b Code style fixes 2018-09-12 00:59:46 +01:00
Jak c3817ffb74 Merge branch 'development' into feature/override-randoms 2018-09-12 00:57:28 +01: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
Shadowrs aec6196e01 Merge branch 'bugfix/zeroarg-callbacks' of github.com:shadowrs/Parabot into bugfix/zeroarg-callbacks 2018-09-10 12:21:09 +01:00
Shadowrs 295a096fa4 [BUGFIX] Fix print message naming inconsistency 2018-09-10 12:20:43 +01:00
Jak 05ea709aee Merge branch 'development' into feature/launch-by-uuid 2018-09-10 12:08:00 +01: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
Jak f567898072 Merge branch 'development' into feature/launch-by-uuid 2018-09-07 18:23:45 +01:00
Jak dfd5dca089 Merge branch 'development' into feature/allow-dupe-config-names 2018-09-07 18:17:32 +01:00
Shadowrs 3a91763a57 Code style fix 2018-09-07 17:59:27 +01:00
Shadowrs 32a3a013aa Improve comments 2018-09-07 13:51:59 +01: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
Shadowrs d98bab9c0c Restore previous constructor to ensure backwards compat 2018-09-05 13:15:10 +01:00
Shadowrs ca0d68ed08 Add an NPE catch wtih useful message 2018-09-05 10:40:58 +01:00
Shadowrs d609d7d8bb Add support for zero-arg callbacks 2018-09-05 10:06:37 +01:00
Shadowrs beeaebf323 Add waypoint methods for Applet pre init and post start 2018-09-04 22:21:07 +01:00
Shadowrs c60f808d12 NPE fix for getRandoms 2018-09-03 04:45:37 +01:00
Jak ff788b4309 Add support for customizable URL for randoms 2018-09-03 04:45:32 +01:00
Jeroen Ketelaar 69fc73ea97 Merge branch 'development' into feature/allow-dupe-config-names 2018-09-01 16:15:54 -05:00
Shadowrs 43cfd1b170 Code style fixes 2018-09-01 20:18:38 +01:00
Shadowrs b4ba5efb49 Brackets 2018-09-01 20:11:12 +01: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
Shadowrs 166eb9dbfb NPE Fix 2018-09-01 09:45:53 +01:00
Shadowrs 812e2daa3b Add -uuid flag as an alternative to -server quicklaunch arg 2018-09-01 09:45:44 +01:00
Jak 097a0bdf7b Fix ServerDesc comparitor to allow duplicate server names 2018-08-24 03:10:51 +01:00
Jeroen Ketelaar 3eaa11c0ec Merge branch 'development' into bugfix/labels 2018-08-14 12:33:30 -05:00
Jeroen Ketelaar 0c79df81eb [BUGFIX] Fixed yaml file for labels 2018-08-14 12:32:48 -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 e6605c4a75 [TASK] Added verbose line 2018-07-02 15:08:24 +02:00
Jeroen Ketelaar a2c94f9267 [BUGFIX] Added support for ImagePS 2018-07-02 15:06:39 +02: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 5d612762e9 [TASK] Added start parameter to docs 2018-01-03 11:06:53 +01:00
Jeroen Ketelaar 3f0d8d64fe [TASK] Added unit tests for the Timer class 2018-01-03 11:05:00 +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