Commit Graph

1642 Commits

Author SHA1 Message Date
Him188
817f3b02a1 Name device as mirai 2020-01-29 23:53:01 +08:00
jiahua.liu
32f5eb1966 设备锁 2020-01-29 23:26:05 +08:00
jiahua.liu
7bc63b7e9a Merge remote-tracking branch 'origin/master'
# Conflicts:
#	mirai-core/src/commonMain/kotlin/net.mamoe.mirai/utils/cryptor/ECDH.kt
2020-01-29 23:07:59 +08:00
jiahua.liu
231def49fc SubCommand20 2020-01-29 23:07:40 +08:00
Him188
4c79081b12 Enhance c2s 2020-01-29 23:07:16 +08:00
Him188
6d2d6bec35 Enhance printTLVMap 2020-01-29 21:59:55 +08:00
Him188
27f52e6b07 Uint type 2020-01-29 21:58:43 +08:00
Him188
a5995007eb Enhance debugger tools 2020-01-29 21:53:49 +08:00
jiahua.liu
aefe39eaf4 Merge branch 'master' of https://github.com/mamoe/mirai 2020-01-29 21:53:01 +08:00
jiahua.liu
c094aba06e loginpacket correction 2020-01-29 21:52:41 +08:00
Him188
fb1b37520b Enhance debugger tools 2020-01-29 21:52:22 +08:00
Him188
47e02cd2f1 Fix build 2020-01-29 21:06:31 +08:00
jiahua.liu
d28b37bbca Merge remote-tracking branch 'origin/master'
# Conflicts:
#	mirai-core-qqandroid/src/jvmTest/kotlin/androidPacketTests/serverToClient.kt
2020-01-29 20:48:41 +08:00
jiahua.liu
9516c30862 loginpacket correction 2020-01-29 20:47:51 +08:00
Him188
21187a0a34 Fix build 2020-01-29 20:41:16 +08:00
Him188
aca71d0c96 Fix build 2020-01-29 20:37:45 +08:00
Him188
ac52cbb47e Do fix 2020-01-29 20:30:20 +08:00
Him188
1cd1a19dbe Fast-fail check 2020-01-29 20:21:53 +08:00
jiahua.liu
625d48f3a5 Merge remote-tracking branch 'origin/master' 2020-01-29 20:19:08 +08:00
jiahua.liu
171bbfc861 loginpacket correction 2020-01-29 20:18:52 +08:00
jiahua.liu
7b12a541a2 loginpacket correction 2020-01-29 20:18:27 +08:00
jiahua.liu
b2542cd6bf Merge remote-tracking branch 'origin/master'
# Conflicts:
#	mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/chat/data/MsgSvc.kt
#	mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/chat/receive/MessageSvc.PushNotify.kt
#	mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/login/LoginPacket.kt
#	mirai-core-qqandroid/src/jvmTest/kotlin/androidPacketTests/clientToServer.kt
2020-01-29 20:17:20 +08:00
Him188
7d06b49839 Add C2cMessageSyncData 2020-01-29 20:16:10 +08:00
jiahua.liu
01c478e4f5 MsgSvc data packets 2020-01-29 20:13:33 +08:00
Him188
5ae4296bd5 Fix PlatformSocket on Android 2020-01-29 20:12:47 +08:00
Him188
a79032e8cd Merge remote-tracking branch 'origin/master' 2020-01-29 19:54:31 +08:00
Him188
6a8e6b93a0 zip support 2020-01-29 19:54:09 +08:00
Him188
b50f3e4d16 Advance info 2020-01-29 19:54:01 +08:00
Him188
f3ec99e560 Annotate BotAccount.id with @RawAccountIdUse 2020-01-29 19:26:30 +08:00
Him188
259d492f21 Fix NullPointerException 2020-01-29 19:22:05 +08:00
Him188
18b25b90b8 Add comments 2020-01-29 19:21:08 +08:00
Him188
008b6e935d Make uin not final 2020-01-29 19:19:22 +08:00
Him188
b8b1f4cc2a Fix dispose 2020-01-29 19:19:08 +08:00
Him188
b3c6787e0a Introduce MultiPacket 2020-01-29 19:18:52 +08:00
Him188
8fb20f4f63 Correct classname 2020-01-29 19:17:40 +08:00
Him188
42bd8face7 Introduce typealias TlvMap = MutableMap<Int, ByteArray> 2020-01-29 19:17:13 +08:00
Him188
c0d6e906fa Client to client message support 2020-01-29 19:15:09 +08:00
Him188
7dc23b5fbe Add BytePacketBuilder.writeProtoBuf 2020-01-29 19:14:26 +08:00
Him188
37788bcbca Rearrange declarations 2020-01-29 19:14:07 +08:00
Him188
d80af0e8bb
Merge pull request #31 from ryoii/master
fix: subscribeWhile
2020-01-29 04:57:01 -06:00
ryoii
ca493a05d3 fix: subscribeWhile 2020-01-29 18:45:52 +08:00
Him188
c17c736054 Generify packet consumer 2020-01-29 16:27:04 +08:00
Him188
849519afc6 Fix var name 2020-01-29 16:26:41 +08:00
Him188
1c285b1cb8 ProtoBuf utilities 2020-01-29 16:26:25 +08:00
Him188
2f2a8666b9 Add docs 2020-01-29 15:46:05 +08:00
Him188
e2f59416f0 Testing tools 2020-01-29 13:48:49 +08:00
Him188
964c236ddf Testing tools 2020-01-29 13:44:34 +08:00
Him188
3d49f3b58a Testing tools 2020-01-29 13:38:19 +08:00
Him188
1eea7dfdc5 Merge remote-tracking branch 'origin/master' 2020-01-29 13:37:33 +08:00
Him188
e131774956 Testing tools 2020-01-29 13:37:07 +08:00