zhoudaxia
|
8e20070a07
|
一定要改正啊啊
|
2016-08-26 11:01:18 +08:00 |
|
zhoudaxia
|
f8948118bd
|
解决部分阻断问题
|
2016-08-26 10:53:50 +08:00 |
|
zhoudaxia
|
510f51c303
|
修改部分阻断问题
|
2016-08-26 10:41:45 +08:00 |
|
zhoudaxia
|
a04eb85256
|
周浩 修改部分阻断问题
|
2016-08-26 10:20:24 +08:00 |
|
zhoudaxia
|
d5c0f102d7
|
周浩 解决部分质量分析中严重问题
|
2016-08-26 09:54:51 +08:00 |
|
zhoudaxia
|
2e7d5f9fdb
|
代码合并
|
2016-08-25 23:29:32 +08:00 |
|
zhoudaxia
|
a661442f94
|
Merge branch 'develop' of https://git.trustie.net/haozhou/app into develop
# Conflicts:
# 代码/workspace_robo4/.metadata/.plugins/org.eclipse.core.resources/.projects/robocode.api/.markers
# 代码/workspace_robo4/.metadata/.plugins/org.eclipse.core.resources/.projects/robocode.battle/.markers
# 代码/workspace_robo4/.metadata/.plugins/org.eclipse.core.resources/.projects/robocode.core/.markers
# 代码/workspace_robo4/.metadata/.plugins/org.eclipse.core.resources/.projects/robocode.host/.markers
# 代码/workspace_robo4/.metadata/.plugins/org.eclipse.core.resources/.projects/robocode.roborumble/.markers
# 代码/workspace_robo4/.metadata/.plugins/org.eclipse.core.resources/.projects/robocode.ui.editor/.markers
# 代码/workspace_robo4/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.rse.core.prefs
# 代码/workspace_robo4/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
# 代码/workspace_robo4/.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps
# 代码/workspace_robo4/.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt
# 代码/workspace_robo4/.metadata/.plugins/org.eclipse.jdt.core/variablesAndContainers.dat
# 代码/workspace_robo4/plugins/dotnet/robocode.dotnet.host/src/main/java/net/sf/robocode/dotnet/host/Module.java
# 代码/workspace_robo4/plugins/dotnet/robocode.dotnet.installer/src/main/java/net/sf/robocode/installer/AutoExtract.java
# 代码/workspace_robo4/plugins/testing/robocode.testing.installer/src/main/java/net/sf/robocode/installer/AutoExtract.java
# 代码/workspace_robo4/robocode.api/src/main/java/net/sf/robocode/security/HiddenAccess.java
# 代码/workspace_robo4/robocode.core/src/main/java/net/sf/robocode/battle/events/BattleEventDispatcher.java
# 代码/workspace_robo4/robocode.core/src/main/java/net/sf/robocode/core/RobocodeMain.java
# 代码/workspace_robo4/robocode.host/src/main/java/net/sf/robocode/host/JavaHost.java
# 代码/workspace_robo4/robocode.host/src/main/java/net/sf/robocode/host/events/EventManager.java
# 代码/workspace_robo4/robocode.host/src/main/java/net/sf/robocode/host/proxies/HostingRobotProxy.java
# 代码/workspace_robo4/robocode.host/src/main/java/net/sf/robocode/host/security/RobotClassLoader.java
# 代码/workspace_robo4/robocode.installer/src/main/java/net/sf/robocode/installer/AutoExtract.java
# 代码/workspace_robo4/robocode.roborumble/src/main/java/net/sf/robocode/roborumble/netengine/FileTransfer.java
# 代码/workspace_robo4/robocode.tests.robots/src/main/java/tested/robots/AwtAttack.java
# 代码/workspace_robo4/robocode.tests.robots/src/main/java/tested/robots/ConstructorAwtAttack.java
# 代码/workspace_robo4/robocode.tests.robots/src/main/java/tested/robots/ConstructorThreadAttack.java
# 代码/workspace_robo4/robocode.tests.robots/src/main/java/tested/robots/FileAttack.java
# 代码/workspace_robo4/robocode.tests.robots/src/main/java/tested/robots/IncludeNamespaceAttack.java
# 代码/workspace_robo4/robocode.tests.robots/src/main/java/tested/robots/ThreadAttack.java
# 代码/workspace_robo4/robocode.tests.robots/src/main/java/tested/robots/ThreadGroupAttack.java
# 代码/workspace_robo4/robocode.tests.robots/src/main/java/tested/robots/UndeadThread.java
# 代码/workspace_robo4/robocode.tests/src/main/java/net/sf/robocode/test/helpers/Assert.java
# 代码/workspace_robo4/robocode.ui.editor/src/main/java/net/sf/robocode/ui/editor/EditWindow.java
# 代码/workspace_robo4/robocode.ui.editor/src/main/java/net/sf/robocode/ui/editor/WindowMenuItem.java
# 代码/workspace_robo4/robocode.ui/src/main/java/net/sf/robocode/ui/WindowManager.java
# 代码/workspace_robo4/robocode.ui/src/main/java/net/sf/robocode/ui/battle/AwtBattleAdaptor.java
|
2016-08-25 23:28:12 +08:00 |
 周浩
|
ade31c7f50
|
Merge branch 'liumingyu_branch' into 'develop'
代码合并
See merge request !6
|
2016-08-25 11:15:10 +08:00 |
|
zhoudaxia
|
0679bddf0b
|
lmy
|
2016-08-25 10:33:02 +08:00 |
|
zhoudaxia
|
a7fad02107
|
Merge remote-tracking branch 'remotes/newrepo/liumingyu_branch' into develop
# Conflicts:
# workspace_robo4/.metadata/.log
# workspace_robo4/.metadata/.plugins/org.eclipse.core.resources/.projects/robocode.api/.markers
# workspace_robo4/.metadata/.plugins/org.eclipse.core.resources/.projects/robocode.battle/.markers
# workspace_robo4/.metadata/.plugins/org.eclipse.core.resources/.projects/robocode.core/.markers
# workspace_robo4/.metadata/.plugins/org.eclipse.core.resources/.projects/robocode.host/.markers
# workspace_robo4/.metadata/.plugins/org.eclipse.core.resources/.projects/robocode.roborumble/.markers
# workspace_robo4/.metadata/.plugins/org.eclipse.core.resources/.projects/robocode.ui.editor/.markers
# workspace_robo4/.metadata/.plugins/org.eclipse.core.resources/.projects/robocode.ui/.markers
# workspace_robo4/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
# workspace_robo4/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.launching.prefs
# workspace_robo4/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.rse.core.prefs
# workspace_robo4/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
# workspace_robo4/.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps
# workspace_robo4/.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt
# workspace_robo4/.metadata/.plugins/org.eclipse.jdt.core/variablesAndContainers.dat
# workspace_robo4/.metadata/.plugins/org.eclipse.m2e.core/nexus/1a42e2ddbdd28c4e903ebde7bafa5867/segments.gen
# workspace_robo4/.metadata/.plugins/org.eclipse.m2e.core/nexus/26522e0d83a422eed93329ece7565cfc/segments.gen
# workspace_robo4/.metadata/.plugins/org.eclipse.m2e.core/nexus/830bc118332e77292949ed1e6d2fabe0/segments.gen
# workspace_robo4/plugins/dotnet/robocode.dotnet.host/src/main/java/net/sf/robocode/dotnet/host/Module.java
# workspace_robo4/plugins/dotnet/robocode.dotnet.installer/src/main/java/net/sf/robocode/installer/AutoExtract.java
# workspace_robo4/plugins/testing/robocode.testing.installer/src/main/java/net/sf/robocode/installer/AutoExtract.java
# workspace_robo4/robocode.api/src/main/java/net/sf/robocode/security/HiddenAccess.java
# workspace_robo4/robocode.core/src/main/java/net/sf/robocode/battle/events/BattleEventDispatcher.java
# workspace_robo4/robocode.core/src/main/java/net/sf/robocode/core/RobocodeMain.java
# workspace_robo4/robocode.host/src/main/java/net/sf/robocode/host/JavaHost.java
# workspace_robo4/robocode.host/src/main/java/net/sf/robocode/host/events/EventManager.java
# workspace_robo4/robocode.host/src/main/java/net/sf/robocode/host/proxies/HostingRobotProxy.java
# workspace_robo4/robocode.host/src/main/java/net/sf/robocode/host/security/RobotClassLoader.java
# workspace_robo4/robocode.installer/src/main/java/net/sf/robocode/installer/AutoExtract.java
# workspace_robo4/robocode.roborumble/src/main/java/net/sf/robocode/roborumble/netengine/FileTransfer.java
# workspace_robo4/robocode.tests.robots/src/main/java/tested/robots/AwtAttack.java
# workspace_robo4/robocode.tests.robots/src/main/java/tested/robots/ConstructorAwtAttack.java
# workspace_robo4/robocode.tests.robots/src/main/java/tested/robots/ConstructorThreadAttack.java
# workspace_robo4/robocode.tests.robots/src/main/java/tested/robots/FileAttack.java
# workspace_robo4/robocode.tests.robots/src/main/java/tested/robots/IncludeNamespaceAttack.java
# workspace_robo4/robocode.tests.robots/src/main/java/tested/robots/ThreadAttack.java
# workspace_robo4/robocode.tests.robots/src/main/java/tested/robots/ThreadGroupAttack.java
# workspace_robo4/robocode.tests.robots/src/main/java/tested/robots/UndeadThread.java
# workspace_robo4/robocode.tests/src/main/java/net/sf/robocode/test/helpers/Assert.java
# workspace_robo4/robocode.ui.editor/src/main/java/net/sf/robocode/ui/editor/EditWindow.java
# workspace_robo4/robocode.ui.editor/src/main/java/net/sf/robocode/ui/editor/WindowMenuItem.java
# workspace_robo4/robocode.ui/src/main/java/net/sf/robocode/ui/WindowManager.java
# workspace_robo4/robocode.ui/src/main/java/net/sf/robocode/ui/battle/AwtBattleAdaptor.java
|
2016-08-25 10:20:51 +08:00 |
|
周浩
|
909839b4ec
|
Merge branch 'liumingyu_branch' into 'develop'
分支合并
See merge request !5
|
2016-08-25 10:13:21 +08:00 |
 ALEX11
|
9e827864ef
|
代码
|
2016-08-25 10:01:29 +08:00 |
|
ALEX11
|
2bc998a290
|
代码
|
2016-08-25 10:00:27 +08:00 |
|
ALEX11
|
d9b7ed8e0f
|
Merge branch 'develop' into liumingyu_branch
# Conflicts:
# workspace_robo4/.metadata/.log
# workspace_robo4/.metadata/.plugins/org.eclipse.core.resources/.projects/robocode.api/.markers
# workspace_robo4/.metadata/.plugins/org.eclipse.core.resources/.projects/robocode.battle/.markers
# workspace_robo4/.metadata/.plugins/org.eclipse.core.resources/.projects/robocode.core/.markers
# workspace_robo4/.metadata/.plugins/org.eclipse.core.resources/.projects/robocode.host/.markers
# workspace_robo4/.metadata/.plugins/org.eclipse.core.resources/.projects/robocode.roborumble/.markers
# workspace_robo4/.metadata/.plugins/org.eclipse.core.resources/.projects/robocode.ui.editor/.markers
# workspace_robo4/.metadata/.plugins/org.eclipse.core.resources/.projects/robocode.ui/.markers
# workspace_robo4/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
# workspace_robo4/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.launching.prefs
# workspace_robo4/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.rse.core.prefs
# workspace_robo4/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
# workspace_robo4/.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps
# workspace_robo4/.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt
# workspace_robo4/.metadata/.plugins/org.eclipse.jdt.core/variablesAndContainers.dat
# workspace_robo4/.metadata/.plugins/org.eclipse.m2e.core/nexus/1a42e2ddbdd28c4e903ebde7bafa5867/segments.gen
# workspace_robo4/.metadata/.plugins/org.eclipse.m2e.core/nexus/26522e0d83a422eed93329ece7565cfc/segments.gen
# workspace_robo4/.metadata/.plugins/org.eclipse.m2e.core/nexus/830bc118332e77292949ed1e6d2fabe0/segments.gen
# workspace_robo4/plugins/dotnet/robocode.dotnet.host/src/main/java/net/sf/robocode/dotnet/host/Module.java
# workspace_robo4/plugins/dotnet/robocode.dotnet.installer/src/main/java/net/sf/robocode/installer/AutoExtract.java
# workspace_robo4/plugins/dotnet/robocode.dotnet.tests/src/test/java/net/sf/robocode/test/robotscs/TestMaxTurnRate.java
# workspace_robo4/plugins/testing/robocode.testing.installer/src/main/java/net/sf/robocode/installer/AutoExtract.java
# workspace_robo4/robocode.api/src/main/java/net/sf/robocode/security/HiddenAccess.java
# workspace_robo4/robocode.core/src/main/java/net/sf/robocode/battle/events/BattleEventDispatcher.java
# workspace_robo4/robocode.core/src/main/java/net/sf/robocode/core/RobocodeMain.java
# workspace_robo4/robocode.host/src/main/java/net/sf/robocode/host/JavaHost.java
# workspace_robo4/robocode.host/src/main/java/net/sf/robocode/host/events/EventManager.java
# workspace_robo4/robocode.host/src/main/java/net/sf/robocode/host/proxies/HostingRobotProxy.java
# workspace_robo4/robocode.host/src/main/java/net/sf/robocode/host/security/RobotClassLoader.java
# workspace_robo4/robocode.installer/src/main/java/net/sf/robocode/installer/AutoExtract.java
# workspace_robo4/robocode.roborumble/src/main/java/net/sf/robocode/roborumble/netengine/FileTransfer.java
# workspace_robo4/robocode.tests.robots/src/main/java/tested/robots/AwtAttack.java
# workspace_robo4/robocode.tests.robots/src/main/java/tested/robots/ConstructorAwtAttack.java
# workspace_robo4/robocode.tests.robots/src/main/java/tested/robots/ConstructorThreadAttack.java
# workspace_robo4/robocode.tests.robots/src/main/java/tested/robots/FileAttack.java
# workspace_robo4/robocode.tests.robots/src/main/java/tested/robots/IncludeNamespaceAttack.java
# workspace_robo4/robocode.tests.robots/src/main/java/tested/robots/ThreadAttack.java
# workspace_robo4/robocode.tests.robots/src/main/java/tested/robots/ThreadGroupAttack.java
# workspace_robo4/robocode.tests.robots/src/main/java/tested/robots/UndeadThread.java
# workspace_robo4/robocode.tests/src/main/java/net/sf/robocode/test/helpers/Assert.java
# workspace_robo4/robocode.ui.editor/src/main/java/net/sf/robocode/ui/editor/EditWindow.java
# workspace_robo4/robocode.ui.editor/src/main/java/net/sf/robocode/ui/editor/WindowMenuItem.java
# workspace_robo4/robocode.ui/src/main/java/net/sf/robocode/ui/WindowManager.java
# workspace_robo4/robocode.ui/src/main/java/net/sf/robocode/ui/battle/AwtBattleAdaptor.java
# 软件需求规格说明书.doc
Signed-off-by: ALEX11 <438026067@qq.com>
|
2016-08-25 09:51:28 +08:00 |
|
zhoudaxia
|
bb59db6867
|
测试
|
2016-08-25 08:42:26 +08:00 |
|
zhoudaxia
|
27ca01fea9
|
代码合并
|
2016-08-25 08:39:00 +08:00 |
|
zhoudaxia
|
4402a27f5d
|
Merge branch 'develop' of https://git.trustie.net/haozhou/app into develop
|
2016-08-25 08:31:18 +08:00 |
|
zhoudaxia
|
da1104c10c
|
代码合并
|
2016-08-25 08:29:38 +08:00 |
 LiuMingYu
|
80d198777c
|
改进了一部分的文档 最近在搞保研材料 我会抓紧时间做完剩余部分
|
2016-08-23 22:35:51 +08:00 |
 roadfar
|
72d31f0fae
|
自动分析测试
|
2016-08-23 22:34:53 +08:00 |
|
LiuMingYu
|
72f1b998ac
|
进一步更改阻断及严重错误代码
|
2016-08-23 22:32:28 +08:00 |
|
LiuMingYu
|
c663b87709
|
修改阻断错误。
|
2016-08-22 09:07:01 +08:00 |
|
zhoudaxia
|
46217e8275
|
文档合并
|
2016-08-22 08:33:56 +08:00 |
|
zhoudaxia
|
d5cd1a6b3d
|
代码合并
|
2016-08-22 08:31:10 +08:00 |
|
zhoudaxia
|
1d5f0aad08
|
合并代码
|
2016-08-22 08:26:32 +08:00 |
|
周浩
|
cc6cbb98f1
|
Merge branch 'liumingyu_branch' into 'develop'
代码请求合并
See merge request !2
|
2016-08-22 08:16:36 +08:00 |
|
周浩
|
4c04c28b5b
|
Merge branch 'liangshawn' into 'develop'
需求说明规格说明书文档修改
完成了第2部分的部分内容
See merge request !1
|
2016-08-22 08:16:16 +08:00 |
|
LiuMingYu
|
d4ce4fe6da
|
新的代码
|
2016-08-19 10:54:22 +08:00 |
|
LiuMingYu
|
e8fbb18cf0
|
新的workspace
|
2016-08-19 10:32:10 +08:00 |
|
LiuMingYu
|
04d40c636d
|
备份
|
2016-08-19 10:23:53 +08:00 |
|
LiuMingYu
|
0746f606f0
|
第四版本
|
2016-08-19 09:53:16 +08:00 |
|
LiuMingYu
|
759678eb8c
|
第四版本
|
2016-08-19 09:52:12 +08:00 |
|
zhoudaxia
|
6dbb1da167
|
分支代码合并
|
2016-08-19 09:38:32 +08:00 |
|
zhoudaxia
|
e2dc6a6019
|
Merge branch 'zhouhao_branch'
|
2016-08-19 09:34:36 +08:00 |
|
zhoudaxia
|
88878d2fc6
|
项目计划表
|
2016-08-18 23:45:23 +08:00 |
|
zhoudaxia
|
4278e1e696
|
项目计划表
|
2016-08-18 23:43:21 +08:00 |
|
zhoudaxia
|
6471effdae
|
周浩 8月18日 完善ui中TeamCreator代码
|
2016-08-18 22:31:22 +08:00 |
|
zhoudaxia
|
ecdbf0829d
|
周浩 8月18 完善体系结构设计模型
|
2016-08-18 22:16:51 +08:00 |
|
zhoudaxia
|
4f24e8c195
|
周浩 8月18日 新增设计约束
|
2016-08-18 21:50:24 +08:00 |
|
LiuMingYu
|
8caf8c0c3d
|
个人计划表
|
2016-08-18 20:02:33 +08:00 |
|
LiuMingYu
|
6a946da64d
|
最新版本
|
2016-08-18 11:25:23 +08:00 |
|
LiuMingYu
|
4d9a75cac1
|
delete
|
2016-08-18 11:23:08 +08:00 |
|
LiuMingYu
|
f89346e981
|
最新版本代码
|
2016-08-18 11:05:46 +08:00 |
|
ALEX11
|
5f2f7c01bd
|
RETRY THE CODE
|
2016-08-18 10:16:57 +08:00 |
|
ALEX11
|
474a6e5ab7
|
TRY THE CODE
|
2016-08-18 10:15:04 +08:00 |
|
zhoudaxia
|
450816a390
|
8月17日 更新夏季学期计划分工
|
2016-08-17 23:44:08 +08:00 |
|
zhoudaxia
|
f97bd58fae
|
Merge branch 'master' of https://git.trustie.net/haozhou/app
|
2016-08-17 23:42:43 +08:00 |
|
zhoudaxia
|
96d304112c
|
周浩 8月17日 体系结构设计模型完善
|
2016-08-17 23:37:32 +08:00 |
|
zhoudaxia
|
ff97ccfd1d
|
周浩 8月17日 完善teamcreate的ui类
|
2016-08-17 23:33:37 +08:00 |
|
zhoudaxia
|
d2229cb09d
|
周浩 8月17日 软件需求规格说明书 4.1性能要求部分完善
|
2016-08-17 23:27:23 +08:00 |