 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 |
|
|
xinyang
|
cbadab7f83
|
Merge branch 'master' of /home/sjturm/Desktop/RM_auto-aim with conflicts.
|
2019-08-04 08:17:38 +08:00 |
|
|
xinyang
|
a68a051ce7
|
fix bug.
|
2019-08-04 08:05:26 +08:00 |
|
|
xinyang
|
4e8adbb671
|
small change
|
2019-08-04 01:46:37 +08:00 |
|
|
xinyang
|
bbe05a7db8
|
small change
|
2019-08-04 01:45:55 +08:00 |
|
|
sun
|
04c7eea9e0
|
energy changed
|
2019-08-04 01:44:30 +08:00 |
|
|
sun
|
851c716153
|
energy changed
|
2019-08-04 01:24:39 +08:00 |
|
|
sun
|
af85869f48
|
Merge branch 'master' of https://github.com/lloi7/RM_auto-aim
|
2019-08-04 01:13:39 +08:00 |
|
|
sun
|
977de37b14
|
energy changed
|
2019-08-04 01:12:51 +08:00 |
|
|
xinyang
|
0b24c6a5af
|
fix bug.
|
2019-08-04 00:37:41 +08:00 |
|
|
xinyang
|
2b83305eb9
|
fix bug.
|
2019-08-03 23:16:32 +08:00 |
|
|
xinyang
|
81ab17afa5
|
fix bug.
|
2019-08-03 23:11:42 +08:00 |
|
|
xinyang
|
04496ae99b
|
fix bug.
|
2019-08-03 22:53:27 +08:00 |
|
|
xinyang
|
b67ef4b475
|
fix bug.
|
2019-08-03 22:49:46 +08:00 |
|
|
xinyang
|
ef32b54761
|
新版反陀螺。
|
2019-08-03 19:00:46 +08:00 |
|
|
sun
|
199feb3ba9
|
energy changed
|
2019-08-03 16:27:21 +08:00 |
|
|
xinyang
|
f35c97ddd1
|
fix bug.
|
2019-08-02 18:43:48 +08:00 |
|
|
sun
|
b6f3f04b03
|
energy changed
|
2019-08-01 02:36:03 +08:00 |
|