3893 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Him188	f1efa0016b	Remove Suppress 'WRONG_MODIFIER_CONTAINING_DECLARATION'	2020-07-30 00:16:09 +08:00
Him188	dd35cc62d5	Fix #444: FriendMessageEvent is not a subclass of FriendEvent	2020-07-30 00:15:57 +08:00
Him188	c1d54f2fdf	Specify @file:JvmName("BotEventsKt") for types.kt	2020-07-30 00:14:49 +08:00
Him188	1a81fbd794	Merge remote-tracking branch 'origin/explicit-api' into dev ... # Conflicts: # gradle.properties	2020-07-29 23:59:19 +08:00
Him188	0f0dee4acd	Merge remote-tracking branch 'origin/dev' into dev	2020-07-29 13:55:24 +08:00
mzdluo123	ab501e01bc	Merge remote-tracking branch 'origin/dev' into dev ... # Conflicts: # mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/chat/receive/OnlinePush.PbPushGroupMsg.kt	2020-07-28 15:01:31 +08:00
mzdluo123	3eef29af80	fix #389	2020-07-28 14:59:55 +08:00
mzdluo123	a8841ef772	fix #389	2020-07-28 14:58:58 +08:00
mzdluo123	b320d2caed	try to fix #249 again	2020-07-28 14:55:14 +08:00
Him188	35477f8cab	Enable parallel gradle tasks	2020-07-27 14:11:30 +08:00
mzdluo123	2ec431489e	try to fix #249	2020-07-25 19:37:39 +08:00
Him188	4f86d15ef3	Simplify buildscript	2020-07-20 17:21:00 +08:00
Him188	719b5ac7b5	Explicit api mode	2020-07-20 15:06:30 +08:00
Him188	0a7ebffd95	Fix #428	2020-07-16 22:07:35 +08:00
Him188	58908d60b2	Merge remote-tracking branch 'origin/dev' into dev	2020-07-16 13:47:49 +08:00
Him188	d0377a360b	Add implementation notes	2020-07-16 13:47:33 +08:00
ryoii	c95306c12e	Fix BotJoinGroupEvent.Invite	2020-07-15 17:42:25 +08:00
ryoii	2f0ff513a2	Close #435, support FriendRecallEvent	2020-07-15 15:15:49 +08:00
ryoii	42716ab62d	Fix #375, broadcast BotJoinGroupEvent when create new group from other client	2020-07-12 12:02:32 +08:00
ryoii	de484ecb9a	Remove debug log	2020-07-12 11:42:21 +08:00
Him188	5784ba1070	Merge branch 'master' into dev	2020-07-11 21:18:10 +08:00
Him188	522bcba33e	Merge remote-tracking branch 'origin/dev' into dev	2020-07-11 21:16:45 +08:00
caihongming	1d0c3c2e3c	Fix #431	2020-07-11 21:16:30 +08:00
Him188	87eb212ab2	mirai code: Add tests for the message after last message element (#431)	2020-07-11 21:05:26 +08:00
mzdluo123	2ae91bb216	show ptt upload speed	2020-07-11 00:24:12 +08:00
mzdluo123	4b26d4d2c2	Merge remote-tracking branch 'origin/dev' into dev	2020-07-09 21:04:41 +08:00
mzdluo123	fab0378078	fix #360	2020-07-09 12:36:51 +08:00
Him188	5907133fa0	Update CHANGELOG.md	2020-07-09 01:39:33 +08:00
Him188	579b8da77d	Merge branch 'dev'	2020-07-09 01:32:33 +08:00
Him188	181f4a5312	1.1.0 released	2020-07-09 01:26:37 +08:00
Him188	46af55fcdf	Add @SinceMirai for MiraiProtocol	2020-07-09 01:13:41 +08:00
Him188	486a0dc5cb	Merge remote-tracking branch 'origin/fixGroup' into dev	2020-07-09 01:08:54 +08:00
Him188	2a91a229a3	Fix #417	2020-07-09 01:01:30 +08:00
mzdluo123	83ee69ccc6	fix some issue	2020-07-08 23:08:35 +08:00
ryoii	5929233cf9	Fix JvmMethodEventsTest.kt	2020-07-08 17:29:25 +08:00
ryoii	aa69f570d2	Close #370, ignore messages before group is initialized	2020-07-08 16:59:51 +08:00
ryoii	becc54dd42	Close #402	2020-07-08 16:51:16 +08:00
ryoii	a74e895c41	Fix #404, #410: Bot join group from other client	2020-07-08 15:48:17 +08:00
mzdluo123	5b80ccf49a	fix can't receive voice sent from tim pc	2020-07-08 12:21:47 +08:00
mzdluo123	a174f17493	finish fix tim pc	2020-07-07 23:56:21 +08:00
mzdluo123	90a7306822	try fix tim pc	2020-07-07 20:46:41 +08:00
mzdluo123	82faf7732c	try fix tim pc	2020-07-07 11:28:39 +08:00
mzdluo123	9494472cee	add: uploadPttTosServer to HighwayHelper.kt	2020-07-07 09:45:49 +08:00
mzdluo123	038c9d1db1	add: voice upload	2020-07-06 23:47:40 +08:00
mzdluo123	07d9365d70	fix: crash when get GroupActiveData	2020-07-04 14:18:18 +08:00
Him188	9892af5938	Merge pull request #418 from only52607/master ... add e-mirai	2020-07-04 04:44:41 +08:00
mzdluo123	2eac5ab607	android watch	2020-07-03 23:08:44 +08:00
Him188	a95acad028	Remove withJava() for IDE issue https://youtrack.jetbrains.com/issue/KT-39991	2020-07-03 16:52:34 +08:00
only52607	61610954f0	add e-mirai	2020-07-03 16:17:57 +08:00
Him188	9a57f35890	Support Nothing type for EventHandler; Add Java tests	2020-07-03 16:12:55 +08:00