Commit Graph

368 Commits

Author SHA1 Message Date
JiatongSun
bd1e729162 energy changed 2019-08-09 02:53:54 +08:00
JiatongSun
2f39c61bf1 anti top v2.1 2019-08-09 02:14:33 +08:00
JiatongSun
1ba42953ba Merge remote-tracking branch 'origin/master' 2019-08-09 02:12:59 +08:00
sun
80d1a0e600 energy changed 2019-08-09 02:00:21 +08:00
JiatongSun
212cfa12a2 Merge remote-tracking branch 'origin/master' 2019-08-09 01:34:25 +08:00
xinyang
5aec098ef9 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	main.cpp
2019-08-09 01:26:08 +08:00
xinyang
65a55353d6 反陀螺v2.0 2019-08-09 01:24:58 +08:00
JiatongSun
fcb3c23d7f Merge remote-tracking branch 'origin/master' 2019-08-08 23:55:26 +08:00
sun
bb2a088d38 energy changed 2019-08-08 23:00:06 +08:00
JiatongSun
aa9f18035e Merge remote-tracking branch 'origin/master' 2019-08-08 11:20:52 +08:00
xinyang
faae07b5b3 参数更新 2019-08-08 10:48:32 +08:00
xinyang
1507e2ec6d startup with show armor box. 2019-08-08 01:50:52 +08:00
xinyang
87846b4c08 Merge remote-tracking branch 'origin/master' 2019-08-08 01:48:44 +08:00
xinyang
8d8d172c95 fix bug 2019-08-08 01:47:52 +08:00
xinyang
dcde93a608 armor small change 2019-08-08 00:22:39 +08:00
JiatongSun
b38c6177ab Merge remote-tracking branch 'origin/master' 2019-08-07 23:36:11 +08:00
sun
86b37b3f5e energy changed 2019-08-07 22:59:02 +08:00
sun
16efe17334 energy changed 2019-08-07 20:36:04 +08:00
sun
bbff755124 energy changed 2019-08-07 20:03:44 +08:00
JiatongSun
40b442983e Merge remote-tracking branch 'origin/master' 2019-08-07 15:25:51 +08:00
sun
518eb22867 energy changed 2019-08-07 14:09:58 +08:00
JiatongSun
20a7489f66 Merge remote-tracking branch 'origin/master' 2019-08-07 06:04:58 +08:00
sun
8133aeedea fix bug 2019-08-07 05:38:52 +08:00
xinyang
0347182439 fix bug 2019-08-07 05:33:59 +08:00
xinyang
29121ae4dc fix bug 2019-08-07 05:28:00 +08:00
xinyang
4fc5c55f84 fix bug 2019-08-07 05:18:25 +08:00
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