Commit Graph

3349 Commits

Author SHA1 Message Date
Master Kwoth ef960da294 Merge pull request #449 from Tibo442/patch-1
Fix destruction of text channels being counted as creation of text channels
2016-07-25 23:39:54 +02:00
Tibo 6ee099023f Fix destruction of text channels being counted as creation of text channels 2016-07-25 23:33:34 +02:00
Kwoth bbf2789704 Still want logging to console, only not Writing to database. 2016-07-25 16:59:40 +02:00
Kwoth 96c204e077 ~woof added, thanks @Fiasc0 , #448 2016-07-25 14:41:21 +02:00
Kwoth a7618b1ee4 Animal Racing added ($race, $joinrace). Need to add betting to it. 2016-07-25 04:21:37 +02:00
Kwoth fce0da50f1 Merge branch 'music-rewrite' into dev 2016-07-24 18:02:01 +02:00
Kwoth ae85cfeed3 Merged branch dev into dev 2016-07-24 18:00:36 +02:00
Kwoth facf138bee ?! 2016-07-24 18:00:25 +02:00
Kwoth 922739be63 Now not prebuffering more than 100 megs of PCM data 2016-07-24 18:00:11 +02:00
miraai c3786156fd Merge pull request #4 from miraai/dev
Dev merge
2016-07-24 14:11:14 +02:00
Master Kwoth 5cf9b08239 Merge pull request #445 from miraai/dev
Linux Guide Update
2016-07-24 14:10:56 +02:00
miraai cafbadc0de Merge pull request #3 from miraai/master
Merged dev
2016-07-24 14:10:10 +02:00
miraai ac22e77831 Update LinuxSetup.md 2016-07-24 14:04:40 +02:00
miraai ee61362f85 Update LinuxSetup.md 2016-07-24 13:59:30 +02:00
Kwoth b9d81fb88a fixed trivia bug 2016-07-24 13:35:29 +02:00
Master Kwoth 32f37d4739 Update ComprehensiveGuide.md 2016-07-24 13:07:52 +02:00
Kwoth 7da0d2f573 Merge branch 'dev' of https://github.com/Kwoth/NadekoBot into dev 2016-07-24 13:02:43 +02:00
Kwoth 19d5a716b6 Added ffmpeg installers as a submodule 2016-07-24 13:02:13 +02:00
Kwoth 305a9a4a98 better error when ffmpeg is not found 2016-07-24 13:00:34 +02:00
Master Kwoth b68c9b8c1c Merge pull request #443 from Kwoth/master
Update ComprehensiveGuide.md
2016-07-24 02:39:12 +02:00
Master Kwoth ae0d325b47 Update ComprehensiveGuide.md 2016-07-24 02:38:12 +02:00
Kwoth a01ed97c6d allow unsafe 2016-07-24 01:28:43 +02:00
Kwoth 21b1778a1f unix timestamp extension 2016-07-24 01:28:23 +02:00
Kwoth 7b95ff5d08 forgot some awaits 2016-07-24 01:28:03 +02:00
Kwoth cb5079a384 mostly rewritten music, doesn't work on large number of concurrent streams properly >.> 2016-07-24 01:26:43 +02:00
Kwoth 6f29450aae Merge remote-tracking branch 'refs/remotes/origin/dev' into music-rewrite 2016-07-23 23:04:59 +02:00
Kwoth 1000934135 Merge remote-tracking branch 'refs/remotes/origin/master' into dev 2016-07-23 23:04:46 +02:00
Kwoth 92123fc95a Made permission saving async 2016-07-23 22:33:34 +02:00
miraai 6bf17e49b2 Merge pull request #2 from Kwoth/master
Updating fork
2016-07-23 22:31:16 +02:00
Kwoth 566cef82ba Now shows the correct position number when queuing a song 2016-07-23 15:18:05 +02:00
Kwoth 0820c17307 .ct command added to Utiliy module, prints current channe's topic 2016-07-23 15:10:35 +02:00
Kwoth e66615b056 Changed all locks to SemaphoreSlims, Slight musicbuffer changes. 2016-07-23 15:04:33 +02:00
Master Kwoth d40ac51757 Merge pull request #438 from Kwoth/dev
updated commandlist.md
2016-07-23 01:41:49 +02:00
Kwoth 106a779552 music commandlist updated 2016-07-23 01:40:44 +02:00
Master Kwoth 12134d1028 Merge pull request #437 from Kwoth/dev
0.99.9a
2016-07-22 21:30:17 +02:00
Kwoth c3bd1f5986 music usages fixed, 64bit release test 2016-07-22 20:50:57 +02:00
Kwoth 68a66e281e fixed error message when doing .iam, thanks PeaceLord<3 for debugging 2016-07-22 15:17:19 +02:00
Kwoth 8a9f6f4e26 .send is now correctly splitting on "|", not "-" (fixed .send) 2016-07-22 13:41:41 +02:00
Kwoth 9a6695cc90 changed submodule to point to my fork of discord.net 2016-07-22 13:26:05 +02:00
Kwoth bd2d0098e0 Print error to console when .iam throws an exception 2016-07-22 13:11:49 +02:00
Kwoth 1437f60d75 fixed -h for .send 2016-07-21 22:35:49 +02:00
Kwoth 31c4e315c6 Merge branch 'music-rewrite' into dev 2016-07-21 17:42:15 +02:00
Kwoth dfc710cb86 fixed "-h command name" when there is no alias 2016-07-21 14:07:58 +02:00
Kwoth 1195a4c9c8 resetting buffer? 2016-07-21 14:07:26 +02:00
Kwoth d69c783f3f @nadeko fire makes more sense now. 2016-07-21 13:23:22 +02:00
Kwoth ee415d166e string.join("" -> string.concat 2016-07-21 12:57:57 +02:00
Kwoth f1cf11ae8e ~trans now correctly translates multiple sentences at once. Thanks @Myoshu 2016-07-21 12:50:33 +02:00
Kwoth a8f33e5665 song queue full real fix 2016-07-21 12:42:48 +02:00
Kwoth c6af3a6c3e more musicplayer fixes/rewrites 2016-07-21 12:42:17 +02:00
Kwoth b506064d37 rewrite started 2016-07-21 02:13:16 +02:00