Commit Graph
281 Commits
Author SHA1 Message Date
Alex 8cfa25a51b =Synchronized response String 2019-10-18 00:39:33 -04:00
Alex bbbb138f5e =Work on Music command 2019-10-18 00:36:20 -04:00
Alex 343308c433 Merge remote-tracking branch 'origin/master' 2019-10-13 23:23:53 -04:00
Rin 52fdaefe75 =Music updates and image sourcing 2019-10-13 23:23:44 -04:00
Matthew Cech a73fca7851 Merge branch 'hotfix/dance' 2019-09-12 22:15:34 -07:00
Matthew Cech ed6e8da2d8 = Fixed errors in dance 2019-09-12 22:14:59 -07:00
Matthew Cech bb67f72b98 + Added dance 2019-09-12 22:14:59 -07:00
Alex c29fb1dd1f =Fixed role case issue 2019-08-13 16:11:35 -04:00
Alex 5972408627 Merge branch 'develop' 2019-08-09 23:24:01 -04:00
Alex f3448fdc89 Merge remote-tracking branch 'origin/develop' into develop 2019-08-09 23:23:47 -04:00
Alex 2c486d7da1 =Config file bug fixes 2019-08-09 23:23:43 -04:00
Matthew Cech 81d56bec6a Merge remote-tracking branch 'origin/develop' into develop 2019-08-07 20:47:31 -07:00
Matthew Cech 31c5727d13 + Added fix for leader-board attempting to display non-existing user 2019-08-07 20:47:15 -07:00
Alex Stewart 81d3bd13b0 Merge remote-tracking branch 'origin/develop' into develop 2019-07-30 16:44:23 -07:00
Alex Stewart cd7f24d530 =Bug Fixes 2019-07-30 16:44:16 -07:00
Alex Stewart dd828282d3 =Work on Music integration 2019-07-30 14:50:20 -07:00
Alex Stewart 74ebd38fe5 =Added LavaPlayer dependency
LavaPlayer dependency for audio importing and sending through discord
2019-07-30 01:55:21 -07:00
Alex Stewart a62c10d06e +Started music integration
Voice channel join/disconnect
2019-07-30 01:19:34 -07:00
Alex Stewart 9cc703ab63 =Bug Fixes 2019-07-28 15:18:08 -07:00
Alex Stewart 3af46e94da Auto stash before merge of "develop" and "master" 2019-07-27 23:34:37 -07:00
Alex Stewart 7494696007 Merge branch 'master' into develop 2019-07-27 23:34:03 -07:00
Alex Stewart bbcd3d2b40 =Updated Roll Output
Made individual rolls visible
2019-07-26 23:17:53 -07:00
Alex Stewart d908751119 =Updated Roll Output
It pretty... er
2019-07-26 00:19:48 -07:00
Alex c9fdea2979 Merge branch 'develop' 2019-07-06 00:21:03 -04:00
Alex f9a73d880a Merge remote-tracking branch 'origin/master' into develop 2019-07-06 00:19:57 -04:00
Alex 97d6e843d6 Merge remote-tracking branch 'origin/develop' into develop 2019-07-03 03:28:36 -04:00
Alex 8daeedd1ce =Bug Fixes on Poll 2019-07-03 03:28:32 -04:00
Matthew Cech b0948303d1 = Correcting newline 2019-07-03 00:18:01 -07:00
Matthew Cech 15f3ca059f = Escape characters now honored 2019-07-03 00:14:46 -07:00
Matthew Cech 76e00a42dc Merge branch 'feature/plugin_reloading' into develop 2019-07-02 23:38:19 -07:00
Matthew Cech 5c21806db1 + Added lua hot reload functionality 2019-07-02 23:38:10 -07:00
Alex fbe9794026 =SubCommand Routine Mods, Hopefully the last of it 2019-07-03 01:47:21 -04:00
Alex 47441e06ed =More SubCommand Routine Mods 2019-07-03 01:40:10 -04:00
Alex 2f2474fde8 =SubCommand Routine modifications 2019-07-02 01:57:02 -04:00
Alex 2ac0ff99ef Merge remote-tracking branch 'origin/develop' into develop 2019-06-30 04:45:54 -04:00
Alex 6cb30174ad =Finished converting character to subcommand 2019-06-30 04:45:50 -04:00
Matthew Cech 953458cd74 Merge branch 'develop' 2019-06-30 01:15:10 -07:00
Matthew Cech 340b59a5e2 Merge branch 'feature/collapsed_configs' into develop 2019-06-30 01:12:20 -07:00
Matthew Cech 3c2ed7fedc + Added safety features 2019-06-30 01:12:09 -07:00
Matthew Cech 9563537db5 Merge branch 'feature/collapsed_configs' into develop 2019-06-30 00:43:28 -07:00
Matthew Cech c837e2f190 = Updated to mostly mitigate threading issue 2019-06-30 00:42:08 -07:00
Matthew Cech c4bc3e41d7 Merge remote-tracking branch 'origin/develop' into feature/collapsed_configs 2019-06-30 00:36:37 -07:00
Matthew Cech 4af5edadb8 - Removed old config files 2019-06-30 00:33:55 -07:00
Alex 6a709942ce =Started character subcommand routine and edited guildrole class names 2019-06-30 03:33:49 -04:00
Matthew Cech a2a213bbfd = Remerged and removed commands 2019-06-30 00:32:25 -07:00
Matthew Cech f1c0d8643a - removed commands config 2019-06-30 00:26:49 -07:00
Matthew Cech 87901ffd94 Merge remote-tracking branch 'origin/develop' into feature/collapsed_configs 2019-06-30 00:24:05 -07:00
Alex 0de91ab8f6 =Bug Fixes for general.commands package 2019-06-30 03:21:21 -04:00
Alex 392ba0e19c +Moved guildrole commands to subcommand routine 2019-06-30 03:20:46 -04:00
Matthew Cech 6d36ec0ade = Moved registration 2019-06-30 00:18:49 -07:00