 zpc
|
efcab5d325
|
用例测试
|
2016-09-01 09:47:56 +08:00 |
|
zpc
|
7ae3a1da66
|
战斗快照模型
|
2016-08-31 18:40:03 +08:00 |
|
zpc
|
2ac2d77e50
|
修改
|
2016-08-31 18:09:43 +08:00 |
|
zpc
|
c2f749367a
|
整合代码
|
2016-08-30 11:08:47 +08:00 |
zhoudaxia
|
09eb70541f
|
8月29日 周浩 汇总更新UML模型
|
2016-08-29 11:17:19 +08:00 |
|
zhoudaxia
|
22bca973c9
|
周浩 8月29 完善文档不规范
|
2016-08-29 10:57:19 +08:00 |
|
zhoudaxia
|
80aaeb5288
|
8月29日 周浩 文档规范化
|
2016-08-29 10:31:09 +08:00 |
|
zhoudaxia
|
8de83a6245
|
8月26日 周浩 组内合并改进之后的软件需求文档
|
2016-08-26 22:21:11 +08:00 |
|
zpc
|
a910a953b8
|
Merge branch 'develop' of https://git.trustie.net/haozhou/app into zhengpengcheng_branch
# Conflicts:
# 模型/robocode机器人战斗模拟——软件模型.vsdx
|
2016-08-26 09:19:10 +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 |
|
zhoudaxia
|
62c8ddd3f0
|
a
|
2016-08-25 15:12:20 +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 |
|
zhoudaxia
|
bccf1bc9b1
|
周浩 uml模型组内合并
|
2016-08-25 01:23:38 +08:00 |
|
zhoudaxia
|
52dc88f7e0
|
周浩 文档汇总
|
2016-08-25 01:10:18 +08:00 |
|
zpc
|
ce659a1caf
|
战场快照子系统文档模型修改
|
2016-08-24 22:20:11 +08:00 |
|
zpc
|
4f4f5ca604
|
战场快照子系统用例描述修改
|
2016-08-24 10:38:40 +08:00 |
|
zpc
|
c84321c8e0
|
战斗快照子系统描述
|
2016-08-24 10:16:40 +08:00 |
|
zhoudaxia
|
07fd4ac9c8
|
8月24日 组内合并需求规格说明书文档
|
2016-08-24 09:50:56 +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 |
|
zhoudaxia
|
9db2ee6127
|
8月23日 组内合并软件需求规格说明书
|
2016-08-23 22:30:48 +08:00 |
|
zhoudaxia
|
923e6a1a58
|
Merge branch 'master' of https://git.trustie.net/haozhou/app
|
2016-08-23 22:29:04 +08:00 |
|
zhoudaxia
|
40d7a56d23
|
8月23日 软件需求规格说明书文档组内合并
|
2016-08-23 22:28:32 +08:00 |
|
zhoudaxia
|
e8b545d55a
|
8月23日 软件需求规格说明书文档合并
|
2016-08-23 22:26:21 +08:00 |
|
roadfar
|
d5740acf90
|
12333
|
2016-08-23 11:13:44 +08:00 |
|
roadfar
|
e825b1b219
|
12333
|
2016-08-23 11:11:57 +08:00 |
|
LiuMingYu
|
c663b87709
|
修改阻断错误。
|
2016-08-22 09:07:01 +08:00 |
|
zpc
|
860a4d76f4
|
软件需求规格说明书 功能需求描述
|
2016-08-22 08:43:48 +08:00 |
|
周浩
|
884b71721d
|
Merge branch 'develop' into 'master'
文档、代码合并
See merge request !3
|
2016-08-22 08:35:10 +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 |
|
zhoudaxia
|
d974e4b4b4
|
uml模型合并
|
2016-08-21 20:00:15 +08:00 |
|
zhoudaxia
|
316f891873
|
合并 软件需求说明书 界面要求
|
2016-08-21 19:45:05 +08:00 |
|
LiuMingYu
|
d4ce4fe6da
|
新的代码
|
2016-08-19 10:54:22 +08:00 |
|
LiuMingYu
|
e8fbb18cf0
|
新的workspace
|
2016-08-19 10:32:10 +08:00 |