Tube Out

Merge lp:~rotolonico/tubeout/tubeout into lp:tubeout

  1. tubeout
  2. Merge into trunk
Proposed by Domenico Rotolo
Status: Merged
Approved by: Paolo Rotolo
Approved revision: 2
Merged at revision: 2
Proposed branch: lp:~rotolonico/tubeout/tubeout
Merge into: lp:tubeout
Diff against target: 486 lines (+138/-131)
5 files modified
Tube Out/game.xml (+13/-14)
Tube Out/game.xml.bak (+10/-11)
Tube Out/resources/data.xml (+6/-6)
Tube Out/scenes/2.xml (+101/-92)
Tube Out/snippets/list.xml (+8/-8)
To merge this branch: bzr merge lp:~rotolonico/tubeout/tubeout
Reviewer Review Type Date Requested Status
Paolo Rotolo merge-approved Approve
Review via email: mp+166574@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Paolo Rotolo (paolorotolo) wrote :

Good job. Approve!

review: Approve
Revision history for this message
Paolo Rotolo (paolorotolo) wrote :

merge-approved

review: Approve (merge-approved)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Tube Out/game.xml'
2--- Tube Out/game.xml 2013-05-30 18:40:51 +0000
3+++ Tube Out/game.xml 2013-05-30 18:52:24 +0000
4@@ -30,12 +30,12 @@
5 </group>
6 <group desc="" id="2" name="Other" type="snippet">
7 <r id="21"/>
8+ <r id="6"/>
9 <r id="23"/>
10- <r id="6"/>
11+ <r id="9"/>
12 <r id="24"/>
13- <r id="9"/>
14+ <r id="46"/>
15 <r id="29"/>
16- <r id="46"/>
17 <r id="14"/>
18 </group>
19 <group desc="" id="3" name="Saving" type="snippet">
20@@ -55,24 +55,23 @@
21 <group desc="" id="4" name="Nemici"/>
22 </groups>
23 <cgroups>
24+ <cgroup g1="4" g2="3"/>
25 <cgroup g1="4" g2="1"/>
26- <cgroup g1="4" g2="3"/>
27 <cgroup g1="4" g2="0"/>
28+ <cgroup g1="3" g2="3"/>
29+ <cgroup g1="3" g2="0"/>
30 <cgroup g1="1" g2="1"/>
31- <cgroup g1="1" g2="3"/>
32 <cgroup g1="1" g2="0"/>
33- <cgroup g1="3" g2="3"/>
34- <cgroup g1="3" g2="0"/>
35 <cgroup g1="0" g2="0"/>
36 </cgroups>
37 <input>
38- <key id="0" keyname="UP" name="up" vk="38" vks="38"/>
39- <key id="1" keyname="DOWN" name="down" vk="40" vks="40"/>
40- <key id="2" keyname="LEFT" name="left" vk="37" vks="37"/>
41- <key id="3" keyname="RIGHT" name="right" vk="39" vks="39"/>
42- <key id="4" keyname="Z" name="action1" vk="90" vks="90"/>
43- <key id="5" keyname="X" name="action2" vk="88" vks="88"/>
44- <key id="6" keyname="ENTER" name="enter" vk="10" vks="10"/>
45+ <key id="0" keyname="UP" name="up" vk="38"/>
46+ <key id="1" keyname="DOWN" name="down" vk="40"/>
47+ <key id="2" keyname="LEFT" name="left" vk="37"/>
48+ <key id="3" keyname="RIGHT" name="right" vk="39"/>
49+ <key id="4" keyname="Z" name="action1" vk="90"/>
50+ <key id="5" keyname="X" name="action2" vk="88"/>
51+ <key id="6" keyname="ENTER" name="enter" vk="10"/>
52 </input>
53 <attcats>
54 <cat id="-1" name="Default"/>
55
56=== modified file 'Tube Out/game.xml.bak'
57--- Tube Out/game.xml.bak 2013-05-30 18:40:51 +0000
58+++ Tube Out/game.xml.bak 2013-05-30 18:52:24 +0000
59@@ -55,24 +55,23 @@
60 <group desc="" id="4" name="Nemici"/>
61 </groups>
62 <cgroups>
63+ <cgroup g1="4" g2="3"/>
64 <cgroup g1="4" g2="1"/>
65- <cgroup g1="4" g2="3"/>
66 <cgroup g1="4" g2="0"/>
67+ <cgroup g1="3" g2="3"/>
68+ <cgroup g1="3" g2="0"/>
69 <cgroup g1="1" g2="1"/>
70- <cgroup g1="1" g2="3"/>
71 <cgroup g1="1" g2="0"/>
72- <cgroup g1="3" g2="3"/>
73- <cgroup g1="3" g2="0"/>
74 <cgroup g1="0" g2="0"/>
75 </cgroups>
76 <input>
77- <key id="0" keyname="UP" name="up" vk="38" vks="38"/>
78- <key id="1" keyname="DOWN" name="down" vk="40" vks="40"/>
79- <key id="2" keyname="LEFT" name="left" vk="37" vks="37"/>
80- <key id="3" keyname="RIGHT" name="right" vk="39" vks="39"/>
81- <key id="4" keyname="Z" name="action1" vk="90" vks="90"/>
82- <key id="5" keyname="X" name="action2" vk="88" vks="88"/>
83- <key id="6" keyname="ENTER" name="enter" vk="10" vks="10"/>
84+ <key id="0" keyname="UP" name="up" vk="38"/>
85+ <key id="1" keyname="DOWN" name="down" vk="40"/>
86+ <key id="2" keyname="LEFT" name="left" vk="37"/>
87+ <key id="3" keyname="RIGHT" name="right" vk="39"/>
88+ <key id="4" keyname="Z" name="action1" vk="90"/>
89+ <key id="5" keyname="X" name="action2" vk="88"/>
90+ <key id="6" keyname="ENTER" name="enter" vk="10"/>
91 </input>
92 <attcats>
93 <cat id="-1" name="Default"/>
94
95=== modified file 'Tube Out/resources/data.xml'
96--- Tube Out/resources/data.xml 2013-05-30 18:40:51 +0000
97+++ Tube Out/resources/data.xml 2013-05-30 18:52:24 +0000
98@@ -114,8 +114,8 @@
99 <prop id="12" list="0" val="true"/>
100 <prop id="13" list="0" val="true"/>
101 <prop id="14" list="0" val="true"/>
102+ <prop id="15" list="0" val="true"/>
103 <prop id="2147483647" list="0" val="thisactor"/>
104- <prop id="15" list="0" val="true"/>
105 <prop id="17" list="0" val="true"/>
106 <prop id="16" list="0" val="true"/>
107 <prop id="18" list="0" val="10.0"/>
108@@ -219,8 +219,8 @@
109 <prop id="12" list="0" val="250"/>
110 <prop id="13" list="0" val="65"/>
111 <prop id="14" list="0" val="jump-r"/>
112+ <prop id="2147483647" list="0" val="thisactor"/>
113 <prop id="15" list="0" val="jump-l"/>
114- <prop id="2147483647" list="0" val="thisactor"/>
115 <prop id="17" list="0" val="Wall Jumping"/>
116 <prop id="16" list="0" val="false"/>
117 </s>
118@@ -618,8 +618,8 @@
119 <prop id="12" list="0" val="true"/>
120 <prop id="13" list="0" val="true"/>
121 <prop id="14" list="0" val="true"/>
122+ <prop id="15" list="0" val="true"/>
123 <prop id="2147483647" list="0" val="thisactor"/>
124- <prop id="15" list="0" val="true"/>
125 <prop id="17" list="0" val="true"/>
126 <prop id="16" list="0" val="true"/>
127 <prop id="18" list="0" val="10.0"/>
128@@ -648,8 +648,8 @@
129 <prop id="12" list="0" val="true"/>
130 <prop id="13" list="0" val="true"/>
131 <prop id="14" list="0" val="true"/>
132+ <prop id="15" list="0" val="true"/>
133 <prop id="2147483647" list="0" val="thisactor"/>
134- <prop id="15" list="0" val="true"/>
135 <prop id="17" list="0" val="true"/>
136 <prop id="16" list="0" val="true"/>
137 <prop id="18" list="0" val="10.0"/>
138@@ -765,8 +765,8 @@
139 <prop id="12" list="0" val="250"/>
140 <prop id="13" list="0" val="65"/>
141 <prop id="14" list="0" val="jump-r"/>
142+ <prop id="2147483647" list="0" val="thisactor"/>
143 <prop id="15" list="0" val="jump-l"/>
144- <prop id="2147483647" list="0" val="thisactor"/>
145 <prop id="17" list="0" val="Wall Jumping"/>
146 <prop id="16" list="0" val="false"/>
147 </s>
148@@ -922,8 +922,8 @@
149 <prop id="12" list="0" val="250"/>
150 <prop id="13" list="0" val="65"/>
151 <prop id="14" list="0" val="jump-r"/>
152+ <prop id="2147483647" list="0" val="thisactor"/>
153 <prop id="15" list="0" val="jump-l"/>
154- <prop id="2147483647" list="0" val="thisactor"/>
155 <prop id="17" list="0" val="Wall Jumping"/>
156 <prop id="16" list="0" val="false"/>
157 </s>
158
159=== modified file 'Tube Out/scenes/2.png'
160Binary files Tube Out/scenes/2.png 2013-05-30 18:40:51 +0000 and Tube Out/scenes/2.png 2013-05-30 18:52:24 +0000 differ
161=== modified file 'Tube Out/scenes/2.scn'
162Binary files Tube Out/scenes/2.scn 2013-05-30 18:40:51 +0000 and Tube Out/scenes/2.scn 2013-05-30 18:52:24 +0000 differ
163=== modified file 'Tube Out/scenes/2.xml'
164--- Tube Out/scenes/2.xml 2013-05-30 18:40:51 +0000
165+++ Tube Out/scenes/2.xml 2013-05-30 18:52:24 +0000
166@@ -8,7 +8,7 @@
167 <foregrounds/>
168 <joints/>
169 <regions>
170- <region b="64" g="64" h="30" id="0" name="Region 0" pts="4,0.0,0.0,0.0,30.0,22.0,30.0,22.0,0.0" r="64" type="box" w="22" x="454" y="1574"/>
171+ <region b="64" g="64" h="30" id="0" name="Region 0" pts="4,22.0,0.0,22.0,30.0,0.0,30.0,0.0,0.0" r="64" type="box" w="22" x="454" y="1574"/>
172 </regions>
173 <terrainRegions/>
174 <actors>
175@@ -27,16 +27,16 @@
176 <actor a="0.0" aid="15" c="false" group="4" id="69" name="Freccia 15" sx="1.0" sy="1.0" x="352" y="512" z="0"/>
177 <actor a="0.0" aid="17" c="false" group="4" id="69" name="Freccia 17" sx="1.0" sy="1.0" x="416" y="512" z="0"/>
178 <actor a="0.0" aid="16" c="false" group="4" id="69" name="Freccia 16" sx="1.0" sy="1.0" x="384" y="512" z="0"/>
179- <actor a="90.0" aid="19" c="false" group="4" id="69" name="Freccia 19" sx="1.0" sy="1.0" x="256" y="576" z="0"/>
180+ <actor a="270.0" aid="19" c="false" group="4" id="69" name="Freccia 19" sx="1.0" sy="1.0" x="256" y="576" z="0"/>
181 <actor a="0.0" aid="18" c="false" group="4" id="69" name="Freccia 18" sx="1.0" sy="1.0" x="448" y="512" z="0"/>
182- <actor a="270.0" aid="21" c="false" group="4" id="69" name="Freccia 21" sx="1.0" sy="1.0" x="352" y="576" z="0"/>
183- <actor a="90.0" aid="20" c="false" group="4" id="69" name="Freccia 20" sx="1.0" sy="1.0" x="256" y="608" z="0"/>
184- <actor a="270.0" aid="22" c="false" group="4" id="69" name="Freccia 22" sx="1.0" sy="1.0" x="352" y="608" z="0"/>
185- <actor a="90.0" aid="25" c="false" group="4" id="69" name="Freccia 25" sx="1.0" sy="1.0" x="256" y="640" z="0"/>
186- <actor a="90.0" aid="26" c="false" group="4" id="69" name="Freccia 26" sx="1.0" sy="1.0" x="256" y="672" z="0"/>
187+ <actor a="90.0" aid="21" c="false" group="4" id="69" name="Freccia 21" sx="1.0" sy="1.0" x="352" y="576" z="0"/>
188+ <actor a="270.0" aid="20" c="false" group="4" id="69" name="Freccia 20" sx="1.0" sy="1.0" x="256" y="608" z="0"/>
189+ <actor a="90.0" aid="22" c="false" group="4" id="69" name="Freccia 22" sx="1.0" sy="1.0" x="352" y="608" z="0"/>
190+ <actor a="270.0" aid="25" c="false" group="4" id="69" name="Freccia 25" sx="1.0" sy="1.0" x="256" y="640" z="0"/>
191+ <actor a="270.0" aid="26" c="false" group="4" id="69" name="Freccia 26" sx="1.0" sy="1.0" x="256" y="672" z="0"/>
192 <actor a="0.0" aid="28" c="false" group="4" id="69" name="Freccia 28" sx="1.0" sy="1.0" x="288" y="704" z="0"/>
193- <actor a="270.0" aid="34" c="false" group="4" id="69" name="Freccia 34" sx="1.0" sy="1.0" x="352" y="640" z="0"/>
194- <actor a="270.0" aid="35" c="false" group="4" id="69" name="Freccia 35" sx="1.0" sy="1.0" x="352" y="672" z="0"/>
195+ <actor a="90.0" aid="34" c="false" group="4" id="69" name="Freccia 34" sx="1.0" sy="1.0" x="352" y="640" z="0"/>
196+ <actor a="90.0" aid="35" c="false" group="4" id="69" name="Freccia 35" sx="1.0" sy="1.0" x="352" y="672" z="0"/>
197 <actor a="0.0" aid="38" c="false" group="4" id="69" name="Freccia 38" sx="1.0" sy="1.0" x="352" y="928" z="0"/>
198 <actor a="0.0" aid="39" c="false" group="4" id="69" name="Freccia 39" sx="1.0" sy="1.0" x="256" y="928" z="0"/>
199 <actor a="0.0" aid="36" c="false" group="4" id="69" name="Freccia 36" sx="1.0" sy="1.0" x="160" y="512" z="0"/>
200@@ -45,6 +45,15 @@
201 <actor a="0.0" aid="43" c="false" group="4" id="69" name="Freccia 43" sx="1.0" sy="1.0" x="384" y="768" z="0"/>
202 <actor a="0.0" aid="40" c="false" group="4" id="69" name="Freccia 40" sx="1.0" sy="1.0" x="416" y="1280" z="0"/>
203 <actor a="0.0" aid="41" c="false" group="4" id="69" name="Freccia 41" sx="1.0" sy="1.0" x="448" y="1280" z="0"/>
204+ <actor a="0.0" aid="46" c="false" group="4" id="69" name="Freccia 46" sx="1.0" sy="1.0" x="352" y="1568" z="0"/>
205+ <actor a="0.0" aid="47" c="false" group="4" id="69" name="Freccia 47" sx="1.0" sy="1.0" x="320" y="1568" z="0"/>
206+ <actor a="0.0" aid="44" c="false" group="4" id="69" name="Freccia 44" sx="1.0" sy="1.0" x="416" y="1568" z="0"/>
207+ <actor a="0.0" aid="45" c="false" group="4" id="69" name="Freccia 45" sx="1.0" sy="1.0" x="384" y="1568" z="0"/>
208+ <actor a="0.0" aid="51" c="false" group="4" id="69" name="Freccia 51" sx="1.0" sy="1.0" x="192" y="1568" z="0"/>
209+ <actor a="0.0" aid="50" c="false" group="4" id="69" name="Freccia 50" sx="1.0" sy="1.0" x="224" y="1568" z="0"/>
210+ <actor a="0.0" aid="49" c="false" group="4" id="69" name="Freccia 49" sx="1.0" sy="1.0" x="256" y="1568" z="0"/>
211+ <actor a="0.0" aid="48" c="false" group="4" id="69" name="Freccia 48" sx="1.0" sy="1.0" x="288" y="1568" z="0"/>
212+ <actor a="0.0" aid="52" c="false" group="4" id="69" name="Freccia 52" sx="1.0" sy="1.0" x="160" y="1568" z="0"/>
213 </actors>
214 <snippets>
215 <s enabled="true" id="38">
216@@ -62,103 +71,103 @@
217 </snippets>
218 <terrain>
219 <p pts="3,32.0,32.0,0.0,32.0,32.0,0.0" x="320.0" y="1120.0"/>
220- <p pts="2,0.0,0.0,0.0,64.0" x="480.0" y="928.0"/>
221- <p pts="2,64.0,0.0,0.0,0.0" x="352.0" y="416.0"/>
222- <p pts="2,0.0,64.0,0.0,0.0" x="480.0" y="1280.0"/>
223- <p pts="2,0.0,0.0,0.0,64.0" x="480.0" y="1376.0"/>
224- <p pts="2,0.0,64.0,0.0,0.0" x="160.0" y="1248.0"/>
225- <p pts="4,0.32000732,0.0,0.32000732,32.0,0.0,32.0,0.0,0.0" x="159.68" y="1088.0"/>
226- <p pts="3,32.0,0.0,0.0,32.0,0.0,0.0" x="160.0" y="416.0"/>
227+ <p pts="4,0.32000732,0.0,0.32000732,32.0,0.0,32.0,0.0,0.0" x="159.68" y="160.0"/>
228+ <p pts="2,0.0,64.0,0.0,0.0" x="480.0" y="480.0"/>
229+ <p pts="3,32.0,32.0,0.0,32.0,0.0,0.0" x="224.0" y="1120.0"/>
230+ <p pts="2,0.0,0.0,0.0,64.0" x="160.0" y="1312.0"/>
231+ <p pts="2,0.0,64.0,0.0,0.0" x="160.0" y="1376.0"/>
232 <p pts="2,0.0,64.0,0.0,0.0" x="160.0" y="96.0"/>
233- <p pts="3,32.0,32.0,0.0,32.0,0.0,0.0" x="160.0" y="1056.0"/>
234+ <p pts="4,0.32000732,0.0,0.32000732,32.0,0.0,32.0,0.0,0.0" x="480.0" y="1344.0"/>
235 <p pts="2,0.0,64.0,0.0,0.0" x="160.0" y="1440.0"/>
236- <p pts="4,0.32000732,0.0,0.32000732,32.0,0.0,32.0,0.0,0.0" x="159.68" y="320.0"/>
237- <p pts="3,32.0,32.0,0.0,32.0,32.0,0.0" x="448.0" y="992.0"/>
238+ <p pts="2,0.0,64.0,0.0,0.0" x="480.0" y="704.0"/>
239+ <p pts="2,64.0,0.0,0.0,0.0" x="256.0" y="1312.0"/>
240+ <p pts="2,0.0,64.0,0.0,0.0" x="160.0" y="896.0"/>
241+ <p pts="3,32.0,32.0,0.0,32.0,32.0,0.0" x="448.0" y="288.0"/>
242 <p pts="4,32.0,0.0,32.0,0.3199997,0.0,0.3199997,0.0,0.0" x="224.0" y="31.68"/>
243- <p pts="2,0.0,0.0,0.0,64.0" x="480.0" y="1440.0"/>
244+ <p pts="2,0.0,64.0,0.0,0.0" x="480.0" y="224.0"/>
245+ <p pts="3,32.0,32.0,0.0,32.0,32.0,0.0" x="384.0" y="352.0"/>
246+ <p pts="3,0.0,0.0,32.0,32.0,0.0,32.0" x="256.0" y="384.0"/>
247 <p pts="2,0.0,0.0,0.0,64.0" x="480.0" y="32.0"/>
248+ <p pts="2,0.0,64.0,0.0,0.0" x="160.0" y="32.0"/>
249+ <p pts="3,32.0,32.0,0.0,32.0,0.0,0.0" x="320.0" y="1216.0"/>
250+ <p pts="2,0.0,0.0,0.0,64.0" x="160.0" y="1184.0"/>
251+ <p pts="2,0.0,0.0,64.0,0.0" x="192.0" y="1312.0"/>
252 <p pts="4,64.0,0.0,64.0,32.0,0.0,32.0,0.0,0.0" x="160.0" y="1440.0"/>
253- <p pts="2,0.0,0.0,0.0,64.0" x="160.0" y="1184.0"/>
254- <p pts="3,32.0,32.0,0.0,32.0,0.0,0.0" x="224.0" y="1120.0"/>
255+ <p pts="4,288.0,0.0,288.0,32.0,0.0,32.0,0.0,0.0" x="192.0" y="960.0"/>
256+ <p pts="2,0.0,64.0,0.0,0.0" x="160.0" y="1248.0"/>
257+ <p pts="4,0.32000732,0.0,0.32000732,32.0,0.0,32.0,0.0,0.0" x="159.68" y="1568.0"/>
258+ <p pts="3,32.0,32.0,0.0,32.0,32.0,0.0" x="224.0" y="1216.0"/>
259+ <p pts="2,0.0,64.0,0.0,0.0" x="160.0" y="768.0"/>
260+ <p pts="3,32.0,32.0,0.0,32.0,32.0,0.0" x="352.0" y="1088.0"/>
261+ <p pts="4,32.0,0.0,32.0,0.3199997,0.0,0.3199997,0.0,0.0" x="384.0" y="31.68"/>
262+ <p pts="3,32.0,32.0,0.0,32.0,32.0,0.0" x="352.0" y="384.0"/>
263+ <p pts="2,0.0,0.0,0.0,64.0" x="480.0" y="992.0"/>
264+ <p pts="3,32.0,32.0,0.0,32.0,32.0,0.0" x="384.0" y="1056.0"/>
265+ <p pts="4,0.32000732,0.0,0.32000732,32.0,0.0,32.0,0.0,0.0" x="191.68" y="1280.0"/>
266+ <p pts="2,0.0,0.0,0.0,64.0" x="160.0" y="192.0"/>
267+ <p pts="4,0.32000732,0.0,0.32000732,32.0,0.0,32.0,0.0,0.0" x="159.68" y="512.0"/>
268+ <p pts="3,32.0,32.0,0.0,32.0,0.0,0.0" x="192.0" y="1088.0"/>
269+ <p pts="2,0.0,0.0,0.0,64.0" x="480.0" y="768.0"/>
270+ <p pts="2,0.0,0.0,0.0,64.0" x="160.0" y="832.0"/>
271+ <p pts="2,0.0,64.0,0.0,0.0" x="160.0" y="960.0"/>
272+ <p pts="2,0.0,0.0,0.0,64.0" x="480.0" y="1376.0"/>
273+ <p pts="2,0.0,0.0,0.0,64.0" x="480.0" y="576.0"/>
274+ <p pts="4,0.0,32.0,0.0,0.0,64.0,0.0,64.0,32.0" x="288.0" y="1376.0"/>
275+ <p pts="2,0.0,0.0,0.0,64.0" x="480.0" y="1120.0"/>
276+ <p pts="16,128.0,288.0,128.0,224.0,96.0,224.0,96.0,192.0,0.0,192.0,0.0,0.0,128.0,0.0,128.0,32.0,96.0,32.0,96.0,160.0,128.0,160.0,128.0,192.0,160.0,192.0,160.0,256.0,288.0,256.0,288.0,288.0" x="160.0" y="544.0"/>
277+ <p pts="4,0.32000732,0.0,0.32000732,32.0,0.0,32.0,0.0,0.0" x="159.68" y="320.0"/>
278+ <p pts="2,0.0,64.0,0.0,0.0" x="480.0" y="832.0"/>
279+ <p pts="2,0.0,0.0,0.0,64.0" x="160.0" y="704.0"/>
280+ <p pts="3,0.0,32.0,32.0,0.0,64.0,32.0" x="256.0" y="1184.0"/>
281 <p pts="2,0.0,64.0,0.0,0.0" x="160.0" y="448.0"/>
282- <p pts="4,0.0,32.0,0.0,0.0,64.0,0.0,64.0,32.0" x="416.0" y="1312.0"/>
283- <p pts="3,32.0,32.0,0.0,32.0,32.0,0.0" x="384.0" y="1056.0"/>
284+ <p pts="4,0.32000732,0.0,0.32000732,32.0,0.0,32.0,0.0,0.0" x="159.68" y="1088.0"/>
285+ <p pts="4,0.32000732,0.0,0.32000732,32.0,0.0,32.0,0.0,0.0" x="480.0" y="896.0"/>
286+ <p pts="4,256.0,0.0,256.0,32.0,0.0,32.0,0.0,0.0" x="192.0" y="224.0"/>
287+ <p pts="4,0.0,32.0,0.0,0.0,64.0,0.0,64.0,32.0" x="224.0" y="1408.0"/>
288+ <p pts="2,0.0,0.0,0.0,64.0" x="480.0" y="96.0"/>
289 <p pts="2,64.0,0.0,0.0,0.0" x="416.0" y="416.0"/>
290- <p pts="2,0.0,0.0,64.0,0.0" x="320.0" y="1152.0"/>
291- <p pts="3,32.0,32.0,0.0,32.0,32.0,0.0" x="416.0" y="320.0"/>
292- <p pts="2,0.0,64.0,0.0,0.0" x="480.0" y="480.0"/>
293- <p pts="2,0.0,64.0,0.0,0.0" x="160.0" y="960.0"/>
294- <p pts="2,0.0,0.0,64.0,0.0" x="384.0" y="1152.0"/>
295- <p pts="3,32.0,32.0,0.0,32.0,32.0,0.0" x="352.0" y="384.0"/>
296- <p pts="4,0.32000732,0.0,0.32000732,32.0,0.0,32.0,0.0,0.0" x="191.68" y="1280.0"/>
297+ <p pts="2,64.0,0.0,0.0,0.0" x="320.0" y="1312.0"/>
298 <p pts="3,0.0,0.0,32.0,32.0,0.0,32.0" x="384.0" y="1280.0"/>
299+ <p pts="3,32.0,32.0,0.0,32.0,32.0,0.0" x="192.0" y="1248.0"/>
300+ <p pts="3,32.0,32.0,0.0,32.0,32.0,0.0" x="448.0" y="992.0"/>
301+ <p pts="4,0.0,32.0,0.0,0.0,64.0,0.0,64.0,32.0" x="416.0" y="1312.0"/>
302+ <p pts="2,0.0,64.0,0.0,0.0" x="160.0" y="256.0"/>
303+ <p pts="3,32.0,32.0,0.0,32.0,0.0,0.0" x="224.0" y="352.0"/>
304+ <p pts="4,32.0,0.0,32.0,32.0,0.0,32.0,0.0,0.0" x="352.0" y="1344.0"/>
305+ <p pts="8,0.0,0.0,32.0,0.0,32.0,32.0,160.0,32.0,160.0,0.0,192.0,0.0,192.0,64.0,0.0,64.0" x="224.0" y="64.0"/>
306+ <p pts="2,0.0,0.0,64.0,0.0" x="416.0" y="32.0"/>
307+ <p pts="3,32.0,32.0,0.0,32.0,0.0,0.0" x="160.0" y="1056.0"/>
308+ <p pts="2,0.0,0.0,64.0,0.0" x="256.0" y="32.0"/>
309+ <p pts="2,64.0,0.0,0.0,0.0" x="160.0" y="32.0"/>
310 <p pts="3,32.0,32.0,0.0,32.0,32.0,0.0" x="416.0" y="1024.0"/>
311- <p pts="2,0.0,64.0,0.0,0.0" x="480.0" y="224.0"/>
312- <p pts="2,0.0,64.0,0.0,0.0" x="160.0" y="896.0"/>
313- <p pts="2,0.0,0.0,0.0,64.0" x="160.0" y="832.0"/>
314+ <p pts="2,64.0,0.0,0.0,0.0" x="160.0" y="1152.0"/>
315 <p pts="6,128.0,160.0,32.0,160.0,32.0,32.0,0.0,32.0,0.0,0.0,128.0,0.0" x="352.0" y="544.0"/>
316- <p pts="2,0.0,0.0,0.0,64.0" x="480.0" y="768.0"/>
317- <p pts="4,0.32000732,0.0,0.32000732,32.0,0.0,32.0,0.0,0.0" x="480.0" y="1248.0"/>
318- <p pts="2,0.0,64.0,0.0,0.0" x="160.0" y="1120.0"/>
319- <p pts="4,32.0,0.0,32.0,0.3199997,0.0,0.3199997,0.0,0.0" x="384.0" y="31.68"/>
320- <p pts="3,32.0,32.0,0.0,32.0,32.0,0.0" x="352.0" y="1088.0"/>
321- <p pts="4,0.32000732,0.0,0.32000732,32.0,0.0,32.0,0.0,0.0" x="159.68" y="512.0"/>
322- <p pts="2,0.0,0.0,0.0,64.0" x="160.0" y="1312.0"/>
323- <p pts="4,32.0,0.0,32.0,32.0,0.0,32.0,0.0,0.0" x="352.0" y="1344.0"/>
324+ <p pts="2,0.0,0.0,0.0,64.0" x="480.0" y="288.0"/>
325+ <p pts="2,0.0,0.0,0.0,64.0" x="160.0" y="1504.0"/>
326+ <p pts="2,0.0,64.0,0.0,0.0" x="480.0" y="352.0"/>
327+ <p pts="2,64.0,0.0,0.0,0.0" x="352.0" y="416.0"/>
328+ <p pts="2,0.0,0.0,64.0,0.0" x="320.0" y="1152.0"/>
329 <p pts="2,0.0,0.0,0.0,64.0" x="480.0" y="416.0"/>
330- <p pts="2,0.0,64.0,0.0,0.0" x="480.0" y="832.0"/>
331- <p pts="4,0.32000732,0.0,0.32000732,32.0,0.0,32.0,0.0,0.0" x="159.68" y="160.0"/>
332- <p pts="2,0.0,64.0,0.0,0.0" x="160.0" y="256.0"/>
333+ <p pts="2,0.0,64.0,0.0,0.0" x="160.0" y="1024.0"/>
334+ <p pts="2,0.0,0.0,64.0,0.0" x="320.0" y="32.0"/>
335+ <p pts="2,0.0,0.0,64.0,0.0" x="384.0" y="1152.0"/>
336+ <p pts="3,32.0,0.0,0.0,32.0,0.0,0.0" x="160.0" y="416.0"/>
337+ <p pts="2,0.0,0.0,0.0,64.0" x="160.0" y="352.0"/>
338+ <p pts="2,0.0,0.0,0.0,64.0" x="480.0" y="160.0"/>
339+ <p pts="2,0.0,64.0,0.0,0.0" x="480.0" y="1056.0"/>
340+ <p pts="2,64.0,0.0,0.0,0.0" x="192.0" y="416.0"/>
341+ <p pts="4,32.0,0.0,32.0,0.3199463,0.0,0.3199463,0.0,0.0" x="448.0" y="1152.0"/>
342 <p pts="4,0.32000732,0.0,0.32000732,32.0,0.0,32.0,0.0,0.0" x="480.0" y="1504.0"/>
343- <p pts="2,0.0,0.0,0.0,64.0" x="480.0" y="160.0"/>
344- <p pts="2,0.0,64.0,0.0,0.0" x="480.0" y="1184.0"/>
345+ <p pts="4,0.32000732,0.0,0.32000732,32.0,0.0,32.0,0.0,0.0" x="480.0" y="1248.0"/>
346+ <p pts="3,32.0,32.0,0.0,32.0,32.0,0.0" x="416.0" y="320.0"/>
347 <p pts="2,0.0,0.0,0.0,64.0" x="480.0" y="1536.0"/>
348+ <p pts="2,0.0,64.0,0.0,0.0" x="160.0" y="1120.0"/>
349+ <p pts="2,0.0,0.0,0.0,64.0" x="480.0" y="1440.0"/>
350+ <p pts="2,0.0,64.0,0.0,0.0" x="480.0" y="1280.0"/>
351+ <p pts="3,32.0,32.0,0.0,32.0,0.0,0.0" x="160.0" y="288.0"/>
352 <p pts="3,32.0,32.0,0.0,32.0,0.0,0.0" x="192.0" y="320.0"/>
353- <p pts="2,0.0,0.0,0.0,64.0" x="480.0" y="288.0"/>
354- <p pts="2,0.0,64.0,0.0,0.0" x="160.0" y="1376.0"/>
355- <p pts="2,0.0,64.0,0.0,0.0" x="480.0" y="352.0"/>
356- <p pts="3,0.0,32.0,32.0,0.0,64.0,32.0" x="256.0" y="1184.0"/>
357- <p pts="2,0.0,64.0,0.0,0.0" x="480.0" y="1056.0"/>
358- <p pts="16,128.0,288.0,128.0,224.0,96.0,224.0,96.0,192.0,0.0,192.0,0.0,0.0,128.0,0.0,128.0,32.0,96.0,32.0,96.0,160.0,128.0,160.0,128.0,192.0,160.0,192.0,160.0,256.0,288.0,256.0,288.0,288.0" x="160.0" y="544.0"/>
359- <p pts="3,0.0,0.0,32.0,32.0,0.0,32.0" x="256.0" y="384.0"/>
360- <p pts="8,0.0,0.0,32.0,0.0,32.0,32.0,160.0,32.0,160.0,0.0,192.0,0.0,192.0,64.0,0.0,64.0" x="224.0" y="64.0"/>
361- <p pts="2,0.0,64.0,0.0,0.0" x="160.0" y="1024.0"/>
362- <p pts="4,32.0,0.0,32.0,0.3199463,0.0,0.3199463,0.0,0.0" x="448.0" y="1152.0"/>
363- <p pts="3,32.0,32.0,0.0,32.0,32.0,0.0" x="192.0" y="1248.0"/>
364- <p pts="2,0.0,64.0,0.0,0.0" x="480.0" y="704.0"/>
365- <p pts="4,288.0,0.0,288.0,32.0,0.0,32.0,0.0,0.0" x="192.0" y="960.0"/>
366- <p pts="2,0.0,0.0,0.0,64.0" x="480.0" y="1120.0"/>
367- <p pts="3,32.0,32.0,0.0,32.0,32.0,0.0" x="448.0" y="288.0"/>
368- <p pts="3,32.0,32.0,0.0,32.0,32.0,0.0" x="384.0" y="352.0"/>
369- <p pts="2,0.0,0.0,64.0,0.0" x="320.0" y="32.0"/>
370- <p pts="4,288.0,0.0,288.0,32.0,0.0,32.0,0.0,0.0" x="160.0" y="1568.0"/>
371 <p pts="3,32.0,32.0,0.0,32.0,0.0,0.0" x="352.0" y="1248.0"/>
372- <p pts="2,0.0,0.0,64.0,0.0" x="192.0" y="1312.0"/>
373- <p pts="4,0.32000732,0.0,0.32000732,32.0,0.0,32.0,0.0,0.0" x="480.0" y="1344.0"/>
374- <p pts="2,0.0,64.0,0.0,0.0" x="160.0" y="32.0"/>
375- <p pts="4,0.32000732,0.0,0.32000732,32.0,0.0,32.0,0.0,0.0" x="480.0" y="896.0"/>
376- <p pts="2,0.0,0.0,0.0,64.0" x="160.0" y="192.0"/>
377- <p pts="2,0.0,0.0,64.0,0.0" x="256.0" y="32.0"/>
378- <p pts="2,64.0,0.0,0.0,0.0" x="160.0" y="32.0"/>
379- <p pts="2,64.0,0.0,0.0,0.0" x="320.0" y="1312.0"/>
380- <p pts="3,32.0,32.0,0.0,32.0,0.0,0.0" x="224.0" y="352.0"/>
381- <p pts="4,0.0,32.0,0.0,0.0,64.0,0.0,64.0,32.0" x="224.0" y="1408.0"/>
382- <p pts="2,0.0,0.0,0.0,64.0" x="480.0" y="992.0"/>
383- <p pts="3,32.0,32.0,0.0,32.0,0.0,0.0" x="320.0" y="1216.0"/>
384- <p pts="4,0.0,32.0,0.0,0.0,64.0,0.0,64.0,32.0" x="288.0" y="1376.0"/>
385- <p pts="2,0.0,0.0,0.0,64.0" x="480.0" y="96.0"/>
386- <p pts="3,32.0,32.0,0.0,32.0,32.0,0.0" x="224.0" y="1216.0"/>
387- <p pts="2,0.0,0.0,0.0,64.0" x="160.0" y="704.0"/>
388- <p pts="2,0.0,0.0,0.0,64.0" x="160.0" y="1504.0"/>
389- <p pts="3,32.0,32.0,0.0,32.0,0.0,0.0" x="160.0" y="288.0"/>
390- <p pts="2,64.0,0.0,0.0,0.0" x="192.0" y="416.0"/>
391- <p pts="2,64.0,0.0,0.0,0.0" x="160.0" y="1152.0"/>
392- <p pts="2,64.0,0.0,0.0,0.0" x="256.0" y="1312.0"/>
393- <p pts="2,0.0,64.0,0.0,0.0" x="160.0" y="768.0"/>
394- <p pts="2,0.0,0.0,0.0,64.0" x="480.0" y="576.0"/>
395- <p pts="4,256.0,0.0,256.0,32.0,0.0,32.0,0.0,0.0" x="192.0" y="224.0"/>
396- <p pts="2,0.0,0.0,0.0,64.0" x="160.0" y="352.0"/>
397- <p pts="3,32.0,32.0,0.0,32.0,0.0,0.0" x="192.0" y="1088.0"/>
398- <p pts="2,0.0,0.0,64.0,0.0" x="416.0" y="32.0"/>
399+ <p pts="2,0.0,0.0,0.0,64.0" x="480.0" y="928.0"/>
400+ <p pts="2,0.0,64.0,0.0,0.0" x="480.0" y="1184.0"/>
401 </terrain>
402 </scene>
403
404=== modified file 'Tube Out/snippets/list.xml'
405--- Tube Out/snippets/list.xml 2013-05-30 18:40:51 +0000
406+++ Tube Out/snippets/list.xml 2013-05-30 18:52:24 +0000
407@@ -131,8 +131,8 @@
408 <number default="250" desc="Angle used when jumping towards the left&lt;br&gt;&lt;br&gt;&#10;default = 250" dropdown="" fullname="Jump Left Angle" hidden="false" id="12" name="_JumpLeftAngle" order="11"/>
409 <number default="65" desc="Amount of force to apply during the jump&lt;br&gt;&lt;br&gt;&#10;default = 65" dropdown="" fullname="Jump Force" hidden="false" id="13" name="_JumpForce" order="12"/>
410 <animation default="" desc="" dropdown="" fullname="Wall Jump Right Animation" hidden="false" id="14" name="_WallJumpRightAnimation" order="13"/>
411+ <actor default="thisactor" desc="" dropdown="" fullname="Actor" hidden="true" id="2147483647" name="actor" order="0"/>
412 <animation default="" desc="" dropdown="" fullname="Wall Jump Left Animation" hidden="false" id="15" name="_WallJumpLeftAnimation" order="14"/>
413- <actor default="thisactor" desc="" dropdown="" fullname="Actor" hidden="true" id="2147483647" name="actor" order="0"/>
414 <text default="Wall Jumping" desc="Set the category used for the animation - used for the hierarchy." dropdown="" fullname="Animation Category" hidden="false" id="17" name="_AnimationCategory" order="16"/>
415 <boolean default="false" desc="" dropdown="" fullname="Prevent Wall Jump" hidden="true" id="16" name="_PreventWallJump" order="15"/>
416 <blocks>
417@@ -377,8 +377,8 @@
418 <number default="250" desc="Angle used when jumping towards the left&lt;br&gt;&lt;br&gt;&#10;default = 250" dropdown="" fullname="Jump Left Angle" hidden="false" id="12" name="_JumpLeftAngle" order="11"/>
419 <number default="65" desc="Amount of force to apply during the jump&lt;br&gt;&lt;br&gt;&#10;default = 65" dropdown="" fullname="Jump Force" hidden="false" id="13" name="_JumpForce" order="12"/>
420 <animation default="" desc="" dropdown="" fullname="Wall Jump Right Animation" hidden="false" id="14" name="_WallJumpRightAnimation" order="13"/>
421+ <actor default="thisactor" desc="" dropdown="" fullname="Actor" hidden="true" id="2147483647" name="actor" order="0"/>
422 <animation default="" desc="" dropdown="" fullname="Wall Jump Left Animation" hidden="false" id="15" name="_WallJumpLeftAnimation" order="14"/>
423- <actor default="thisactor" desc="" dropdown="" fullname="Actor" hidden="true" id="2147483647" name="actor" order="0"/>
424 <text default="Wall Jumping" desc="Set the category used for the animation - used for the hierarchy." dropdown="" fullname="Animation Category" hidden="false" id="17" name="_AnimationCategory" order="16"/>
425 <boolean default="false" desc="" dropdown="" fullname="Prevent Wall Jump" hidden="true" id="16" name="_PreventWallJump" order="15"/>
426 <blocks>
427@@ -754,8 +754,8 @@
428 <number default="250" desc="Angle used when jumping towards the left&lt;br&gt;&lt;br&gt;&#10;default = 250" dropdown="" fullname="Jump Left Angle" hidden="false" id="12" name="_JumpLeftAngle" order="11"/>
429 <number default="65" desc="Amount of force to apply during the jump&lt;br&gt;&lt;br&gt;&#10;default = 65" dropdown="" fullname="Jump Force" hidden="false" id="13" name="_JumpForce" order="12"/>
430 <animation default="" desc="" dropdown="" fullname="Wall Jump Right Animation" hidden="false" id="14" name="_WallJumpRightAnimation" order="13"/>
431+ <animation default="" desc="" dropdown="" fullname="Wall Jump Left Animation" hidden="false" id="15" name="_WallJumpLeftAnimation" order="14"/>
432 <actor default="thisactor" desc="" dropdown="" fullname="Actor" hidden="true" id="2147483647" name="actor" order="0"/>
433- <animation default="" desc="" dropdown="" fullname="Wall Jump Left Animation" hidden="false" id="15" name="_WallJumpLeftAnimation" order="14"/>
434 <text default="Wall Jumping" desc="Set the category used for the animation - used for the hierarchy." dropdown="" fullname="Animation Category" hidden="false" id="17" name="_AnimationCategory" order="16"/>
435 <boolean default="false" desc="" dropdown="" fullname="Prevent Wall Jump" hidden="true" id="16" name="_PreventWallJump" order="15"/>
436 <blocks>
437@@ -853,8 +853,8 @@
438 <number default="100.0" desc="The distance the actor will be moving to the right." dropdown="" fullname="Distance Right" hidden="false" id="18" name="_DistanceRight" order="6"/>
439 <boolean default="true" desc="If selected, the actor will change the movement direction when colliding.&lt;br /&gt;&#10;If unselected, the actor will try to keep on moving in the current direction." dropdown="" fullname="Change Direction on Collision" hidden="false" id="20" name="_ChangeDirectiononCollision" order="7"/>
440 <number default="0" desc="" dropdown="" fullname="Start" hidden="true" id="13" name="_Start" order="1"/>
441- <actor default="thisactor" desc="" dropdown="" fullname="Actor" hidden="true" id="2147483647" name="actor" order="0"/>
442 <number default="0" desc="" dropdown="" fullname="End" hidden="true" id="15" name="_End" order="2"/>
443+ <actor default="thisactor" desc="" dropdown="" fullname="Actor" hidden="true" id="2147483647" name="actor" order="0"/>
444 <blocks/>
445 <events>
446 <event displayName="Updated" enabled="true" id="1" name="step" order="2" repeats="true"/>
447@@ -886,8 +886,8 @@
448 <events/>
449 </snippet>
450 <snippet attachedevent="false" class="scripts.Design_71_71_SaveStatus" desc="This behavior will automaticaly save a list of actor attributes when the scene is in transition, and load these attributes when the actor is created.&lt;br&gt;&#10;&lt;br&gt;&#10;If the actor has the behavior Health, the attributes will only be saved if the Current Health is greater than 0." description="This behavior will automaticaly save a list of actor attributes when the scene is in transition, and load these attributes when the actor is created.&lt;br&gt;&#10;&lt;br&gt;&#10;If the actor has the behavior Health, the attributes will only be saved if the Current Health is greater than 0." design="true" drawOrder="0" id="71" language="" name="Save Status" oid="-1" package="" scenespecific="false" shared="false" type="actor">
451+ <game-attribute default="" desc="A Game Attribute of the type List to hold all the actor attributes you want to save." dropdown="" fullname="Character Information List" hidden="false" id="1" name="_CharacterInformationList" order="2"/>
452 <text default="" desc="" dropdown="" fullname="Dummy Behavior" hidden="true" id="16" name="_DummyBehavior" order="10"/>
453- <game-attribute default="" desc="A Game Attribute of the type List to hold all the actor attributes you want to save." dropdown="" fullname="Character Information List" hidden="false" id="1" name="_CharacterInformationList" order="2"/>
454 <list default="list" desc="" dropdown="" fullname="Character Information" hidden="true" id="2" name="_CharacterInformation" order="3"/>
455 <boolean default="false" desc="" dropdown="" fullname="Initialized" hidden="true" id="9" name="_Initialized" order="1"/>
456 <boolean default="false" desc="" dropdown="" fullname="Loaded" hidden="true" id="10" name="_Loaded" order="4"/>
457@@ -905,8 +905,8 @@
458 <text order="3" value="Experience"/>
459 </list>
460 <list default="list" desc="" dropdown="" fullname="Dummy List" hidden="true" id="14" name="_DummyList" order="8"/>
461+ <actor default="thisactor" desc="" dropdown="" fullname="Actor" hidden="true" id="2147483647" name="actor" order="0"/>
462 <text default="" desc="" dropdown="" fullname="Dummy Attribute" hidden="true" id="15" name="_DummyAttribute" order="9"/>
463- <actor default="thisactor" desc="" dropdown="" fullname="Actor" hidden="true" id="2147483647" name="actor" order="0"/>
464 <blocks/>
465 <events>
466 <event displayName="Created" enabled="true" id="1" name="init" order="1" repeats="true"/>
467@@ -933,8 +933,8 @@
468 <animation default="" desc="" dropdown="" fullname="Left Animation (Idle)" hidden="false" id="41" name="_LeftAnimationIdle" order="10"/>
469 <boolean default="true" desc="If selected, the actor will not be able to turn while moving." dropdown="" fullname="Stop Turning" hidden="false" id="46" name="_StopTurning" order="8"/>
470 <animation default="" desc="" dropdown="" fullname="Right Animation" hidden="false" id="44" name="_RightAnimation" order="13"/>
471- <actor default="thisactor" desc="" dropdown="" fullname="Actor" hidden="true" id="2147483647" name="actor" order="0"/>
472 <boolean default="true" desc="If selected, the animation attributes will be used, otherwise they will be ignored." dropdown="" fullname="Use Animations" hidden="false" id="45" name="_UseAnimations" order="9"/>
473+ <actor default="thisactor" desc="" dropdown="" fullname="Actor" hidden="true" id="2147483647" name="actor" order="0"/>
474 <blocks/>
475 <events>
476 <event displayName="Updated" enabled="true" id="3" name="step" order="5" repeats="true"/>
477@@ -1009,8 +1009,8 @@
478 <boolean default="false" desc="" dropdown="" fullname="Shoot at 6 o'clock" hidden="false" id="12" name="_Shootat6oclock" order="13"/>
479 <boolean default="false" desc="" dropdown="" fullname="Shoot at 7 o'clock" hidden="false" id="13" name="_Shootat7oclock" order="14"/>
480 <boolean default="false" desc="" dropdown="" fullname="Shoot at 8 o'clock" hidden="false" id="14" name="_Shootat8oclock" order="15"/>
481+ <actor default="thisactor" desc="" dropdown="" fullname="Actor" hidden="true" id="2147483647" name="actor" order="0"/>
482 <boolean default="false" desc="" dropdown="" fullname="Shoot at 9 o'clock" hidden="false" id="15" name="_Shootat9oclock" order="16"/>
483- <actor default="thisactor" desc="" dropdown="" fullname="Actor" hidden="true" id="2147483647" name="actor" order="0"/>
484 <boolean default="false" desc="" dropdown="" fullname="Shoot at 11 o'clock" hidden="false" id="17" name="_Shootat11oclock" order="18"/>
485 <boolean default="false" desc="" dropdown="" fullname="Shoot at 10 o'clock" hidden="false" id="16" name="_Shootat10oclock" order="17"/>
486 <number default="10.0" desc="" dropdown="" fullname="Speed of projectile" hidden="false" id="18" name="_Speedofprojectile" order="3"/>

Subscribers

People subscribed via source and target branches

to all changes: