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>
This commit is contained in:
commit
d9b7ed8e0f
|
|
@ -1,11 +0,0 @@
|
|||
.metadata
|
||||
target
|
||||
build.xml
|
||||
maven-build.xml
|
||||
maven-build.properties
|
||||
/plugins/dotnet/robocode.dotnet.samples/src/robocode.dotnet.samples.sln
|
||||
/plugins/dotnet/robocode.dotnet.samples/src/robocode.dotnet.samples.suo
|
||||
ucdetector_reports
|
||||
/plugins/dotnet/*.suo
|
||||
*.class
|
||||
.recommenders
|
||||
|
|
@ -1,28 +0,0 @@
|
|||
!SESSION 2016-08-19 10:27:06.151 -----------------------------------------------
|
||||
eclipse.buildId=4.3.0.I20130605-2000
|
||||
java.version=1.6.0_45
|
||||
java.vendor=Sun Microsystems Inc.
|
||||
BootLoader constants: OS=win32, ARCH=x86_64, WS=win32, NL=zh_CN
|
||||
Framework arguments: -product org.eclipse.epp.package.jee.product
|
||||
Command-line arguments: -os win32 -ws win32 -arch x86_64 -product org.eclipse.epp.package.jee.product
|
||||
|
||||
!ENTRY org.eclipse.egit.ui 2 0 2016-08-19 10:27:10.560
|
||||
!MESSAGE Warning: The environment variable HOME is not set. The following directory will be used to store the Git
|
||||
user global configuration and to define the default location to store repositories: 'C:\Users\Terrans Force'. If this is
|
||||
not correct please set the HOME environment variable and restart Eclipse. Otherwise Git for Windows and
|
||||
EGit might behave differently since they see different configuration options.
|
||||
This warning can be switched off on the Team > Git > Confirmations and Warnings preference page.
|
||||
!SESSION 2016-08-22 08:10:39.779 -----------------------------------------------
|
||||
eclipse.buildId=4.3.0.I20130605-2000
|
||||
java.version=1.6.0_45
|
||||
java.vendor=Sun Microsystems Inc.
|
||||
BootLoader constants: OS=win32, ARCH=x86_64, WS=win32, NL=zh_CN
|
||||
Framework arguments: -product org.eclipse.epp.package.jee.product -product org.eclipse.epp.package.jee.product
|
||||
Command-line arguments: -os win32 -ws win32 -arch x86_64 -product org.eclipse.epp.package.jee.product -data E:\2016Spring\robocodefiles\download\app\workspace_robo4 -product org.eclipse.epp.package.jee.product
|
||||
|
||||
!ENTRY org.eclipse.egit.ui 2 0 2016-08-22 08:10:45.437
|
||||
!MESSAGE Warning: The environment variable HOME is not set. The following directory will be used to store the Git
|
||||
user global configuration and to define the default location to store repositories: 'C:\Users\Terrans Force'. If this is
|
||||
not correct please set the HOME environment variable and restart Eclipse. Otherwise Git for Windows and
|
||||
EGit might behave differently since they see different configuration options.
|
||||
This warning can be switched off on the Team > Git > Confirmations and Warnings preference page.
|
||||
Binary file not shown.
Binary file not shown.
|
|
@ -1,3 +0,0 @@
|
|||
#GitProjectData
|
||||
#Fri Aug 19 10:27:28 CST 2016
|
||||
.gitdir=../../.git
|
||||
Binary file not shown.
|
|
@ -1,3 +0,0 @@
|
|||
#GitProjectData
|
||||
#Fri Aug 19 10:27:28 CST 2016
|
||||
.gitdir=../../.git
|
||||
Binary file not shown.
Binary file not shown.
|
|
@ -1,3 +0,0 @@
|
|||
#GitProjectData
|
||||
#Fri Aug 19 10:27:28 CST 2016
|
||||
.gitdir=../../.git
|
||||
Binary file not shown.
Binary file not shown.
|
|
@ -1,3 +0,0 @@
|
|||
#GitProjectData
|
||||
#Fri Aug 19 10:27:28 CST 2016
|
||||
.gitdir=../../.git
|
||||
Binary file not shown.
Binary file not shown.
|
|
@ -1,3 +0,0 @@
|
|||
#GitProjectData
|
||||
#Fri Aug 19 10:27:28 CST 2016
|
||||
.gitdir=../../.git
|
||||
Binary file not shown.
Binary file not shown.
|
|
@ -1,3 +0,0 @@
|
|||
#GitProjectData
|
||||
#Fri Aug 19 10:27:28 CST 2016
|
||||
.gitdir=../../.git
|
||||
Binary file not shown.
Binary file not shown.
|
|
@ -1,3 +0,0 @@
|
|||
#GitProjectData
|
||||
#Fri Aug 19 10:27:28 CST 2016
|
||||
.gitdir=../../.git
|
||||
Binary file not shown.
|
|
@ -1,3 +0,0 @@
|
|||
#GitProjectData
|
||||
#Fri Aug 19 10:27:28 CST 2016
|
||||
.gitdir=../../.git
|
||||
Binary file not shown.
Binary file not shown.
|
|
@ -1,3 +0,0 @@
|
|||
#GitProjectData
|
||||
#Fri Aug 19 10:27:28 CST 2016
|
||||
.gitdir=../../.git
|
||||
Binary file not shown.
Binary file not shown.
|
|
@ -1,3 +0,0 @@
|
|||
#GitProjectData
|
||||
#Fri Aug 19 10:27:28 CST 2016
|
||||
.gitdir=../../.git
|
||||
Binary file not shown.
Binary file not shown.
|
|
@ -1,3 +0,0 @@
|
|||
#GitProjectData
|
||||
#Fri Aug 19 10:27:28 CST 2016
|
||||
.gitdir=../../.git
|
||||
Binary file not shown.
Binary file not shown.
|
|
@ -1,3 +0,0 @@
|
|||
#GitProjectData
|
||||
#Fri Aug 19 10:27:28 CST 2016
|
||||
.gitdir=../../.git
|
||||
Binary file not shown.
Binary file not shown.
|
|
@ -1,3 +0,0 @@
|
|||
#GitProjectData
|
||||
#Fri Aug 19 10:27:28 CST 2016
|
||||
.gitdir=../../.git
|
||||
Binary file not shown.
Binary file not shown.
|
|
@ -1,3 +0,0 @@
|
|||
#GitProjectData
|
||||
#Fri Aug 19 10:27:28 CST 2016
|
||||
.gitdir=../../.git
|
||||
Binary file not shown.
Binary file not shown.
|
|
@ -1,3 +0,0 @@
|
|||
#GitProjectData
|
||||
#Fri Aug 19 10:27:28 CST 2016
|
||||
.gitdir=../../.git
|
||||
Binary file not shown.
Binary file not shown.
|
|
@ -1,3 +0,0 @@
|
|||
#GitProjectData
|
||||
#Fri Aug 19 10:27:28 CST 2016
|
||||
.gitdir=../../.git
|
||||
Binary file not shown.
|
|
@ -1,3 +0,0 @@
|
|||
#GitProjectData
|
||||
#Fri Aug 19 10:27:28 CST 2016
|
||||
.gitdir=../../.git
|
||||
Binary file not shown.
|
|
@ -1,3 +0,0 @@
|
|||
#GitProjectData
|
||||
#Fri Aug 19 10:27:28 CST 2016
|
||||
.gitdir=../../.git
|
||||
|
|
@ -1 +0,0 @@
|
|||
|
||||
Binary file not shown.
|
|
@ -1 +0,0 @@
|
|||
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
eclipse.preferences.version=1
|
||||
version=1
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
GitRepositoriesView.GitDirectories=E\:\\2016Spring\\robocodefiles\\download\\app\\.git;
|
||||
eclipse.preferences.version=1
|
||||
|
|
@ -1,8 +0,0 @@
|
|||
eclipse.preferences.version=1
|
||||
org.eclipse.jdt.core.classpathVariable.M2_REPO=C\:/Users/Terrans Force/.m2/repository
|
||||
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
|
||||
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
|
||||
org.eclipse.jdt.core.compiler.compliance=1.6
|
||||
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
|
||||
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
|
||||
org.eclipse.jdt.core.compiler.source=1.6
|
||||
|
|
@ -1,14 +0,0 @@
|
|||
content_assist_proposals_background=255,255,255
|
||||
content_assist_proposals_foreground=0,0,0
|
||||
eclipse.preferences.version=1
|
||||
fontPropagated=true
|
||||
org.eclipse.jdt.internal.ui.navigator.layout=2
|
||||
org.eclipse.jdt.ui.editor.tab.width=
|
||||
org.eclipse.jdt.ui.formatterprofiles.version=12
|
||||
org.eclipse.jdt.ui.javadoclocations.migrated=true
|
||||
org.eclipse.jface.textfont=1|Consolas|10.0|0|WINDOWS|1|0|0|0|0|0|0|0|0|1|0|0|0|0|Consolas;
|
||||
proposalOrderMigrated=true
|
||||
spelling_locale_initialized=true
|
||||
tabWidthPropagated=true
|
||||
useAnnotationsPrefPage=true
|
||||
useQuickDiffPrefPage=true
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
areThereWebServices=false
|
||||
eclipse.preferences.version=1
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
eclipse.preferences.version=1
|
||||
org.eclipse.m2e.discovery.pref.projects=
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
eclipse.preferences.version=1
|
||||
mylyn.attention.migrated=true
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
eclipse.preferences.version=1
|
||||
org.eclipse.mylyn.monitor.activity.tracking.enabled.checked=true
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
eclipse.preferences.version=1
|
||||
org.eclipse.mylyn.tasks.ui.filters.nonmatching=true
|
||||
org.eclipse.mylyn.tasks.ui.filters.nonmatching.encouraged=true
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
eclipse.preferences.version=1
|
||||
knownEEFragments=
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
eclipse.preferences.version=1
|
||||
org.eclipse.rse.preferences.order.connections=DESKTOP-SHKMAML.Local
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
eclipse.preferences.version=1
|
||||
pref_first_startup=false
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
eclipse.preferences.version=1
|
||||
org.eclipse.team.ui.first_time=false
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
PROBLEMS_FILTERS_MIGRATE=true
|
||||
eclipse.preferences.version=1
|
||||
platformState=1462975067413
|
||||
quickStart=false
|
||||
tipsAndTricks=true
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
eclipse.preferences.version=1
|
||||
showIntro=false
|
||||
|
|
@ -1,4 +0,0 @@
|
|||
//org.eclipse.ui.commands/state/org.eclipse.wst.xml.views.XPathView.processor.xpathprocessor/org.eclipse.ui.commands.radioState=xpath10
|
||||
ENABLED_DECORATORS=org.eclipse.jst.ws.jaxws.dom.integration.navigator.WebServiceDecorator\:true,org.eclipse.m2e.core.mavenVersionDecorator\:false,org.eclipse.wst.server.ui.decorator\:false,org.eclipse.datatools.connectivity.sqm.core.internal.ui.explorer.DependencyDecoration\:true,org.eclipse.datatools.connectivity.sqm.core.internal.ui.explorer.ColumnDecoration\:true,org.eclipse.datatools.connectivity.sqm.core.internal.ui.explorer.ForeignKeyDecoration\:true,org.eclipse.datatools.connectivity.sqm.core.internal.ui.explorer.IndexTriggerDecoration\:true,org.eclipse.datatools.connectivity.internal.core.ui.bookmarkDecoration\:true,org.eclipse.datatools.connectivity.internal.core.ui.FilterNodeDecoration\:true,org.eclipse.datatools.connectivity.ui.decorator.contentextension\:false,org.eclipse.datatools.enablement.ingres.ui.providers.decorators.SynonymDecorationService\:true,org.eclipse.datatools.enablement.ingres.internal.ui.providers.decorators.ParameterDecorationService\:true,org.eclipse.datatools.enablement.sybase.asa.proxytabledecorator\:true,org.eclipse.datatools.enablement.sybase.ase.webservicetabledecorator\:true,org.eclipse.datatools.enablement.sybase.systemtabledecorator\:true,org.eclipse.egit.ui.internal.decorators.GitLightweightDecorator\:true,org.eclipse.jdt.ui.override.decorator\:true,org.eclipse.jdt.ui.interface.decorator\:false,org.eclipse.jdt.ui.buildpath.decorator\:true,org.eclipse.jst.j2ee.internal.ui.util.AnnotationIconDecorator_ejb\:true,org.eclipse.jst.j2ee.navigator.internal.J2EEProjectDecorator\:true,org.eclipse.jst.jee.ui.internal.navigator.ejb.BeanDecorator\:true,org.eclipse.jst.jee.navigator.internal.JEEProjectDecorator\:true,org.eclipse.jst.j2ee.internal.ui.util.AnnotationIconDecorator_servlet\:true,org.eclipse.m2e.core.maven2decorator\:true,org.eclipse.mylyn.context.ui.decorator.interest\:true,org.eclipse.mylyn.tasks.ui.decorators.task\:true,org.eclipse.mylyn.team.ui.changeset.decorator\:true,org.eclipse.pde.ui.binaryProjectDecorator\:false,org.eclipse.rse.core.virtualobject.decorator\:true,org.eclipse.rse.core.binary.executable.decorator\:true,org.eclipse.rse.core.script.executable.decorator\:true,org.eclipse.rse.core.java.executable.decorator\:true,org.eclipse.rse.core.library.decorator\:true,org.eclipse.rse.core.link.decorator\:true,org.eclipse.rse.subsystems.error.decorator\:true,org.eclipse.team.cvs.ui.decorator\:true,org.eclipse.ui.LinkedResourceDecorator\:true,org.eclipse.ui.SymlinkDecorator\:true,org.eclipse.ui.VirtualResourceDecorator\:true,org.eclipse.ui.ContentTypeDecorator\:true,org.eclipse.ui.ResourceFilterDecorator\:false,org.eclipse.wst.jsdt.ui.override.decorator\:true,org.eclipse.wst.server.ui.navigatorDecorator\:true,
|
||||
PLUGINS_NOT_ACTIVATED_ON_STARTUP=org.eclipse.m2e.discovery;
|
||||
eclipse.preferences.version=1
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue