xinyang
|
c8b13159a2
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# energy/src/energy/clear/energy_init.cpp
|
2019-08-07 04:14:44 +08:00 |
|
sun
|
f93f5911ff
|
energy changed(8/7game PID test)
|
2019-08-07 03:38:31 +08:00 |
|
xinyang
|
0257b87720
|
small changes.
|
2019-08-07 03:06:07 +08:00 |
|
xinyang
|
e6a0b85694
|
something whatever.
|
2019-08-07 03:01:37 +08:00 |
|
xinyang
|
41de64dbb6
|
fix bug.
|
2019-08-07 02:59:34 +08:00 |
|
xinyang
|
274f67a51a
|
Merge branch 'master' of https://github.com/lloi7/RM_auto-aim
|
2019-08-07 02:47:54 +08:00 |
|
xinyang
|
93d578085b
|
参数更新。
|
2019-08-07 02:42:54 +08:00 |
|
xinyang
|
19c07c441d
|
log.h更加高级的CNT_TIME
|
2019-08-07 02:36:01 +08:00 |
|
xinyang
|
6b0edffa3b
|
Merge remote-tracking branch 'origin/master'
|
2019-08-07 02:23:55 +08:00 |
|
xinyang
|
05b7991d57
|
some small change.
|
2019-08-07 02:18:10 +08:00 |
|
xinyang
|
77841bfe39
|
fix bug.
|
2019-08-07 02:11:28 +08:00 |
|
JiatongSun
|
e38ad38572
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# main.cpp
|
2019-08-07 01:57:35 +08:00 |
|
xinyang
|
0db1fba0d8
|
fix bug
|
2019-08-07 01:32:30 +08:00 |
|
xinyang
|
e9d1c4e4ba
|
Merge branch 'master' of https://github.com/lloi7/RM_auto-aim
|
2019-08-06 16:11:08 +08:00 |
|
xinyang
|
3bd4b30182
|
Merge branch 'master' of https://github.com/lloi7/RM_auto-aim
|
2019-08-06 16:00:53 +08:00 |
|
JiatongSun
|
86aaad55e8
|
Merge remote-tracking branch 'origin/master'
|
2019-08-06 15:57:17 +08:00 |
|
xinyang
|
0307a01f55
|
防止瞄飞天。
|
2019-08-06 15:49:36 +08:00 |
|
xinyang
|
9f94287441
|
Merge remote-tracking branch 'origin/master'
|
2019-08-06 14:14:13 +08:00 |
|
xinyang
|
f59c002fc0
|
Merge branch 'master' of /home/sjturm/Desktop/RM_auto-aim with conflicts.
|
2019-08-06 12:33:40 +08:00 |
|
JiatongSun
|
dbe6296a91
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# main.cpp
|
2019-08-06 12:10:22 +08:00 |
|
JiatongSun
|
db2ab1ae22
|
energy changed
|
2019-08-06 12:08:05 +08:00 |
|
xinyang
|
6cdb6b4832
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# main.cpp
|
2019-08-06 11:55:43 +08:00 |
|
xinyang
|
9392c201db
|
分离曝光，参数更新,取消反陀螺,数据增强。
|
2019-08-06 11:54:48 +08:00 |
|
xinyang
|
741ffdc176
|
Merge remote-tracking branch 'origin/master'
|
2019-08-06 01:32:40 +08:00 |
|
sun
|
72d6a15d44
|
energy changed
|
2019-08-06 00:40:20 +08:00 |
|
sun
|
00fe7bbab9
|
energy changed
|
2019-08-05 23:51:41 +08:00 |
|
sun
|
74fa004567
|
energy changed
|
2019-08-05 22:45:37 +08:00 |
|
xinyang
|
540ddfa0a4
|
Merge remote-tracking branch 'origin/master'
|
2019-08-05 19:38:46 +08:00 |
|
sun
|
92493a4447
|
energy changed
|
2019-08-05 19:34:34 +08:00 |
|
sun
|
acfc1e8701
|
energy changed
|
2019-08-05 19:33:00 +08:00 |
|
sun
|
690e2a9224
|
energy changed
|
2019-08-05 17:43:17 +08:00 |
|
sun
|
c953a99d34
|
energy changed
|
2019-08-05 17:42:58 +08:00 |
|
sun
|
b27bb48ca5
|
energy changed
|
2019-08-05 17:29:31 +08:00 |
|
sun
|
e1fc19fdbf
|
energy changed
|
2019-08-05 17:27:49 +08:00 |
|
xinyang
|
e5ddc15d86
|
Merge remote-tracking branch 'origin/master'
|
2019-08-05 16:27:53 +08:00 |
|
xinyang
|
7337f10123
|
部分统一命名规范。
|
2019-08-05 09:54:50 +08:00 |
|
xinyang
|
13e1c383bc
|
Merge remote-tracking branch 'origin/master'
|
2019-08-05 09:37:50 +08:00 |
|
xinyang
|
4004803ea0
|
修改option处理方式。
|
2019-08-05 09:36:37 +08:00 |
|
xinyang
|
63e326f883
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# armor/src/armor_finder/anti_top/anti_top.cpp
# energy/src/energy/find/energy_finder.cpp
|
2019-08-05 01:16:30 +08:00 |
|
xinyang
|
125c8d36c9
|
fix bug.
|
2019-08-04 23:53:04 +08:00 |
|
sun
|
4b8228e9fd
|
Merge branch 'master' of https://github.com/lloi7/RM_auto-aim
# Conflicts:
# energy/src/energy/send/send.cpp
|
2019-08-04 23:38:49 +08:00 |
|
sun
|
6e69bb0bd2
|
energy changed
|
2019-08-04 23:36:51 +08:00 |
|
wanpiqiu123
|
44812dbcfe
|
modify startup
|
2019-08-04 21:48:43 +08:00 |
|
xinyang
|
1434cee8c0
|
fix bug.
|
2019-08-04 17:23:11 +08:00 |
|
xinyang
|
8f33549e2c
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# energy/src/energy/send/send.cpp
# main.cpp
|
2019-08-04 17:20:41 +08:00 |
|
xinyang
|
d0ab4342fd
|
删除不必要代码。
|
2019-08-04 17:18:32 +08:00 |
|
sun
|
6996d3f0dd
|
Merge branch 'master' of https://github.com/lloi7/RM_auto-aim
# Conflicts:
# main.cpp
|
2019-08-04 14:04:39 +08:00 |
|
sun
|
886109e3cd
|
energy changed
|
2019-08-04 14:02:59 +08:00 |
|
xinyang
|
3b4927d275
|
Merge remote-tracking branch 'origin/anti-top-test' into anti-top-test
# Conflicts:
# armor/src/armor_finder/anti_top/anti_top.cpp
|
2019-08-04 12:34:50 +08:00 |
|
xinyang
|
50e925dbb2
|
参数更新。
|
2019-08-04 12:32:13 +08:00 |
|