diff options
author | Starla Insigna <hatkirby@fourisland.com> | 2009-01-27 14:28:43 -0500 |
---|---|---|
committer | Starla Insigna <hatkirby@fourisland.com> | 2009-01-27 14:28:43 -0500 |
commit | 9ca53b553cfaf488f7e8e678721bf9e655fa377e (patch) | |
tree | fa110584eb1b083fbe0e005ab9f235f3a8f931f1 /nbproject | |
parent | cd6b39590b8aced78fc2f6ed0c345fb9af1960c0 (diff) | |
download | fourpuzzle-9ca53b553cfaf488f7e8e678721bf9e655fa377e.tar.gz fourpuzzle-9ca53b553cfaf488f7e8e678721bf9e655fa377e.tar.bz2 fourpuzzle-9ca53b553cfaf488f7e8e678721bf9e655fa377e.zip |
Fixed "walk-thru-me" bug
Previously, Map's checkForCollision did not properly check collision and would allow an event to initiate movement to a location another event was already moving to (but wasn't at yet).
Diffstat (limited to 'nbproject')
-rw-r--r-- | nbproject/genfiles.properties | 3 | ||||
-rw-r--r-- | nbproject/profiler-build-impl.xml | 131 |
2 files changed, 134 insertions, 0 deletions
diff --git a/nbproject/genfiles.properties b/nbproject/genfiles.properties index 5921ab8..391a3ec 100644 --- a/nbproject/genfiles.properties +++ b/nbproject/genfiles.properties | |||
@@ -6,3 +6,6 @@ build.xml.stylesheet.CRC32=be360661 | |||
6 | nbproject/build-impl.xml.data.CRC32=15d90fc1 | 6 | nbproject/build-impl.xml.data.CRC32=15d90fc1 |
7 | nbproject/build-impl.xml.script.CRC32=3013fcc1 | 7 | nbproject/build-impl.xml.script.CRC32=3013fcc1 |
8 | nbproject/build-impl.xml.stylesheet.CRC32=487672f9 | 8 | nbproject/build-impl.xml.stylesheet.CRC32=487672f9 |
9 | nbproject/profiler-build-impl.xml.data.CRC32=15d90fc1 | ||
10 | nbproject/profiler-build-impl.xml.script.CRC32=abda56ed | ||
11 | nbproject/profiler-build-impl.xml.stylesheet.CRC32=42cb6bcf | ||
diff --git a/nbproject/profiler-build-impl.xml b/nbproject/profiler-build-impl.xml new file mode 100644 index 0000000..7c8995d --- /dev/null +++ b/nbproject/profiler-build-impl.xml | |||
@@ -0,0 +1,131 @@ | |||
1 | <?xml version="1.0" encoding="UTF-8"?> | ||
2 | <!-- | ||
3 | *** GENERATED FROM project.xml - DO NOT EDIT *** | ||
4 | *** EDIT ../build.xml INSTEAD *** | ||
5 | |||
6 | For the purpose of easier reading the script | ||
7 | is divided into following sections: | ||
8 | |||
9 | - initialization | ||
10 | - profiling | ||
11 | - applet profiling | ||
12 | |||
13 | --> | ||
14 | <project name="-profiler-impl" default="profile" basedir=".."> | ||
15 | <target name="default" depends="profile" description="Build and profile the project."/> | ||
16 | <!-- | ||
17 | ====================== | ||
18 | INITIALIZATION SECTION | ||
19 | ====================== | ||
20 | --> | ||
21 | <target name="profile-init" depends="-profile-pre-init, init, -profile-post-init, -profile-init-macrodef-profile, -profile-init-check"/> | ||
22 | <target name="-profile-pre-init"> | ||
23 | <!-- Empty placeholder for easier customization. --> | ||
24 | <!-- You can override this target in the ../build.xml file. --> | ||
25 | </target> | ||
26 | <target name="-profile-post-init"> | ||
27 | <!-- Empty placeholder for easier customization. --> | ||
28 | <!-- You can override this target in the ../build.xml file. --> | ||
29 | </target> | ||
30 | <target name="-profile-init-macrodef-profile"> | ||
31 | <macrodef name="resolve"> | ||
32 | <attribute name="name"/> | ||
33 | <attribute name="value"/> | ||
34 | <sequential> | ||
35 | <property name="@{name}" value="${env.@{value}}"/> | ||
36 | </sequential> | ||
37 | </macrodef> | ||
38 | <macrodef name="profile"> | ||
39 | <attribute name="classname" default="${main.class}"/> | ||
40 | <element name="customize" optional="true"/> | ||
41 | <sequential> | ||
42 | <property environment="env"/> | ||
43 | <resolve name="profiler.current.path" value="${profiler.info.pathvar}"/> | ||
44 | <java fork="true" classname="@{classname}" dir="${profiler.info.dir}" jvm="${profiler.info.jvm}"> | ||
45 | <jvmarg value="${profiler.info.jvmargs.agent}"/> | ||
46 | <jvmarg line="${profiler.info.jvmargs}"/> | ||
47 | <env key="${profiler.info.pathvar}" path="${profiler.info.agentpath}:${profiler.current.path}"/> | ||
48 | <arg line="${application.args}"/> | ||
49 | <classpath> | ||
50 | <path path="${run.classpath}"/> | ||
51 | </classpath> | ||
52 | <syspropertyset> | ||
53 | <propertyref prefix="run-sys-prop."/> | ||
54 | <mapper type="glob" from="run-sys-prop.*" to="*"/> | ||
55 | </syspropertyset> | ||
56 | <customize/> | ||
57 | </java> | ||
58 | </sequential> | ||
59 | </macrodef> | ||
60 | </target> | ||
61 | <target name="-profile-init-check" depends="-profile-pre-init, init, -profile-post-init, -profile-init-macrodef-profile"> | ||
62 | <fail unless="profiler.info.jvm">Must set JVM to use for profiling in profiler.info.jvm</fail> | ||
63 | <fail unless="profiler.info.jvmargs.agent">Must set profiler agent JVM arguments in profiler.info.jvmargs.agent</fail> | ||
64 | </target> | ||
65 | <!-- | ||
66 | ================= | ||
67 | PROFILING SECTION | ||
68 | ================= | ||
69 | --> | ||
70 | <target name="profile" if="netbeans.home" depends="profile-init,compile" description="Profile a project in the IDE."> | ||
71 | <nbprofiledirect> | ||
72 | <classpath> | ||
73 | <path path="${run.classpath}"/> | ||
74 | </classpath> | ||
75 | </nbprofiledirect> | ||
76 | <profile/> | ||
77 | </target> | ||
78 | <target name="profile-single" if="netbeans.home" depends="profile-init,compile-single" description="Profile a selected class in the IDE."> | ||
79 | <fail unless="profile.class">Must select one file in the IDE or set profile.class</fail> | ||
80 | <nbprofiledirect> | ||
81 | <classpath> | ||
82 | <path path="${run.classpath}"/> | ||
83 | </classpath> | ||
84 | </nbprofiledirect> | ||
85 | <profile classname="${profile.class}"/> | ||
86 | </target> | ||
87 | <!-- | ||
88 | ========================= | ||
89 | APPLET PROFILING SECTION | ||
90 | ========================= | ||
91 | --> | ||
92 | <target name="profile-applet" if="netbeans.home" depends="profile-init,compile-single"> | ||
93 | <nbprofiledirect> | ||
94 | <classpath> | ||
95 | <path path="${run.classpath}"/> | ||
96 | </classpath> | ||
97 | </nbprofiledirect> | ||
98 | <profile classname="sun.applet.AppletViewer"> | ||
99 | <customize> | ||
100 | <arg value="${applet.url}"/> | ||
101 | </customize> | ||
102 | </profile> | ||
103 | </target> | ||
104 | <!-- | ||
105 | ========================= | ||
106 | TESTS PROFILING SECTION | ||
107 | ========================= | ||
108 | --> | ||
109 | <target name="profile-test-single" if="netbeans.home" depends="profile-init,compile-test-single"> | ||
110 | <nbprofiledirect> | ||
111 | <classpath> | ||
112 | <path path="${run.test.classpath}"/> | ||
113 | </classpath> | ||
114 | </nbprofiledirect> | ||
115 | <junit showoutput="true" fork="true" dir="${profiler.info.dir}" jvm="${profiler.info.jvm}" failureproperty="tests.failed" errorproperty="tests.failed"> | ||
116 | <env key="${profiler.info.pathvar}" path="${profiler.info.agentpath}:${profiler.current.path}"/> | ||
117 | <jvmarg value="${profiler.info.jvmargs.agent}"/> | ||
118 | <jvmarg line="${profiler.info.jvmargs}"/> | ||
119 | <test name="${profile.class}"/> | ||
120 | <classpath> | ||
121 | <path path="${run.test.classpath}"/> | ||
122 | </classpath> | ||
123 | <syspropertyset> | ||
124 | <propertyref prefix="test-sys-prop."/> | ||
125 | <mapper type="glob" from="test-sys-prop.*" to="*"/> | ||
126 | </syspropertyset> | ||
127 | <formatter type="brief" usefile="false"/> | ||
128 | <formatter type="xml"/> | ||
129 | </junit> | ||
130 | </target> | ||
131 | </project> | ||