Commit Graph

253 Commits

Author SHA1 Message Date
Him188
db4954bae1 Make public 2020-01-30 20:48:22 +08:00
Him188
b93b6d1923 Merge remote-tracking branch 'origin/master' 2020-01-30 20:40:13 +08:00
Him188
0ca7c4bc10 Fix import 2020-01-30 20:39:58 +08:00
jiahua.liu
b9eacbcf1a Merge remote-tracking branch 'origin/master' 2020-01-30 20:39:42 +08:00
jiahua.liu
ef9938a025 friendlist resp 2020-01-30 20:39:19 +08:00
Him188
b28a786ea8 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/QQAndroidBotNetworkHandler.kt
2020-01-30 20:37:41 +08:00
Him188
c49406c2ce Avoid leaking 2020-01-30 20:35:13 +08:00
Him188
6e22272adf Use delegate 2020-01-30 20:30:04 +08:00
jiahua.liu
af4f6c4160 fix Jce Data Class generator when facing Map<T,\" \"K> 2020-01-30 20:16:26 +08:00
Him188
b3e9d553aa Simplify log 2020-01-30 19:31:51 +08:00
Him188
392c2fd730 Move files 2020-01-30 19:17:22 +08:00
Him188
d561568eee Remove unnecessary parts 2020-01-30 19:17:12 +08:00
Him188
a2d652b50f Fix FriendListPacket 2020-01-30 18:49:20 +08:00
Him188
efb662a978 Generator for directory 2020-01-30 18:49:06 +08:00
Him188
dc9551abbf Remove println 2020-01-30 18:48:46 +08:00
Him188
683396ecb1 Add toString 2020-01-30 18:28:04 +08:00
Him188
1924c59f55 Fix FriendListPacket.kt 2020-01-30 18:24:57 +08:00
Him188
8ae506223c Fix build 2020-01-30 17:44:50 +08:00
Him188
5398e3796a Merge remote-tracking branch 'origin/master' 2020-01-30 17:19:04 +08:00
Him188
3a11adf1c0 Jce null support 2020-01-30 17:18:49 +08:00
jiahua.liu
421365cd8b friend list packet 2020-01-30 16:12:23 +08:00
jiahua.liu
e891073433 Merge remote-tracking branch 'origin/master' 2020-01-30 15:49:36 +08:00
jiahua.liu
a850b33d8e friend list packet 2020-01-30 15:45:52 +08:00
Him188
b9e9c00748 Rename Register to StatSvc 2020-01-30 14:55:34 +08:00
jiahua.liu
444dd45921 friend list packet 2020-01-30 14:54:56 +08:00
jiahua.liu
034de9f17a friend list packet 2020-01-30 14:39:56 +08:00
jiahua.liu
c7950560cd merge loginPacket 2020-01-30 13:26:34 +08:00
jiahua.liu
3ae1832ac1 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/login/LoginPacket.kt
2020-01-30 13:25:53 +08:00
jiahua.liu
92b7b10f0e network handler update 2020-01-30 13:23:58 +08:00
Him188
41a94f9dd2 Cleanup 2020-01-30 02:27:07 +08:00
Him188
7e51a9daf1 Fix build 2020-01-30 02:20:42 +08:00
Him188
6b432b2aa6 ProtoBufWithNullableSupport 2020-01-30 01:34:23 +08:00
Him188
dd7fb68b1c Move packets 2020-01-30 00:40:16 +08:00
Him188
27dbfcfb39 Move packets 2020-01-30 00:35:39 +08:00
Him188
a120f3d44d Remove getPhoneNumber 2020-01-29 23:54:52 +08:00
Him188
905823b94b Slider captcha solver 2020-01-29 23:53:18 +08:00
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
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