zhoudaxia
|
ea56f7703b
|
汇总
|
2016-08-31 23:56:42 +08:00 |
|
zhoudaxia
|
499629a174
|
Merge branch 'develop' of https://git.trustie.net/haozhou/app
# Conflicts:
# 文档/软件需求规格说明书.doc
# 模型/robocode机器人战斗模拟——软件模型.vsdx
|
2016-08-31 23:50:06 +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 |
|
zhoudaxia
|
2dbd928306
|
阻断全部完成
|
2016-08-26 22:10:06 +08:00 |
|
zhoudaxia
|
baa3315df7
|
应该没问题了
|
2016-08-26 21:39:43 +08:00 |
|
zhoudaxia
|
6687629e85
|
修改阻断问题
|
2016-08-26 21:25:59 +08:00 |
|
zhoudaxia
|
f639d9d3e1
|
修改阻断问题
|
2016-08-26 21:20:00 +08:00 |
|
zhoudaxia
|
8c9f513b35
|
一个一个的修改
|
2016-08-26 21:14:33 +08:00 |
|
zhoudaxia
|
bdbbb305fd
|
修改了一个阻断问题
|
2016-08-26 21:05:43 +08:00 |
|
zhoudaxia
|
ea887f280b
|
几乎修改了全部阻断问题
|
2016-08-26 20:59:34 +08:00 |
|
zhoudaxia
|
92e6225590
|
修改大部分阻断问题
|
2016-08-26 16:20:48 +08:00 |
|
zhoudaxia
|
4e13437171
|
修改阻断问题
|
2016-08-26 15:54:25 +08:00 |
|
zhoudaxia
|
0834814b9a
|
修改部分阻断问题
|
2016-08-26 13:07:29 +08:00 |
|
zhoudaxia
|
ed407d3129
|
修改部分阻断问题
|
2016-08-26 12:56:01 +08:00 |
|
zhoudaxia
|
ac3d4364c7
|
修改阻断问题
|
2016-08-26 11:38:09 +08:00 |
|
zhoudaxia
|
6fd462a76e
|
代码修改
|
2016-08-26 11:19:21 +08:00 |
|
zhoudaxia
|
da27092d28
|
修改代码
|
2016-08-26 11:08:15 +08:00 |
|
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 |
|
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 |
|
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 |